1 |
commit: 4a035ae5851832c168d6db5955027ef3f9051534 |
2 |
Author: Stephan Hartmann <sultan <AT> gentoo <DOT> org> |
3 |
AuthorDate: Sat Oct 30 17:29:36 2021 +0000 |
4 |
Commit: Stephan Hartmann <sultan <AT> gentoo <DOT> org> |
5 |
CommitDate: Sat Oct 30 17:30:01 2021 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4a035ae5 |
7 |
|
8 |
www-client/chromium: dev channel bump to 97.0.4682.3 |
9 |
|
10 |
Bug: https://bugs.gentoo.org/819771 |
11 |
Package-Manager: Portage-3.0.20, Repoman-3.0.3 |
12 |
Signed-off-by: Stephan Hartmann <sultan <AT> gentoo.org> |
13 |
|
14 |
www-client/chromium/Manifest | 4 +-- |
15 |
...0.4676.0.ebuild => chromium-97.0.4682.3.ebuild} | 9 +++---- |
16 |
.../chromium/files/chromium-95-xfce-maximize.patch | 30 ++++++++++++++++++++++ |
17 |
3 files changed, 36 insertions(+), 7 deletions(-) |
18 |
|
19 |
diff --git a/www-client/chromium/Manifest b/www-client/chromium/Manifest |
20 |
index f3a182b1902..4fd27fce870 100644 |
21 |
--- a/www-client/chromium/Manifest |
22 |
+++ b/www-client/chromium/Manifest |
23 |
@@ -2,5 +2,5 @@ DIST chromium-95-patchset-4.tar.xz 4308 BLAKE2B e91cb78d2357af8c0dfc66e4d148c5e6 |
24 |
DIST chromium-95.0.4638.54.tar.xz 1213374932 BLAKE2B 75e1017a50eb0f42c714863969414308df7ee69160271d3bcd5ba7af79c96c5eb53edd9d892f33db6c2455d0b2dfa12dadfa8cb01d4baf1f89d57fde5291783e SHA512 159c8d37e8cfb5bb0e55d3d1329295dab585164b84b8c514ea80f0f68ce0b491f4c40a186a2bc108baae2341cf320dee78c654c0a038d5aeb17b5a19c7f043d9 |
25 |
DIST chromium-96-patchset-4.tar.xz 4812 BLAKE2B 5d82d212b8ec1689be6f4a7a0646256311d06c17e74ee0e5b2035c32125a5235e4b6b7605cefffa367cc53e651be17b75f5e339149b4c80dca50cd959b1623f1 SHA512 a72c1bb2c58e9e2912a641093c153f01ad7239dc971c7c96481ba4164204afe41741f3253e8af03070dab8276179784dc6a11761b39ad7902ed2553016778282 |
26 |
DIST chromium-96.0.4664.27.tar.xz 1221600064 BLAKE2B 707596f44897660057edf977011db34341028c4b99dbe61878109090049e727232bfe784a1ea1447847a559584d0b2297a218c06817b618be76b5e96aafa8ea6 SHA512 4b87a04d055dedb508466e188151ea7f46d14a8a76dd64b4e783d8b6cc8e4d0d54ca5fdfb4ac60727028fbc3539e64bcb77d424904af2a64cb8f5d44d065f08e |
27 |
-DIST chromium-97-patchset-1.tar.xz 4508 BLAKE2B a30d60cb4d5f883b3f72e23df1bed8339d144c75de9ab231f5e00ffb80899c87bc6e4a46cf1126c9b163573313ce7342be4dabac1e854bcf24c49f344807feb7 SHA512 651ad56c216b7569df436d13e6f0da13181dc236af8cd4bc177a7d5461eb9ccb0650c122c68231427b6ffd4290d5e7840c5dfa9a1c7ffd8ef7882a3efd053fc4 |
28 |
-DIST chromium-97.0.4676.0.tar.xz 1224908136 BLAKE2B cdb0c94aa364757c0a88fb8c4320164ad96839bef77058d2cc8c10a59882930bd28b20d0bdb324aca785c506e7af24718f62860b714cae5f349d64b9e31234e3 SHA512 1184a56cfcba029f9bd34b5bd422fc01ebbfbc7399223f88d6e9c5f2557e9adfc4332fec26a62e1beb2d7c815163ec9a5f409b0f235e425d93b83677a332c92f |
29 |
+DIST chromium-97-patchset-2.tar.xz 3756 BLAKE2B a690466a5d359f38805f468d096f909d3063a4134aa28599a145c4741a15244c7dc06dd8151f53ef0dd29a6a604447ce37f99181a05170ac88483a837dea71cc SHA512 e088d84ea43ffc05e4e83b1c87d83fb73d985df1cf92d3a17e50201e96c32dfda29d7d9b84943307380b2d75cda699ddf65ef6414e3e4484f01ac5b957605ccd |
30 |
+DIST chromium-97.0.4682.3.tar.xz 1221976628 BLAKE2B 7b1e753568d806a03ed130cfde91032234f5fc7ae3e45ab247ebc76b8804dfa4b645a8668514bd0e6fe4bff1a779de30836fb557a2b4eaaaae310b41442ce17d SHA512 39b379ddfe59b8b4b2a9f4d4e502ac4450580da72bf9f59b4b185d4ac3b81ab1a1077c270b1ba65a32d80702f7b0fbe38059014bada9dc5a68160aea3e162e04 |
31 |
|
32 |
diff --git a/www-client/chromium/chromium-97.0.4676.0.ebuild b/www-client/chromium/chromium-97.0.4682.3.ebuild |
33 |
similarity index 99% |
34 |
rename from www-client/chromium/chromium-97.0.4676.0.ebuild |
35 |
rename to www-client/chromium/chromium-97.0.4682.3.ebuild |
36 |
index 84b87e1c066..51304ed5d3d 100644 |
37 |
--- a/www-client/chromium/chromium-97.0.4676.0.ebuild |
38 |
+++ b/www-client/chromium/chromium-97.0.4682.3.ebuild |
39 |
@@ -13,13 +13,13 @@ inherit check-reqs chromium-2 desktop flag-o-matic ninja-utils pax-utils python- |
40 |
|
41 |
DESCRIPTION="Open-source version of Google Chrome web browser" |
42 |
HOMEPAGE="https://chromium.org/" |
43 |
-PATCHSET="1" |
44 |
+PATCHSET="2" |
45 |
PATCHSET_NAME="chromium-$(ver_cut 1)-patchset-${PATCHSET}" |
46 |
SRC_URI="https://commondatastorage.googleapis.com/chromium-browser-official/${P}.tar.xz |
47 |
https://github.com/stha09/chromium-patches/releases/download/${PATCHSET_NAME}/${PATCHSET_NAME}.tar.xz" |
48 |
|
49 |
LICENSE="BSD" |
50 |
-SLOT="0" |
51 |
+SLOT="0/dev" |
52 |
KEYWORDS="~amd64 ~arm64 ~x86" |
53 |
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" |
54 |
REQUIRED_USE=" |
55 |
@@ -134,7 +134,6 @@ if [[ ${CHROMIUM_FORCE_LIBCXX} == yes ]]; then |
56 |
DEPEND+=" >=sys-libs/libcxx-12" |
57 |
else |
58 |
COMMON_DEPEND=" |
59 |
- app-arch/snappy:= |
60 |
dev-libs/libxslt:= |
61 |
>=dev-libs/re2-0.2019.08.01:= |
62 |
>=media-libs/openh264-1.6.0:= |
63 |
@@ -233,6 +232,7 @@ src_prepare() { |
64 |
"${WORKDIR}/patches" |
65 |
"${FILESDIR}/chromium-93-InkDropHost-crash.patch" |
66 |
"${FILESDIR}/chromium-96-EnumTable-crash.patch" |
67 |
+ "${FILESDIR}/chromium-95-xfce-maximize.patch" |
68 |
"${FILESDIR}/chromium-use-oauth2-client-switches-as-default.patch" |
69 |
"${FILESDIR}/chromium-shim_headers.patch" |
70 |
) |
71 |
@@ -430,6 +430,7 @@ src_prepare() { |
72 |
third_party/skia/third_party/skcms |
73 |
third_party/skia/third_party/vulkan |
74 |
third_party/smhasher |
75 |
+ third_party/snappy |
76 |
third_party/sqlite |
77 |
third_party/swiftshader |
78 |
third_party/swiftshader/third_party/astc-encoder |
79 |
@@ -499,7 +500,6 @@ src_prepare() { |
80 |
keeplibs+=( third_party/libxslt ) |
81 |
keeplibs+=( third_party/openh264 ) |
82 |
keeplibs+=( third_party/re2 ) |
83 |
- keeplibs+=( third_party/snappy ) |
84 |
if use system-icu; then |
85 |
keeplibs+=( third_party/icu ) |
86 |
fi |
87 |
@@ -610,7 +610,6 @@ src_configure() { |
88 |
gn_system_libraries+=( libxslt ) |
89 |
gn_system_libraries+=( openh264 ) |
90 |
gn_system_libraries+=( re2 ) |
91 |
- gn_system_libraries+=( snappy ) |
92 |
fi |
93 |
build/linux/unbundle/replace_gn_files.py --system-libraries "${gn_system_libraries[@]}" || die |
94 |
|
95 |
|
96 |
diff --git a/www-client/chromium/files/chromium-95-xfce-maximize.patch b/www-client/chromium/files/chromium-95-xfce-maximize.patch |
97 |
new file mode 100644 |
98 |
index 00000000000..296d97873dd |
99 |
--- /dev/null |
100 |
+++ b/www-client/chromium/files/chromium-95-xfce-maximize.patch |
101 |
@@ -0,0 +1,30 @@ |
102 |
+From 603d765ca5154db27718d89a2ee9be2a95a64254 Mon Sep 17 00:00:00 2001 |
103 |
+From: Alexander Dunaev <adunaev@××××××.com> |
104 |
+Date: Fri, 29 Oct 2021 20:54:46 +0700 |
105 |
+Subject: [PATCH] [linux/xfce] Set zero insets on maximising the window. |
106 |
+ |
107 |
+It turned out that Xfwm handles the frame insets not the way KWin and |
108 |
+Mutter do. |
109 |
+ |
110 |
+Bug: 1260821 |
111 |
+Change-Id: I69e71049157c03b74d78bc5edb7a60bf39cdda8b |
112 |
+--- |
113 |
+ |
114 |
+diff --git a/ui/platform_window/x11/x11_window.cc b/ui/platform_window/x11/x11_window.cc |
115 |
+index dd381747..706f19c 100644 |
116 |
+--- a/ui/platform_window/x11/x11_window.cc |
117 |
++++ b/ui/platform_window/x11/x11_window.cc |
118 |
+@@ -676,6 +676,13 @@ |
119 |
+ // save this one for later too. |
120 |
+ should_maximize_after_map_ = !window_mapped_in_client_; |
121 |
+ |
122 |
++ // Some WMs keep respecting the frame extents even if the window is maximised. |
123 |
++ // Remove the insets when maximising. The extents will be set again when the |
124 |
++ // window is restored to normal state. |
125 |
++ // See https://crbug.com/1260821 |
126 |
++ if (CanSetDecorationInsets()) |
127 |
++ SetDecorationInsets(nullptr); |
128 |
++ |
129 |
+ SetWMSpecState(true, x11::GetAtom("_NET_WM_STATE_MAXIMIZED_VERT"), |
130 |
+ x11::GetAtom("_NET_WM_STATE_MAXIMIZED_HORZ")); |
131 |
+ } |