commit: 574de6d3160c7dc97d8d9f3bff9b9e14e925251c Author: Stephan Hartmann <sultan <AT> gentoo <DOT> org> AuthorDate: Sat Nov 13 20:06:30 2021 +0000 Commit: Stephan Hartmann <sultan <AT> gentoo <DOT> org> CommitDate: Sat Nov 13 20:06:51 2021 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=574de6d3
www-client/chromium: beta channel bump to 96.0.4664.45 Bug: https://bugs.gentoo.org/816699 Bug: https://bugs.gentoo.org/819771 Package-Manager: Portage-3.0.28, Repoman-3.0.3 Signed-off-by: Stephan Hartmann <sultan <AT> gentoo.org> www-client/chromium/Manifest | 2 +- ...4664.35.ebuild => chromium-96.0.4664.45.ebuild} | 5 ++- .../chromium/files/chromium-96-xfce-maximize.patch | 51 ++++++++++++++++++++++ .../chromium/files/chromium-glibc-2.34.patch | 28 ++++++++++++ 4 files changed, 83 insertions(+), 3 deletions(-) diff --git a/www-client/chromium/Manifest b/www-client/chromium/Manifest index 373b0ac2b05..10e690bbe24 100644 --- a/www-client/chromium/Manifest +++ b/www-client/chromium/Manifest @@ -1,6 +1,6 @@ DIST chromium-95-patchset-4.tar.xz 4308 BLAKE2B e91cb78d2357af8c0dfc66e4d148c5e6ef20cf9a811bcebf411e07cc5af73f30760d889842923afb2945e57b0f67330deac3f9068b6ce7c487482a6434e5c672 SHA512 152657e13afab3caca6a9ff6c0b51203f5bc8b0a4075a4396794d7a85caddce1b26f989c7dede5fa9a54316334099d21889e6767885fbf974260a6e9bd90df9d DIST chromium-95.0.4638.69.tar.xz 1213470900 BLAKE2B 31619448fd42bce74dac4fb3b7e04c59a2eb05461358e4fa59ab7122b07cd2dc6632a1a8c92a9bacd93c78c37a9e7fadfa7b9ded6371697177c419ce4e6665a5 SHA512 e8845a3add5f784342c51c530ed4fbf144f8ab16701d9dd6a2eedbd255167f39c26cf400d22f246ef5ad4afbb6a6133e17d767711587dd4bae18e3b5a997f95e DIST chromium-96-patchset-4.tar.xz 4812 BLAKE2B 5d82d212b8ec1689be6f4a7a0646256311d06c17e74ee0e5b2035c32125a5235e4b6b7605cefffa367cc53e651be17b75f5e339149b4c80dca50cd959b1623f1 SHA512 a72c1bb2c58e9e2912a641093c153f01ad7239dc971c7c96481ba4164204afe41741f3253e8af03070dab8276179784dc6a11761b39ad7902ed2553016778282 -DIST chromium-96.0.4664.35.tar.xz 1221769064 BLAKE2B ea81a4a521b5999f7bc485d2fecbcdc8950bab91a0d0ff9b30347f2de00cf7bb82b717293d0d302e298a30fa75f2653e7e97aa382a8a779d5f48604e70356088 SHA512 974467c24e245cf4f70a68282e4acdd6542e709e258d39304bca4b8b917095fe3bce34a20526e0e1a160b2362c03bbe2f1b76e05a1a97327c18ab777cded3ad4 +DIST chromium-96.0.4664.45.tar.xz 1221965612 BLAKE2B e990a2c3f0ae6d8bc4b6dddbecea2c640bb6491d9b321a301c1f168a35ad37553a23b8290a28dc05d50be005d3ad57fa69af2d3574266b9c83dcd24e65116c35 SHA512 0b1ccaf95697c14cb080dcb22e8584817ddcd98e704d081bc4f35a22dcfc8cca82dcabc4b82ad89ed0cd64752d226f389941bfab33b615e3948e2f778b9d9028 DIST chromium-97-patchset-3.tar.xz 3444 BLAKE2B 3005964bfc9f1a373868dd7fa7fa66b30b62dbd8059f7ae3b259d5ca5841861cc47dfa218a9d154a862145e45798eb5c9869eb37b4b94a70eb0dedadffaa8fc1 SHA512 14d1336fb96efee954713f9e8534f4a3c78061b402b9fb582a295595c711d42787861fd176ca27c327d92bb80594c533e25092d1199797243bcaf877f1288a2d DIST chromium-97.0.4688.2.tar.xz 1223299644 BLAKE2B e1363e0c8425b9689168a05fae51e190a5d67a6ce7e817c0b8edce5be721789729ec62b98f4005a8b36bbedb44eb39a7dc2cd0cfdcb788c7837ee8a38c2a77bf SHA512 980aac2e3a73704a3df16a8a79409c890b21fd465978afda445af2b2ac7caceed8355600687bb854b7010f5aaab4a7e30d20d02d0eefd5d82c7e8cf5c1098a45 diff --git a/www-client/chromium/chromium-96.0.4664.35.ebuild b/www-client/chromium/chromium-96.0.4664.45.ebuild similarity index 99% rename from www-client/chromium/chromium-96.0.4664.35.ebuild rename to www-client/chromium/chromium-96.0.4664.45.ebuild index 43a88629c0b..251c2c2bcec 100644 --- a/www-client/chromium/chromium-96.0.4664.35.ebuild +++ b/www-client/chromium/chromium-96.0.4664.45.ebuild @@ -19,7 +19,7 @@ SRC_URI="https://commondatastorage.googleapis.com/chromium-browser-official/${P} https://github.com/stha09/chromium-patches/releases/download/${PATCHSET_NAME}/${PATCHSET_NAME}.tar.xz"; LICENSE="BSD" -SLOT="0" +SLOT="0/beta" KEYWORDS="~amd64 ~arm64 ~x86" IUSE="component-build cups cpu_flags_arm_neon debug +hangouts headless +js-type-check kerberos +official pic +proprietary-codecs pulseaudio screencast selinux +suid +system-ffmpeg +system-harfbuzz +system-icu vaapi wayland widevine" REQUIRED_USE=" @@ -231,9 +231,10 @@ src_prepare() { local PATCHES=( "${WORKDIR}/patches" "${FILESDIR}/chromium-93-InkDropHost-crash.patch" - "${FILESDIR}/chromium-95-xfce-maximize.patch" "${FILESDIR}/chromium-96-EnumTable-crash.patch" "${FILESDIR}/chromium-96-freetype-unbundle.patch" + "${FILESDIR}/chromium-96-xfce-maximize.patch" + "${FILESDIR}/chromium-glibc-2.34.patch" "${FILESDIR}/chromium-use-oauth2-client-switches-as-default.patch" "${FILESDIR}/chromium-shim_headers.patch" ) diff --git a/www-client/chromium/files/chromium-96-xfce-maximize.patch b/www-client/chromium/files/chromium-96-xfce-maximize.patch new file mode 100644 index 00000000000..77cf410cfe9 --- /dev/null +++ b/www-client/chromium/files/chromium-96-xfce-maximize.patch @@ -0,0 +1,51 @@ +From 245e71ae8de3f4b5f3478739be819981bb12dfab Mon Sep 17 00:00:00 2001 +From: Alexander Dunaev <adun...@igalia.com> +Date: Sat, 13 Nov 2021 06:35:35 +0000 +Subject: [PATCH] [linux/xfce] Introduced a hack for Xfwm. + +This proposes an alternative to [1]. Either this patch or that one +should be landed, but not both. See the linked crbug for the details. + +Setting the frame extents via the _GTK_FRAME_EXTENTS property turned out +to be problematic at Xfwm. While the issue is agreed to be a bug in the +window manager, for now we disable setting the frame extents on that WM. + +This patch introduces a logic that disables setting the window property +on Xfwm. + +[1] https://chromium-review.googlesource.com/c/chromium/src/+/3275653 + +Bug: 1260821 +Change-Id: I4b734ac0dc2b97d7ed6b1842564a33ec6e4b4035 +Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/3275272 +Reviewed-by: Thomas Anderson <thomasander...@chromium.org> +Commit-Queue: Alexander Dunaev <adun...@igalia.com> +Cr-Commit-Position: refs/heads/main@{#941444} +--- + +diff --git a/ui/platform_window/x11/x11_window.cc b/ui/platform_window/x11/x11_window.cc +index 2b20835..4fa2992 100644 +--- a/ui/platform_window/x11/x11_window.cc ++++ b/ui/platform_window/x11/x11_window.cc +@@ -1016,6 +1016,21 @@ + } + + bool X11Window::CanSetDecorationInsets() const { ++ // Xfwm handles _GTK_FRAME_EXTENTS a bit unexpected way. That is a known bug ++ // that will be eventually fixed, but for now we have to disable the function ++ // for Xfce. The block below should be removed when Xfwm is updated with the ++ // fix and is known to work properly. ++ // See https://crbug.com/1260821. ++ { ++ static WindowManagerName wm_name = WM_OTHER; ++ static bool checked_for_wm = false; ++ if (!checked_for_wm) { ++ wm_name = GuessWindowManager(); ++ checked_for_wm = true; ++ } ++ if (wm_name == WM_XFWM4) ++ return false; ++ } + return ui::WmSupportsHint(x11::GetAtom("_GTK_FRAME_EXTENTS")); + } + diff --git a/www-client/chromium/files/chromium-glibc-2.34.patch b/www-client/chromium/files/chromium-glibc-2.34.patch new file mode 100644 index 00000000000..0cb85b2ca51 --- /dev/null +++ b/www-client/chromium/files/chromium-glibc-2.34.patch @@ -0,0 +1,28 @@ +From 600d63c2c59a9892dbc5423d7d8bb1565a9f91e7 Mon Sep 17 00:00:00 2001 +From: Michel Salim <mic...@fb.com> +Date: Thu, 04 Nov 2021 14:22:40 -0700 +Subject: [PATCH] Handle long SIGSTKSZ in glibc > 2.33 + +`SIGSTKSZ` is no longer constant in glibc > 2.33 but a function +returning a long. Cast before taking `max`. + +See https://sourceware.org/git/?p=glibc.git;a=blob;f=NEWS;h=85e84fe53699fe9e392edffa993612ce08b2954a;hb=HEAD + +Signed-off-by: Michel Salim <mic...@fb.com> +Change-Id: I197f8ff3053eede80d6aed096be4f0113dd43241 +(relocated to chromium repo, removed static) +--- + +diff --git a/third_party/breakpad/breakpad/src/client/linux/handler/exception_handler.cc b/third_party/breakpad/breakpad/src/client/linux/handler/exception_handler.cc +index ca353c4..5cdabcf 100644 +--- a/third_party/breakpad/breakpad/src/client/linux/handler/exception_handler.cc ++++ b/third_party/breakpad/breakpad/src/client/linux/handler/exception_handler.cc +@@ -138,7 +138,7 @@ + // SIGSTKSZ may be too small to prevent the signal handlers from overrunning + // the alternative stack. Ensure that the size of the alternative stack is + // large enough. +- static const unsigned kSigStackSize = std::max(16384, SIGSTKSZ); ++ const unsigned kSigStackSize = std::max(16384U, (unsigned)SIGSTKSZ); + + // Only set an alternative stack if there isn't already one, or if the current + // one is too small.
