summaryrefslogtreecommitdiff
path: root/www-client/chromium
diff options
context:
space:
mode:
Diffstat (limited to 'www-client/chromium')
-rw-r--r--www-client/chromium/Manifest15
-rw-r--r--www-client/chromium/chromium-96.0.4664.110.ebuild (renamed from www-client/chromium/chromium-96.0.4664.45.ebuild)22
-rw-r--r--www-client/chromium/chromium-97.0.4692.56-r1.ebuild (renamed from www-client/chromium/chromium-97.0.4692.36.ebuild)15
-rw-r--r--www-client/chromium/chromium-98.0.4758.9.ebuild (renamed from www-client/chromium/chromium-98.0.4736.0.ebuild)7
-rw-r--r--www-client/chromium/files/chromium-96-xfce-maximize.patch51
5 files changed, 37 insertions, 73 deletions
diff --git a/www-client/chromium/Manifest b/www-client/chromium/Manifest
index 6b6f5ebb0d29..3bcd229daa5f 100644
--- a/www-client/chromium/Manifest
+++ b/www-client/chromium/Manifest
@@ -1,7 +1,6 @@
AUX chromium-93-InkDropHost-crash.patch 1134 BLAKE2B 1593c406c48b629ea3170a518cf86e936af36c554bc97a380324ab6fc930e49a359dc3ef6787ab08314a6a8f5da85714b0fa9d8589d6a46b1d06cbbd7e401f22 SHA512 474d7f55505e1275238d71d1723d74a66fc9f27a16ed293aa80ffefbe5500cd65a0bf13ec76a9bca0334a245f22120099fb367d12b93adc14500104d11cd3bff
AUX chromium-96-EnumTable-crash.patch 2850 BLAKE2B 196f5f739e96cab32d9ac7585ad4a04505f71e2e147b03e5f6e618ceed5cb37591240fdea48e388c0aefc567ecf6b369026a1d9c250112e4c0b2bf7952fcd21d SHA512 c968cc19160a4d91e0000a7ff2efdaaf97a1cd43ec68dbb335493f1bb1ff3798a6b5f33baa836ddc601c7017863655b00cf4d32cd9c9c94dbfcea7187dbec937
AUX chromium-96-freetype-unbundle.patch 361 BLAKE2B 15c7681df3a4142bad4e0aed759d13f48681a19124bd5735037475b8028b1147b55b3fa2457ae9fca2ce7395f0c3b13c28c815b6c9487456a2b2c0bb26caefd1 SHA512 ee477b8799033f53cc3c2a2fd0e588f4091be1c2c9d5c82c7fe9db00167ff2a4de7d99e48fa1b9fe5fed3a03c1b8e0bbb3d192d35895c6a52f585d6bb1c9f84b
-AUX chromium-96-xfce-maximize.patch 1963 BLAKE2B 9cf8f834ae387b06817f904a70c06d780d609d4ed435760ecbad87df63432a6d73ae23076da7968692a7bb118e72877630509586d1388c634ecaba3704098857 SHA512 92010639061ab164b0979298f2b001f5f308409285f1b5d0ae7b92582fa1914a51939248f5bb3b3010bd447c71f40f2919d2a69c73a505002f90bbf417ec60c6
AUX chromium-98-EnumTable-crash.patch 2854 BLAKE2B 4478e14e7f0c0d251b659546c2e4b83b712b072317c35f63376d7d58e2fa3563f0518b4cc333c5902140cfcd333b5860737d4c7ccbb3680fee1b60de25ad0917 SHA512 a1b55b04da7218cda037a38a543032aa741a589d2f0691d69f28eb173ffeff284d2f4da2cab1708335ecfc0a3c12ecbd57c4c48dee3eca44d659d9a3f9a7dff6
AUX chromium-98-system-libdrm.patch 1018 BLAKE2B 0d3a3b20846569fc52199cbdb003a015415c0d7fdda65fb159b007063fa817c22ed676b1e5531026a7b450145071d72b249b1ec56e51a757e1bef1e55adaec0c SHA512 22c5fc39859b6a9c000111b8b2a5875b5cdd278ba55cd22f95d3e8baf59e2c92c1a8c9df83f5ae8f83d6a63df7ba397f1253a878e2d11362b3b72ebc5081bdca
AUX chromium-browser.xml 407 BLAKE2B 168d78b0855546ca559cfb51aff0bc85d5e6ae974c25eb76e4a02f6d11659489c6e40397a0b2f7bc1fda336fd2c6dd8c863fccc3340719210b41c7fef51927f4 SHA512 b767fb4fd1925029d95560fc14cb7ab12ae43b2fe923e92d75e733b9723cbe1dcdf6df041a2b62554e98b79b47ef3f6028c773e72e6fd53166a021d49657aeca
@@ -12,12 +11,12 @@ AUX chromium-use-oauth2-client-switches-as-default.patch 1085 BLAKE2B baf3c46330
AUX chromium.default 148 BLAKE2B 5ee5b582c59a6e4bef87bbb0e232e2470ad412b1fbbb3b9af6ef7153edb55c5b9080cc16a5a115b0c5b3c381aa87ce57a7b12bdd2070e67dac10a6c2995ddbaf SHA512 0d4849e03592fb58b05e62a43021eca7e61615616c8907c3b2e445402e03adaf9e8fa25b0a745d6c31eb037456215cc02b59e345a3a06d932e76cf990c92d739
DIST chromium-96-patchset-4.tar.xz 4812 BLAKE2B 5d82d212b8ec1689be6f4a7a0646256311d06c17e74ee0e5b2035c32125a5235e4b6b7605cefffa367cc53e651be17b75f5e339149b4c80dca50cd959b1623f1 SHA512 a72c1bb2c58e9e2912a641093c153f01ad7239dc971c7c96481ba4164204afe41741f3253e8af03070dab8276179784dc6a11761b39ad7902ed2553016778282
DIST chromium-96-ppc64le-1.tar.xz 29224 BLAKE2B 3369a3b15eb4f42761e01758135995a1f34e40cecbfc0372a4bc17b393d50b276ea5a0813d1c57f73f0dd34cf2a021356d25c2b4dcaa95998ffc082545dc915c SHA512 256d64fbf192e55d77c6580d36766a67dadfbd0f1e34e49bfc6d55114da7f2252d783db0dd09123996a71a01ec4a3d5c70fd1a5c8852db135857b8495f7cfbf1
-DIST chromium-96.0.4664.45.tar.xz 1221965612 BLAKE2B e990a2c3f0ae6d8bc4b6dddbecea2c640bb6491d9b321a301c1f168a35ad37553a23b8290a28dc05d50be005d3ad57fa69af2d3574266b9c83dcd24e65116c35 SHA512 0b1ccaf95697c14cb080dcb22e8584817ddcd98e704d081bc4f35a22dcfc8cca82dcabc4b82ad89ed0cd64752d226f389941bfab33b615e3948e2f778b9d9028
+DIST chromium-96.0.4664.110.tar.xz 1209944416 BLAKE2B 1cec11b248b9225e47caf6bf8ec243e301bb63df2b0a070fb55b829b712e513b2510944f72306cebde3715704cae5b2c6be83847e91b358cb5135b56d55255b3 SHA512 7db962dc7016f531c33e915408303f06f429b53d1c5a69b281e64f6204d4bdb413fd281c3d891bb696d846f80f6182289c10f4b19b3b4c2c8b7fd72070de3f02
DIST chromium-97-patchset-4.tar.xz 4240 BLAKE2B 450d013b6fd68f7e0bcb21a2b0828d531eda86965e636fe24fc36c2e7e1f74fe93f27f0d4b1d03e67c605797e28db37de4949ff78d5106e07b0362bec4bc5d8a SHA512 181c706c83bdbe07b2e7f02b654922a860aea761ad267e6545fb7d56b66373b003c1c79fae5cd45eeb3be8917782fa45df1c05bbb00e170f0146e7385f4246c4
-DIST chromium-97.0.4692.36.tar.xz 1213467240 BLAKE2B 5a21c2b94fce104bef4dba895f170b496167154d0c364631f2f02d62a4ebb3fd0fa9143f570e4aad50d6b84214a6682b297aeef3cf6963fe7948a9b420c777bd SHA512 8aa99149c0bdf740988a0ba2d8e397f29df5b4372c6ab1e6700893e9a5978153c7d9701439ce7925de2ae521da689e5a1116876977e06d0c36350d03e10f8fc0
-DIST chromium-98-patchset-2.tar.xz 6732 BLAKE2B 8d742607a5dbdabeed1885fcf69486628a1364980f885f51e729291c392d5ff63190ae6c77687dd0096dc8a5208c14606777b92a19fb66a643e6a23f382c014b SHA512 a94004e165f1437d9955aaeb600a8809443d2d5bc852967740c420c64da4a1cdde006cff1be9e0cc0f4fef15727349ae8f2526f0bcfcff702cc5a60515fbf873
-DIST chromium-98.0.4736.0.tar.xz 1228878072 BLAKE2B 433b349f52eff009ad995b5d6920900a78c845df98e6c25c0b20ea972eedf0d7f29be0f973311dc6a139d013f32f776fb923e2c2e956546b14ca870bad8969ce SHA512 32aed341ab400400608c33efc59e654ea2ef533cd5ef637566bf3c8229562996d45ede60ddd1374c850a8ff3d3dea1565eb394db33d23a3606198049f336a55f
-EBUILD chromium-96.0.4664.45.ebuild 30442 BLAKE2B f8b9f5e21a8b0e5122c4b1d658af038817c4e4b9f2dbf81e91d6c2a96d715093b22f47535f651d7255cb92e2b8d07202dc1ae6fdedbd5bc0e62fde3f5804ff0a SHA512 d534a1e4bc412b28fdb18c7c247d1f1ea495ee1e93c93406c92b13e248fa157529c69c890cfa0c0b17c0a77c876fbc7fa69719523c58beeae26c0eefd7932835
-EBUILD chromium-97.0.4692.36.ebuild 30405 BLAKE2B 018edaeb8c8a99919d9ed48cf000f8e1c41b081c7222f68b00fc63be25ce6613343cd4cf955ba3ba24663f90591a782311dc7d0593a6a5818c330c3955bac8c5 SHA512 5ebd93ee1fcf68101b3b3124fb008d1cb382d0837a9f3ca56269e451d089b5c247ed87aa694c5b46524e9ad0e2a2a4bd6d975c9aececa1d531005fdff54015b9
-EBUILD chromium-98.0.4736.0.ebuild 30607 BLAKE2B 05b557867f9ddc66992644f6da0ce4828c29dc45eb77ef71c052f4393d1f8c0bd828fad25a48fc48e5ff5b5c5e1fc217198707cad8c9395ac3cfd631d82d8f0e SHA512 e5956b8af6469b28b5c041dc1e61e9cae2b791524b162ac98e22f077f1db96a6524578fbe61ca0179beb0eb2c14dbbf34f16b6349af752d2235b5899dc4d89a6
+DIST chromium-97.0.4692.56.tar.xz 1213710744 BLAKE2B 566e0d937b50b3636e3520069f7f7d62f310e98d9cb333b13c2565abe57d4adc0ffd060ae10bc98629d9a3ff012487e9d8e2ff569221943f6e7515c6949cc029 SHA512 f2ee447ffa35b98618154466e913cbaeef87485614848aaa78b8f89828664f039d2d76f73a5c3bddd772a596138c6b871d0c85a3d44264663fe4b2bea9d8df17
+DIST chromium-98-patchset-4.tar.xz 5332 BLAKE2B a3c7e1774e421c4937b39c984e2f39ff13ebc68a8d9f658ffe4ffe8ea381efb99250516bd5f7286f384fd2e0187a8d3410e57223555c9400db4a0cf63c23944e SHA512 7c92787f79a0cc41806bca9277de7bff41da9bc5d713bfeb22214d7103a7833fe000b46cd18b21d621f9baec6d70a58c3158a4903ad9121f999b13f1af9ca1b7
+DIST chromium-98.0.4758.9.tar.xz 1234078444 BLAKE2B ac214ae340f53ea55d1e1a7d0484d3696a5781b98247e3c2e3e909e8a25dad9d1bfb135693ba58900c66eb5f8fcf5462fb96ccef65ebbba3ddd65708463932dd SHA512 82cde4c157dc1029c54e15b332eb78e3da5fce1a26f449c45afa99502e84407732593f53211fdca4301ecbb4e9860dff43cd48611ab4490df295f404c71d7abb
+EBUILD chromium-96.0.4664.110.ebuild 30858 BLAKE2B 9643a3bdf640de973f320517fb2dfc3afc2ad019af3d6bad1248f2b12ccc47242c4a18483cbaa1ac26c05d4ca89b06008fd2e16f54f4851ecc67e86ee1d925e3 SHA512 423a3a4be00f0f92ec474b13dbbfe725444f0de85c9ba98491bdba27099b4e4925806aa82c24af120a5f9d8489b4a1b9157b04e44b35c85cb35641d89d49637c
+EBUILD chromium-97.0.4692.56-r1.ebuild 30552 BLAKE2B 5540786745d9fd2d0079b4c1d0d19597c2ed550b5850ac76d4b97d63f75d05ee122c13421e10dca70e2765bb42c6872097f8590f2e8404965788c7bcaf9c2b4f SHA512 56bcfe03d395ebfd03ff4736923afce244f42863364fcab6d212b3add2517cf4c1aeb1d4cdb8ec7918a6e9a105d5766deba9c9daebc2b638cc4c9e9ed9bdbbdb
+EBUILD chromium-98.0.4758.9.ebuild 30567 BLAKE2B 52942b1cbdea308375f43bbb642eefa00a08052948a80d04843f6adf471cfdf3ccc798e881d7726cb9efad70b2202887560c10a0820fdcfe8bdb08c51f8aa245 SHA512 902b99846e0518d8fef5bf4f3183efce5da88b4f872a77922440eb119f8dc715d703a70656535ae034359c95829147adf6953ab9a668c3c192d0c2b0192bb7d9
MISC metadata.xml 1854 BLAKE2B ecb1c85380dcf8f3b76159eee3aeb27746b35c4f9b6cedc56a011d1cff4524f5ea8fcfd7530c1b627f54b6612f9934cb49119c7e22640e6232812f8c846c5cd7 SHA512 3ff27b3eb1568590c1e5ff90d9444a4ce573ca57502be51c3e11496580152883ea43a7ecc4f56fb5b23299d4be58dc068e74a1375720f97222e019eac354425a
diff --git a/www-client/chromium/chromium-96.0.4664.45.ebuild b/www-client/chromium/chromium-96.0.4664.110.ebuild
index 5e7bf8cb0468..c46e097f6912 100644
--- a/www-client/chromium/chromium-96.0.4664.45.ebuild
+++ b/www-client/chromium/chromium-96.0.4664.110.ebuild
@@ -23,7 +23,7 @@ SRC_URI="https://commondatastorage.googleapis.com/chromium-browser-official/${P}
LICENSE="BSD"
SLOT="0/stable"
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"
+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 +system-png vaapi wayland widevine"
REQUIRED_USE="
component-build? ( !suid )
screencast? ( wayland )
@@ -57,9 +57,9 @@ COMMON_DEPEND="
>=media-libs/alsa-lib-1.0.19:=
media-libs/fontconfig:=
>=media-libs/freetype-2.11.0-r1:=
- system-harfbuzz? ( >=media-libs/harfbuzz-2.9.0:0=[icu(-)] )
+ system-harfbuzz? ( >=media-libs/harfbuzz-3:0=[icu(-)] )
media-libs/libjpeg-turbo:=
- media-libs/libpng:=
+ system-png? ( media-libs/libpng:=[-apng] )
pulseaudio? ( media-sound/pulseaudio:= )
system-ffmpeg? (
>=media-video/ffmpeg-4.3:=
@@ -234,7 +234,6 @@ src_prepare() {
"${FILESDIR}/chromium-93-InkDropHost-crash.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"
@@ -492,6 +491,9 @@ src_prepare() {
if ! use system-icu; then
keeplibs+=( third_party/icu )
fi
+ if ! use system-png; then
+ keeplibs+=( third_party/libpng )
+ fi
if use system-harfbuzz; then
keeplibs+=( third_party/harfbuzz-ng/utils )
else
@@ -599,7 +601,6 @@ src_configure() {
#harfbuzz-ng
libdrm
libjpeg
- libpng
libwebp
zlib
)
@@ -609,6 +610,9 @@ src_configure() {
if use system-icu; then
gn_system_libraries+=( icu )
fi
+ if use system-png; then
+ gn_system_libraries+=( libpng )
+ fi
if [[ ${CHROMIUM_FORCE_LIBCXX} != yes ]]; then
# unbundle only without libc++, because libc++ is not fully ABI compatible with libstdc++
gn_system_libraries+=( libxml )
@@ -844,6 +848,11 @@ src_compile() {
s|\(^Exec=\)/usr/bin/|\1|g;' \
chrome/installer/linux/common/desktop.template > \
out/Release/chromium-browser-chromium.desktop || die
+
+ # Build vk_swiftshader_icd.json; bug #827861
+ sed -e 's|${ICD_LIBRARY_PATH}|./libvk_swiftshader.so|g' \
+ third_party/swiftshader/src/Vulkan/vk_swiftshader_icd.json.tmpl > \
+ out/Release/vk_swiftshader_icd.json || die
}
src_install() {
@@ -902,6 +911,9 @@ src_install() {
doins -r out/Release/resources
doins -r out/Release/MEIPreload
+ # Install vk_swiftshader_icd.json; bug #827861
+ doins out/Release/vk_swiftshader_icd.json
+
if [[ -d out/Release/swiftshader ]]; then
insinto "${CHROMIUM_HOME}/swiftshader"
doins out/Release/swiftshader/*.so
diff --git a/www-client/chromium/chromium-97.0.4692.36.ebuild b/www-client/chromium/chromium-97.0.4692.56-r1.ebuild
index 7d53bac24055..9f7bc657a268 100644
--- a/www-client/chromium/chromium-97.0.4692.36.ebuild
+++ b/www-client/chromium/chromium-97.0.4692.56-r1.ebuild
@@ -21,7 +21,7 @@ SRC_URI="https://commondatastorage.googleapis.com/chromium-browser-official/${P}
LICENSE="BSD"
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"
+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 +system-png vaapi wayland widevine"
REQUIRED_USE="
component-build? ( !suid )
screencast? ( wayland )
@@ -55,9 +55,9 @@ COMMON_DEPEND="
>=media-libs/alsa-lib-1.0.19:=
media-libs/fontconfig:=
>=media-libs/freetype-2.11.0-r1:=
- system-harfbuzz? ( >=media-libs/harfbuzz-2.9.0:0=[icu(-)] )
+ system-harfbuzz? ( >=media-libs/harfbuzz-3:0=[icu(-)] )
media-libs/libjpeg-turbo:=
- media-libs/libpng:=
+ system-png? ( media-libs/libpng:=[-apng] )
pulseaudio? ( media-sound/pulseaudio:= )
system-ffmpeg? (
>=media-video/ffmpeg-4.3:=
@@ -87,7 +87,7 @@ COMMON_DEPEND="
x11-libs/gtk+:3[X]
wayland? (
dev-libs/wayland:=
- screencast? ( media-video/pipewire:0/0.3 )
+ screencast? ( media-video/pipewire:= )
x11-libs/gtk+:3[wayland,X]
x11-libs/libdrm:=
)
@@ -486,6 +486,9 @@ src_prepare() {
if ! use system-icu; then
keeplibs+=( third_party/icu )
fi
+ if ! use system-png; then
+ keeplibs+=( third_party/libpng )
+ fi
if use system-harfbuzz; then
keeplibs+=( third_party/harfbuzz-ng/utils )
else
@@ -593,7 +596,6 @@ src_configure() {
#harfbuzz-ng
libdrm
libjpeg
- libpng
libwebp
zlib
)
@@ -603,6 +605,9 @@ src_configure() {
if use system-icu; then
gn_system_libraries+=( icu )
fi
+ if use system-png; then
+ gn_system_libraries+=( libpng )
+ fi
if [[ ${CHROMIUM_FORCE_LIBCXX} != yes ]]; then
# unbundle only without libc++, because libc++ is not fully ABI compatible with libstdc++
gn_system_libraries+=( libxml )
diff --git a/www-client/chromium/chromium-98.0.4736.0.ebuild b/www-client/chromium/chromium-98.0.4758.9.ebuild
index e1f151131338..b5052733a30c 100644
--- a/www-client/chromium/chromium-98.0.4736.0.ebuild
+++ b/www-client/chromium/chromium-98.0.4758.9.ebuild
@@ -13,7 +13,7 @@ inherit check-reqs chromium-2 desktop flag-o-matic ninja-utils pax-utils python-
DESCRIPTION="Open-source version of Google Chrome web browser"
HOMEPAGE="https://chromium.org/"
-PATCHSET="2"
+PATCHSET="4"
PATCHSET_NAME="chromium-$(ver_cut 1)-patchset-${PATCHSET}"
SRC_URI="https://commondatastorage.googleapis.com/chromium-browser-official/${P}.tar.xz
https://github.com/stha09/chromium-patches/releases/download/${PATCHSET_NAME}/${PATCHSET_NAME}.tar.xz"
@@ -55,7 +55,7 @@ COMMON_DEPEND="
>=media-libs/alsa-lib-1.0.19:=
media-libs/fontconfig:=
>=media-libs/freetype-2.11.0-r1:=
- system-harfbuzz? ( >=media-libs/harfbuzz-2.9.0:0=[icu(-)] )
+ system-harfbuzz? ( >=media-libs/harfbuzz-3:0=[icu(-)] )
media-libs/libjpeg-turbo:=
system-png? ( media-libs/libpng:=[-apng] )
pulseaudio? ( media-sound/pulseaudio:= )
@@ -87,7 +87,7 @@ COMMON_DEPEND="
x11-libs/gtk+:3[X]
wayland? (
dev-libs/wayland:=
- screencast? ( media-video/pipewire:0/0.3 )
+ screencast? ( media-video/pipewire:= )
x11-libs/gtk+:3[wayland,X]
x11-libs/libdrm:=
)
@@ -903,7 +903,6 @@ src_install() {
fi
doins -r out/Release/locales
- doins -r out/Release/resources
doins -r out/Release/MEIPreload
# Install vk_swiftshader_icd.json; bug #827861
diff --git a/www-client/chromium/files/chromium-96-xfce-maximize.patch b/www-client/chromium/files/chromium-96-xfce-maximize.patch
deleted file mode 100644
index 77cf410cfe95..000000000000
--- a/www-client/chromium/files/chromium-96-xfce-maximize.patch
+++ /dev/null
@@ -1,51 +0,0 @@
-From 245e71ae8de3f4b5f3478739be819981bb12dfab Mon Sep 17 00:00:00 2001
-From: Alexander Dunaev <adunaev@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 <thomasanderson@chromium.org>
-Commit-Queue: Alexander Dunaev <adunaev@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"));
- }
-
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-10 06:08:01 +0000