From 60914f0e98900d6684cd4d25c1225087bf7c61a9 Mon Sep 17 00:00:00 2001 From: Duncaen Date: Mon, 1 Aug 2022 15:22:29 +0200 Subject: [PATCH] chromium: update to 104.0.5112.65. --- .../patches/remove-no-opaque-pointers-flag.patch | 4 ++-- srcpkgs/chromium/patches/xxx-ppc64le-4k-pages.patch | 10 +++++----- srcpkgs/chromium/template | 4 ++-- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/srcpkgs/chromium/patches/remove-no-opaque-pointers-flag.patch b/srcpkgs/chromium/patches/remove-no-opaque-pointers-flag.patch index a8eba730836e..1231eeb7def0 100644 --- a/srcpkgs/chromium/patches/remove-no-opaque-pointers-flag.patch +++ b/srcpkgs/chromium/patches/remove-no-opaque-pointers-flag.patch @@ -1,12 +1,12 @@ --- chromium-102.0.5005.61/build/config/compiler/BUILD.gn.orig 2022-05-19 10:35:52.991415777 +0000 +++ chromium-102.0.5005.61/build/config/compiler/BUILD.gn 2022-05-19 10:36:11.102017131 +0000 @@ -1538,15 +1538,6 @@ config("default_warnings") { - cflags += [ "-Wno-deprecated-non-prototype" ] + cflags += [ "-Wno-unqualified-std-cast-call" ] } - if (!is_nacl && !(is_chromeos || - default_toolchain == "//build/toolchain/cros:target")) { -- # TODO(https://crbug.com/1316298): Re-enable once test failure is figured out +- # TODO(https://crbug.com/1322823): Remove flags once potential miscompile is investigated. - cflags += [ - "-Xclang", - "-no-opaque-pointers", diff --git a/srcpkgs/chromium/patches/xxx-ppc64le-4k-pages.patch b/srcpkgs/chromium/patches/xxx-ppc64le-4k-pages.patch index 953ca165a094..886be0bf4666 100644 --- a/srcpkgs/chromium/patches/xxx-ppc64le-4k-pages.patch +++ b/srcpkgs/chromium/patches/xxx-ppc64le-4k-pages.patch @@ -13,9 +13,9 @@ diff --git a/base/allocator/partition_allocator/page_allocator_constants.h b/bas index bfd5753..045082b 100644 --- a/base/allocator/partition_allocator/page_allocator_constants.h +++ b/base/allocator/partition_allocator/page_allocator_constants.h -@@ -40,7 +40,7 @@ namespace base { +@@ -69,7 +69,7 @@ namespace base { - PAGE_ALLOCATOR_CONSTANTS_DECLARE_CONSTEXPR ALWAYS_INLINE size_t + PAGE_ALLOCATOR_CONSTANTS_DECLARE_CONSTEXPR PA_ALWAYS_INLINE size_t PageAllocationGranularityShift() { -#if BUILDFLAG(IS_WIN) || defined(ARCH_CPU_PPC64) +#if BUILDFLAG(IS_WIN) @@ -26,18 +26,18 @@ diff --git a/base/allocator/partition_allocator/partition_alloc_constants.h b/ba index 0b9260d..3e054ec 100644 --- a/base/allocator/partition_allocator/partition_alloc_constants.h +++ b/base/allocator/partition_allocator/partition_alloc_constants.h -@@ -74,11 +74,6 @@ +@@ -90,11 +90,6 @@ PartitionPageShift() { return 16; // 64 KiB } -#elif defined(ARCH_CPU_PPC64) --PAGE_ALLOCATOR_CONSTANTS_DECLARE_CONSTEXPR ALWAYS_INLINE size_t +-PAGE_ALLOCATOR_CONSTANTS_DECLARE_CONSTEXPR PA_ALWAYS_INLINE size_t -PartitionPageShift() { - return 18; // 256 KiB -} #elif (BUILDFLAG(IS_APPLE) && defined(ARCH_CPU_64_BITS)) || \ (BUILDFLAG(IS_LINUX) && defined(ARCH_CPU_ARM64)) - PAGE_ALLOCATOR_CONSTANTS_DECLARE_CONSTEXPR ALWAYS_INLINE size_t + PAGE_ALLOCATOR_CONSTANTS_DECLARE_CONSTEXPR PA_ALWAYS_INLINE size_t diff --git a/base/allocator/partition_allocator/partition_alloc_forward.h b/base/allocator/partition_allocator/partition_alloc_forward.h index 938ea38..9414b41 100644 --- a/base/allocator/partition_allocator/partition_alloc_forward.h diff --git a/srcpkgs/chromium/template b/srcpkgs/chromium/template index e6e0d1298b9b..2d7c0e89597c 100644 --- a/srcpkgs/chromium/template +++ b/srcpkgs/chromium/template @@ -1,7 +1,7 @@ # Template file for 'chromium' pkgname=chromium # See https://chromiumdash.appspot.com/releases?platform=Linux for the latest version -version=103.0.5060.134 +version=104.0.5112.79 revision=1 archs="i686* x86_64* aarch64* armv7l* ppc64le*" short_desc="Google's attempt at creating a safer, faster, and more stable browser" @@ -9,7 +9,7 @@ maintainer="Duncaen " license="BSD-3-Clause" homepage="https://www.chromium.org/" distfiles="https://commondatastorage.googleapis.com/chromium-browser-official/${pkgname}-${version}.tar.xz" -checksum=e48a272481e41b1aae7aba71b55c41fe9e994cf71edd01c8ca1d0b604af0b571 +checksum=9cc662f1a84c796521ee17ed2808795ca937fe7f77bc605e788f0304a81dabf3 lib32disabled=yes