From 942439b4161954e7d6965a96f42afa2d15caa30b Mon Sep 17 00:00:00 2001 From: Duncaen Date: Wed, 5 Jan 2022 13:23:56 +0100 Subject: [PATCH] chromium: update to 97.0.4692.56. --- .../files/musl-patches/resolver.patch | 25 +++++----- .../patches/chromium-94-ffmpeg-roll.patch | 49 ------------------- .../chromium-94-ffmpeg-roll.patch.args | 1 - .../chromium-96-CommandLine-include.patch | 24 --------- .../chromium-96-CouponDB-include.patch | 25 ---------- ...m-96-DrmRenderNodePathFinder-include.patch | 24 --------- ...ium-96-RestrictedCookieManager-tuple.patch | 31 ------------ ...-visibility-of-build-config-freetype.patch | 31 ------------ .../patches/xxx-ppc64le-support.patch | 38 -------------- srcpkgs/chromium/template | 14 +++--- 10 files changed, 20 insertions(+), 242 deletions(-) delete mode 100644 srcpkgs/chromium/patches/chromium-94-ffmpeg-roll.patch delete mode 100644 srcpkgs/chromium/patches/chromium-94-ffmpeg-roll.patch.args delete mode 100644 srcpkgs/chromium/patches/chromium-96-CommandLine-include.patch delete mode 100644 srcpkgs/chromium/patches/chromium-96-CouponDB-include.patch delete mode 100644 srcpkgs/chromium/patches/chromium-96-DrmRenderNodePathFinder-include.patch delete mode 100644 srcpkgs/chromium/patches/chromium-96-RestrictedCookieManager-tuple.patch delete mode 100644 srcpkgs/chromium/patches/unbundle-fix-visibility-of-build-config-freetype.patch diff --git a/srcpkgs/chromium/files/musl-patches/resolver.patch b/srcpkgs/chromium/files/musl-patches/resolver.patch index 091d3f3e88ef..3c2563b7824f 100644 --- a/srcpkgs/chromium/files/musl-patches/resolver.patch +++ b/srcpkgs/chromium/files/musl-patches/resolver.patch @@ -38,19 +38,20 @@ base::Optional ai; --- net/dns/dns_config_service_linux.cc.orig +++ net/dns/dns_config_service_linux.cc -@@ -432,12 +432,6 @@ - base::ScopedBlockingCall scoped_blocking_call( - FROM_HERE, base::BlockingType::MAY_BLOCK); +@@ -443,11 +443,13 @@ + base::ScopedBlockingCall scoped_blocking_call( + FROM_HERE, base::BlockingType::MAY_BLOCK); -- std::unique_ptr res = resolv_reader_->GetResState(); -- if (res) { -- dns_config_ = ConvertResStateToDnsConfig(*res.get()); -- resolv_reader_->CloseResState(res.get()); -- } -- - UMA_HISTOGRAM_BOOLEAN("Net.DNS.DnsConfig.Resolv.Read", - dns_config_.has_value()); - if (!dns_config_.has_value()) ++#if defined(__GLIBC__) + std::unique_ptr res = resolv_reader_->GetResState(); + if (res) { + dns_config_ = ConvertResStateToDnsConfig(*res.get()); + resolv_reader_->CloseResState(res.get()); + } ++#endif + + UMA_HISTOGRAM_BOOLEAN("Net.DNS.DnsConfig.Resolv.Read", + dns_config_.has_value()); --- net/dns/public/resolv_reader.cc.orig +++ net/dns/public/resolv_reader.cc @@ -20,19 +20,10 @@ diff --git a/srcpkgs/chromium/patches/chromium-94-ffmpeg-roll.patch b/srcpkgs/chromium/patches/chromium-94-ffmpeg-roll.patch deleted file mode 100644 index 68f26364eda7..000000000000 --- a/srcpkgs/chromium/patches/chromium-94-ffmpeg-roll.patch +++ /dev/null @@ -1,49 +0,0 @@ -From b94755e4633045be96ab5e0bdde0db7e16a804bd Mon Sep 17 00:00:00 2001 -From: "liberato@chromium.org" -Date: Fri, 6 Aug 2021 04:25:31 +0000 -Subject: [PATCH] FFmpeg M94 roll. - -Contains DEPS update + chromium-side fixes. - -Bug: 1227259 -Change-Id: I61c5eaa789ea12c17d0cbcbf837435b9cf32479b -Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/3011889 -Reviewed-by: Thomas Guilbert -Commit-Queue: Frank Liberato -Cr-Commit-Position: refs/heads/master@{#909174} ---- - media/ffmpeg/ffmpeg_common.h | 1 + - media/filters/ffmpeg_demuxer.cc | 4 ++-- - 2 files changed, 3 insertions(+), 2 deletions(-) - -diff --git a/media/ffmpeg/ffmpeg_common.h b/media/ffmpeg/ffmpeg_common.h -index cede8ac5a7..97d6307e28 100644 ---- a/media/ffmpeg/ffmpeg_common.h -+++ b/media/ffmpeg/ffmpeg_common.h -@@ -29,6 +29,7 @@ extern "C" { - #include - #include - #include -+#include - #include - #include - #include -diff --git a/media/filters/ffmpeg_demuxer.cc b/media/filters/ffmpeg_demuxer.cc -index ac4713b072..605001d935 100644 ---- a/media/filters/ffmpeg_demuxer.cc -+++ b/media/filters/ffmpeg_demuxer.cc -@@ -106,12 +106,12 @@ static base::TimeDelta ExtractStartTime(AVStream* stream) { - - // Next try to use the first DTS value, for codecs where we know PTS == DTS - // (excludes all H26x codecs). The start time must be returned in PTS. -- if (stream->first_dts != kNoFFmpegTimestamp && -+ if (av_stream_get_first_dts(stream) != kNoFFmpegTimestamp && - stream->codecpar->codec_id != AV_CODEC_ID_HEVC && - stream->codecpar->codec_id != AV_CODEC_ID_H264 && - stream->codecpar->codec_id != AV_CODEC_ID_MPEG4) { - const base::TimeDelta first_pts = -- ConvertFromTimeBase(stream->time_base, stream->first_dts); -+ ConvertFromTimeBase(stream->time_base, av_stream_get_first_dts(stream)); - if (first_pts < start_time) - start_time = first_pts; - } diff --git a/srcpkgs/chromium/patches/chromium-94-ffmpeg-roll.patch.args b/srcpkgs/chromium/patches/chromium-94-ffmpeg-roll.patch.args deleted file mode 100644 index 8bbbbe948363..000000000000 --- a/srcpkgs/chromium/patches/chromium-94-ffmpeg-roll.patch.args +++ /dev/null @@ -1 +0,0 @@ --RNp1 diff --git a/srcpkgs/chromium/patches/chromium-96-CommandLine-include.patch b/srcpkgs/chromium/patches/chromium-96-CommandLine-include.patch deleted file mode 100644 index 2d7b7e902376..000000000000 --- a/srcpkgs/chromium/patches/chromium-96-CommandLine-include.patch +++ /dev/null @@ -1,24 +0,0 @@ -From 39e6e77798d86033e5eb1fb2a2caf20a5bca2262 Mon Sep 17 00:00:00 2001 -From: Stephan Hartmann -Date: Sat, 9 Oct 2021 08:27:04 +0000 -Subject: [PATCH] IWYU: add memory for std::unique_ptr in base::CommandLine - ---- - base/command_line.h | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/base/command_line.h b/base/command_line.h -index 706726a..ad02812 100644 ---- a/base/command_line.h -+++ b/base/command_line.h -@@ -19,6 +19,7 @@ - #include - #include - #include -+#include - #include - #include - --- -2.32.0 - diff --git a/srcpkgs/chromium/patches/chromium-96-CouponDB-include.patch b/srcpkgs/chromium/patches/chromium-96-CouponDB-include.patch deleted file mode 100644 index 41acfb31b96e..000000000000 --- a/srcpkgs/chromium/patches/chromium-96-CouponDB-include.patch +++ /dev/null @@ -1,25 +0,0 @@ -From 3a7b8dd0fcceffcfd0ea7e3186d2850deed7a00b Mon Sep 17 00:00:00 2001 -From: Stephan Hartmann -Date: Wed, 6 Oct 2021 15:36:47 +0000 -Subject: [PATCH] IWYU: add vector for std::vector in CouponDB - ---- - chrome/browser/commerce/coupons/coupon_db.h | 2 ++ - 1 file changed, 2 insertions(+) - -diff --git a/chrome/browser/commerce/coupons/coupon_db.h b/chrome/browser/commerce/coupons/coupon_db.h -index f0758f4..93e2dd3 100644 ---- a/chrome/browser/commerce/coupons/coupon_db.h -+++ b/chrome/browser/commerce/coupons/coupon_db.h -@@ -5,6 +5,8 @@ - #ifndef CHROME_BROWSER_COMMERCE_COUPONS_COUPON_DB_H_ - #define CHROME_BROWSER_COMMERCE_COUPONS_COUPON_DB_H_ - -+#include -+ - #include "base/callback_helpers.h" - #include "base/memory/weak_ptr.h" - #include "url/gurl.h" --- -2.32.0 - diff --git a/srcpkgs/chromium/patches/chromium-96-DrmRenderNodePathFinder-include.patch b/srcpkgs/chromium/patches/chromium-96-DrmRenderNodePathFinder-include.patch deleted file mode 100644 index fd44eb2c91a0..000000000000 --- a/srcpkgs/chromium/patches/chromium-96-DrmRenderNodePathFinder-include.patch +++ /dev/null @@ -1,24 +0,0 @@ -From 9e36b3c28935fb50d43ccef443be786a8e3f8a5f Mon Sep 17 00:00:00 2001 -From: Stephan Hartmann -Date: Sat, 9 Oct 2021 16:17:34 +0000 -Subject: [PATCH] IWYU: add string.h for memcmp in ui:: DrmRenderNodePathFinder - ---- - ui/ozone/platform/wayland/gpu/drm_render_node_path_finder.cc | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/ui/ozone/platform/wayland/gpu/drm_render_node_path_finder.cc b/ui/ozone/platform/wayland/gpu/drm_render_node_path_finder.cc -index 06776a7..d5b7b71 100644 ---- a/ui/ozone/platform/wayland/gpu/drm_render_node_path_finder.cc -+++ b/ui/ozone/platform/wayland/gpu/drm_render_node_path_finder.cc -@@ -5,6 +5,7 @@ - #include "ui/ozone/platform/wayland/gpu/drm_render_node_path_finder.h" - - #include -+#include - #include - #include - #include --- -2.32.0 - diff --git a/srcpkgs/chromium/patches/chromium-96-RestrictedCookieManager-tuple.patch b/srcpkgs/chromium/patches/chromium-96-RestrictedCookieManager-tuple.patch deleted file mode 100644 index cbdca44b738d..000000000000 --- a/srcpkgs/chromium/patches/chromium-96-RestrictedCookieManager-tuple.patch +++ /dev/null @@ -1,31 +0,0 @@ -From 86b1886673c3e75d3a7b8c802b3e9fa6ea945a1e Mon Sep 17 00:00:00 2001 -From: Jose Dapena Paz -Date: Fri, 08 Oct 2021 06:32:55 +0000 -Subject: [PATCH] libstdc++: no implicit conversion from tuple created with std::tie to an std::pair in restricted cookie manager. - -Fix compilation error: - ../../services/network/restricted_cookie_manager.cc:164:30: error: no match for ‘operator[]’ (operand types are ‘network::CookieAccessesByURLAndSite’ {aka ‘std::map, std::unique_ptr > >’} and ‘std::tuple’) - -There is no conversion from tuple to pair. - -Bug: 957519 -Change-Id: Idf29c7b21895ae28f45b35d6193ab4ac555945c8 -Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/3211752 -Reviewed-by: Robbie McElrath -Commit-Queue: José Dapena Paz -Cr-Commit-Position: refs/heads/main@{#929597} ---- - -diff --git a/services/network/restricted_cookie_manager.cc b/services/network/restricted_cookie_manager.cc -index 425426f..c8c10c6 100644 ---- a/services/network/restricted_cookie_manager.cc -+++ b/services/network/restricted_cookie_manager.cc -@@ -161,7 +161,7 @@ - const GURL& url, - const net::SiteForCookies& site_for_cookies) { - std::unique_ptr& entry = -- recent_cookie_accesses_[std::tie(url, site_for_cookies)]; -+ recent_cookie_accesses_[std::make_pair(url, site_for_cookies)]; - if (!entry) { - entry = std::make_unique(); - } diff --git a/srcpkgs/chromium/patches/unbundle-fix-visibility-of-build-config-freetype.patch b/srcpkgs/chromium/patches/unbundle-fix-visibility-of-build-config-freetype.patch deleted file mode 100644 index d10023bc0267..000000000000 --- a/srcpkgs/chromium/patches/unbundle-fix-visibility-of-build-config-freetype.patch +++ /dev/null @@ -1,31 +0,0 @@ -From 271e45339b7b969e98ccef7837cb1b15480b07fc Mon Sep 17 00:00:00 2001 -From: Stephan Hartmann -Date: Thu, 4 Nov 2021 18:58:34 +0000 -Subject: [PATCH] unbundle: fix visibility of //build/config/freetype - -For system freetype //build/linux:freetype_from_pkgconfig is restricted -to //third_party:freetype_harfbuzz and //third_party/harfbuzz-ng:harfbuzz_source. -However //build/config/freetype:freetype is accessing it too. - -Bug: None -Change-Id: Ic4a37b01e4ae221372a9220cbad04c598b844c21 -Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/3259304 -Commit-Queue: Thomas Anderson -Reviewed-by: Thomas Anderson -Cr-Commit-Position: refs/heads/main@{#938388} ---- - build/linux/BUILD.gn | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/build/linux/BUILD.gn b/build/linux/BUILD.gn -index 54314c7687..cd49e3d524 100644 ---- a/build/linux/BUILD.gn -+++ b/build/linux/BUILD.gn -@@ -23,6 +23,7 @@ if (use_system_freetype) { - # the system, use with caution,for details see build/config/freetype/BUILD.gn. - pkg_config("freetype_from_pkgconfig") { - visibility = [ -+ "//build/config/freetype:freetype", - "//third_party:freetype_harfbuzz", - "//third_party/harfbuzz-ng:harfbuzz_source", - ] diff --git a/srcpkgs/chromium/patches/xxx-ppc64le-support.patch b/srcpkgs/chromium/patches/xxx-ppc64le-support.patch index 06109237b794..2f66a144e269 100644 --- a/srcpkgs/chromium/patches/xxx-ppc64le-support.patch +++ b/srcpkgs/chromium/patches/xxx-ppc64le-support.patch @@ -3242,44 +3242,6 @@ index 30a2ab21d..60509f21d 100644 #endif } -diff --git a/third_party/crashpad/crashpad/util/posix/signals_test.cc b/third_party/crashpad/crashpad/util/posix/signals_test.cc -index 54cc2f19f..298b5c993 100644 ---- a/third_party/crashpad/crashpad/util/posix/signals_test.cc -+++ b/third_party/crashpad/crashpad/util/posix/signals_test.cc -@@ -46,9 +46,9 @@ bool CanCauseSignal(int sig) { - return sig == SIGABRT || - sig == SIGALRM || - sig == SIGBUS || --#if !defined(ARCH_CPU_ARM64) -+#if !defined(ARCH_CPU_ARM64) && !defined(ARCH_CPU_PPC64) - sig == SIGFPE || --#endif // !defined(ARCH_CPU_ARM64) -+#endif // !defined(ARCH_CPU_ARM64) && !defined(ARCH_CPU_PPC64) - #if defined(ARCH_CPU_X86_FAMILY) || defined(ARCH_CPU_ARMEL) - sig == SIGILL || - #endif // defined(ARCH_CPU_X86_FAMILY) || defined(ARCH_CPU_ARMEL) -@@ -117,9 +117,11 @@ void CauseSignal(int sig) { - break; - } - --#if !defined(ARCH_CPU_ARM64) -+#if !defined(ARCH_CPU_ARM64) && !defined(ARCH_CPU_PPC64) - // ARM64 has hardware integer division instructions that don’t generate a - // trap for divide-by-zero, so this doesn’t produce SIGFPE. -+ // -+ // PPC64 fixed-point division by zero also doesn't produce a SIGFPE. - case SIGFPE: { - // Optimization makes this tricky, so get zero from a system call likely - // to succeed, and try to do something with the result. -@@ -137,7 +139,7 @@ void CauseSignal(int sig) { - fstat(quotient, &stat_buf); - break; - } --#endif // ARCH_CPU_ARM64 -+#endif // !defined(ARCH_CPU_ARM64) && !defined(ARCH_CPU_PPC64) - - #if defined(ARCH_CPU_X86_FAMILY) || defined(ARCH_CPU_ARMEL) - case SIGILL: { diff --git a/third_party/dav1d/BUILD.gn b/third_party/dav1d/BUILD.gn index 6b4566fc3..c07f732ad 100644 --- a/third_party/dav1d/BUILD.gn diff --git a/srcpkgs/chromium/template b/srcpkgs/chromium/template index a139b05641c4..576947ba44fd 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=96.0.4664.110 +version=97.0.4692.71 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=36a99d29c2e93a9975be53648f2cd3ffa4ee43730f217a2e7ed88c1901a671e8 +checksum=8ae189d44b782fe4d4942962260dbf5f753abf141148727d9fe82852778dfd7c lib32disabled=yes @@ -28,7 +28,7 @@ makedepends="libpng-devel gtk+-devel gtk+3-devel nss-devel pciutils-devel libXScrnSaver-devel alsa-lib-devel snappy-devel libdrm-devel libxml2-devel libxslt-devel $(vopt_if pulseaudio pulseaudio-devel) libexif-devel libXcursor-devel libflac-devel speex-devel libmtp-devel libwebp-devel - libjpeg-turbo-devel libevent-devel json-c-devel harfbuzz-devel + libjpeg-turbo-devel libevent-devel json-c-devel minizip-devel jsoncpp-devel zlib-devel libcap-devel libXdamage-devel re2-devel fontconfig-devel freetype-devel opus-devel libatomic-devel ffmpeg-devel libva-devel python-setuptools xcb-proto libcurl-devel @@ -42,7 +42,7 @@ esac if [ "$CROSS_BUILD" ]; then hostmakedepends+=" libX11-devel libxcb-devel pciutils-devel libXext-devel libglvnd-devel - libjpeg-turbo-devel libXi-devel nss-devel libpng-devel libwebp-devel harfbuzz-devel + libjpeg-turbo-devel libXi-devel nss-devel libpng-devel libwebp-devel libxml2-devel $(vopt_if pulseaudio pulseaudio-devel) libxslt-devel libxkbcommon-devel $(vopt_if pipewire pipewire-devel) ffmpeg-devel opus-devel pango-devel libva-devel libcurl-devel snappy-devel re2-devel libXrandr-devel libXcomposite-devel cups-devel @@ -166,12 +166,12 @@ do_configure() { # use_system_v8=1 # use_system_zlib=1 # bzip2 jsoncpp minizip xdg_utils speex + # XXX: harfbuzz-ng use builtin one until system-wide is updated >=3.0.0 system=" ffmpeg flac fontconfig freetype - harfbuzz-ng libdrm libevent libjpeg @@ -234,7 +234,7 @@ do_configure() { 'enable_widevine=true' 'enable_hangout_services_extension=true' - 'use_system_harfbuzz=true' + 'use_system_harfbuzz=false' 'use_system_wayland_scanner=true' 'use_cups=true' @@ -320,7 +320,7 @@ do_configure() { do_build() { _setup_toolchain - ninja -C out/Release ${makejobs} chrome chromedriver chrome_crashpad_handler + CCACHE_SLOPPINESS=include_file_mtime ninja -C out/Release ${makejobs} chrome chromedriver chrome_crashpad_handler } do_install() {