gentoo auto-resync : 03:04:2025 - 01:34:01

3 files changed, 48 insertions, 3 deletions

diff --git a/dev-qt/qtwebengine/Manifest b/dev-qt/qtwebengine/Manifest
index 274fe48942b6..369eb008c113 100644
--- a/dev-qt/qtwebengine/Manifest
+++ b/dev-qt/qtwebengine/Manifest
@@ -9,17 +9,18 @@ AUX qtwebengine-6.8.2-cstdint.patch 1221 BLAKE2B 8e2131e54dc398c7518ba49b75e38db
 AUX qtwebengine-6.8.2-glibc2.41.patch 978 BLAKE2B 23c7aeaa6edec047215f1a7905e8a0474e19c0efbb26c3594fa4d86b9f9fb29c52ef5ce18fb643bcc8dbc93281fd477a356e1c89b8fa6c04eed9be2b530e235a SHA512 61aef7ad8ef0687f92684ea272093f09a686e0265d213d064f43c3a9afd63d58de5b2adbd0a51c163dd2154c02d1b5e4fbc960f49b1d02521446e0b380f67d11
 AUX qtwebengine-6.8.3-clang20.patch 925 BLAKE2B b7a43f8efbd7e9b0d58c6c31fd7780357769703c8a35ef28de42abbe5d6392cc9a68ea31992d8df7e57d8e70c4ca62a51e59b2b0522b7b7d0c475c00c7a45829 SHA512 fc20e054594598022662b6a62e9a55f0553c55fac3ab876de48d9fa97130eddf2bf844cc44ee059c73323c105d197812326455644257948e74e4315e0c604238
 AUX qtwebengine-6.8.3-pipewire1.4.patch 837 BLAKE2B 3266bcfbc1b76e491f51cc094ad03a579a89795895bed915356d91470daf21914cacd13ed28f6f178bd0c34dfd135c26fbcb7c665239c804fdc90a14c0b94c88 SHA512 d8defe246f194256e68c75a8fb011824f47c200f6003d65292384607b33f6d01ad682e42194a8f1ea98a2a6b087e92b202570ed1960bf566ae86648e97ec53d5
+AUX qtwebengine-6.9.0-x11-pixmap-leak.patch 1789 BLAKE2B 609280175bdacddfbf03cc553aa814ab4ff6be147f43c864416f2c1611f043ef6d4a05f9c1e3f2a834a175f91ef10e8eb881a582ee4ef3d4eefa26cf96d6bbb1 SHA512 53d932583942b2dd7fc04b2a7a8c5a5b6860f28312c7a1f0ed0571149ddb34c1d180218847d5898c33f2b3039fa06c5751f25a7d85afcb8b54a0fa6992e6644b
 DIST qtwebengine-5.15.14_p20240510-patchset.tar.xz 20780 BLAKE2B 516d4c628c4b027ab3a7159da006a57173be91de3eb4b7f308029953d4fd19fb3e790ca38e79d17fef75d8d9b392676650acb9285d5913f9ebecaa4136575c47 SHA512 492979d118d6bd9165ee194724e38b627d19c89dbe1daa6b2f55e4a8fc7676748a1eacb9623ee05e09140c2c4a2ac82ddafaef5c45630a117ce0ed14b240a474
 DIST qtwebengine-5.15.16_p20241115.tar.xz 301382752 BLAKE2B 08adfae6228a91f1f4b2a603a28881d9cf97f339d951217f3837d614ebb58aff9b0963220be04cc9a17869b6021a6d7687848bd8ccd1c8c49115a5e6944be84b SHA512 50e0bc7b4236859b4419f2f8eaf37e47c1994c30ca3bf584dd2f4996b5f8ba7cd31c8aae48c28f0fcd39c144490f5e451c7ecf5d340e7b10fa2e37666ef21100
 DIST qtwebengine-6.8-patchset-7.tar.xz 9096 BLAKE2B 58a95b198a6c8180a71a4365e7c2e3bee2d3798ecff18b01fe23e228a4ceafe2aae43088f503a98fa2d5097271ec442985d993fb24e1b2d2c09014b3309bef4d SHA512 489caa5f7cc3d3091e5896c2eb4d489a40fc220738c2240ec406928c7c948ab8962817024c2fbe3c393294e70ef6ce8c02e47964952a3656ff6ebf7908069fc3
 DIST qtwebengine-6.9-patchset-3.tar.xz 8152 BLAKE2B 4a1acb8328ae7eedb59fd0c4f721da210eacae9e9faf00a4272c1c376d108c8f996de63aa87b043655bfa0ce3391ad5ff3585512a177310df3990f92e201faf3 SHA512 d89fd2fe3cb441720fdf9cd5701bcdb6cba7677492a2362108b044b60da415a0008efb385f4582d2dea973f04adc5da25fc39ae2fa0a73340da47a3bb2d00dc3
 DIST qtwebengine-everywhere-src-6.8.2.tar.xz 566518084 BLAKE2B 312fda4150bdc1aee25625440baca45b532ecd7a1ce24d3dc3ba990cdf208c3ba42f159e02c881f38b56c29b75677d9001e6222d35b4c96fc39eecf65502e9c7 SHA512 27590ec53845fa36f48a5a0506d505995850027d85bf33fe0413733cbde5c2744e8ea49f445c91d84b8d43454b9f12c1cf7005d614bbcae1a29d432fdacdc0e4
 DIST qtwebengine-everywhere-src-6.8.3.tar.xz 566553436 BLAKE2B a3188d79f9d3b52423d4578b69c3ccf115a66994fd4f98d82cac2f6f8d443a22e102a53a0d5eb6f985b8ab7ebfe0cc22b8d34c31fbfd83f3a80b0c945b026f2a SHA512 01e8988c76ff40ca5e38f76e90791d7ef708c29f2e9f8e83ca8604b6335fbecdee71473678a63633ec1edec85088256b20e56a618ca95748ccbe1e7b9673c298
-DIST qtwebengine-everywhere-src-6.9.0-rc.tar.xz 672084252 BLAKE2B b4c6a2f2ee19b00e57ed97948838e963b3d9ed41ecbc292cae262070e0a611c54450b5e01a1e5a590225d298b4432d6b9e6421ea672d509051d8e7cba13e98bb SHA512 fd4985223a90dd512bd97d6c576b2e558f121b489eef4d1c6d2173ddbb2f786c7e593ff336e56aef9a13f68a225ee593f81d5e4f2d112a4935c1d49c82218dcb
+DIST qtwebengine-everywhere-src-6.9.0.tar.xz 672153992 BLAKE2B aa5d7c77624857b321bd5cc44322fc7cf56ceffd449f678f7ba8e16febbd55c5e9f30634e59f29d4803b62a9c3f08917dcf9c44b1f45d3d6365705a7c532aceb SHA512 a02a54544250492e343e487c7a0aa53577ebe9cb54e58e8042de8fd9c79304642f8d78fde61f435475c9e41124572776b5a76c2115168450e7b146e3b6b8e051
 EBUILD qtwebengine-5.15.16_p20241115.ebuild 7879 BLAKE2B ce3061b704385359455c0885efe935b9bf1f8e5627ba06a9fbafb1c95cfccdef6f39331868bbaf3d5794d708e7bb6c01cbef28c1880f45fb60d9e81cc73dcf53 SHA512 c31bca254f0962e39f763f49f22930d7c6d51a68169b72e9bf9afb111a01e40c15c82d86743f185480f092c85e8e17c51dc4e07ee7557ac449a00a8d3952be6f
 EBUILD qtwebengine-6.8.2-r1.ebuild 10408 BLAKE2B 42d215e450b4cc2d22fc4f747f4fe4d236b45532273da4741e9f6d2c6d1847ae1c01fe69dafa77b7175b2e50ae8a19eba61693b24fefadd64fcbee51be96aea7 SHA512 9d7b181cf090f9ecccde4d34fd74d2aba1336793992e001aacf6009c917b9e5489d5e26c8b4228634e8f80c38110aecd71c45846ee9c5c28686a30e7f5c5a0ff
 EBUILD qtwebengine-6.8.3.ebuild 10613 BLAKE2B 4ec64ce1ff7d319d3136b98f50ff911c69633a4e63f41871b7a86a76969a13b21b515a40fdcf787b0e741e6df76111c8a307c313e09aa60673acab4e20132156 SHA512 1b2cd55b27792d5439e661cf109412f438cc312e474841a0fc5120c81457feec1896063618e60dd3d10fdf6aa8dcb9425e596df3d51a2ef9517d56f250cd2fa2
-EBUILD qtwebengine-6.9.0_rc.ebuild 10635 BLAKE2B 8f4b4ae533fbe3d465d6966a8c838fdfc349cc5d6bb2022266ef711baef5fe1834a763b7056b48659391b9bb84a39f63eb191dabc381669fecb299c039f9e113 SHA512 81255104382b64cbc7fcb5a9e8986c96135070fea625fe3f77d352ec8d44fb15849d01eef5717e1e8c9f92bc1bcd1a3fb1c951fb784822db41533a8ac3daabcf
+EBUILD qtwebengine-6.9.0.ebuild 10686 BLAKE2B c4418d1a2ddd9d76b9806e6d54909a6f2db1fc0852b25e963cb199d03ee666266610ee5b7f0d131e97b8ed3cc4abfbc7d5d701ca02f34de11a9e4d76fb033307 SHA512 09e80289074df47bc01d1244002942cc1a2425deaa553220fbb818dc9fcaec18f0f0f5595f1364dec3da0d55b3c7eb80fbc8a0a85ed66e163db722fbe1f6ff55
 EBUILD qtwebengine-6.9.9999.ebuild 10637 BLAKE2B ec4a283f0fab1351e312640c2a722f12483cdc17b90c81ba5d05aee1753405b10297103654bb5afefab86310370e7fbc67c6600ea1d4fac40c9422dd80463a95 SHA512 b390d51c0ecd95938dfd95a3e0849a6f8431671be9a2cb9631e9e6c0634bdc1720563e421f2b88773ca39a5c56a10879ea815444511fb62b15fa3e98a2a38d46
 EBUILD qtwebengine-6.9999.ebuild 10549 BLAKE2B 0ba77252767f7dc134d67eaf090c7fe0c60e8b820256fd1a6e0d2d117d5737a2241ee5ee4e770173aeceb3d3738c2bd32406b12503675f1576089f90e515a9d0 SHA512 4eaa844b414ac8c96da1143a5c801779d4c015721a12c5fa41bd01000c699297851bac033f1d56e56fa0bb55a2339912aadcd67448296fd646e2876e819761d3
 MISC metadata.xml 1236 BLAKE2B 9a47d6cb2641ee53f22926095457c11f8da65a3705863a3ae0496d5bb656ac65acb744b5420deb95afee6ac9f141933b4f45690459e92c71089fe72727854a28 SHA512 9a640a386cc03804858fc02b24299896c03eff53a07db00862bab9d7dd259ca839e890921fcf222c8275cad16b418e423e7e485c03e74e01ab86979553251b4c
diff --git a/dev-qt/qtwebengine/files/qtwebengine-6.9.0-x11-pixmap-leak.patch b/dev-qt/qtwebengine/files/qtwebengine-6.9.0-x11-pixmap-leak.patch
new file mode 100644
index 000000000000..17071b0c7354
--- /dev/null
+++ b/dev-qt/qtwebengine/files/qtwebengine-6.9.0-x11-pixmap-leak.patch
@@ -0,0 +1,43 @@
+Patch status: fixed in Qt 6.9.1
+
+https://bugreports.qt.io/browse/QTBUG-135047
+https://codereview.qt-project.org/c/qt/qtwebengine/+/634033
+--- a/src/core/compositor/native_skia_output_device_opengl.cpp
++++ b/src/core/compositor/native_skia_output_device_opengl.cpp
+@@ -214,9 +214,10 @@
+             glFun->glBindTexture(GL_TEXTURE_2D, 0);
+ 
+-            m_frontBuffer->textureCleanupCallback = [glFun, glxFun, display, glxPixmap,
+-                                                     glTexture]() {
++            m_frontBuffer->textureCleanupCallback = [glFun, glxFun, display, glxPixmap, glTexture,
++                                                     glxHelper, pixmapId]() {
+                 glxFun->glXReleaseTexImageEXT(display, glxPixmap, GLX_FRONT_LEFT_EXT);
+                 glFun->glDeleteTextures(1, &glTexture);
+                 glXDestroyGLXPixmap(display, glxPixmap);
++                glxHelper->freePixmap(pixmapId);
+             };
+         }
+--- a/src/core/ozone/glx_helper.cpp
++++ b/src/core/ozone/glx_helper.cpp
+@@ -101,3 +101,13 @@
+ }
+ 
++void GLXHelper::freePixmap(uint32_t pixmapId) const
++{
++    xcb_void_cookie_t cookie = xcb_free_pixmap_checked(m_connection, pixmapId);
++    xcb_generic_error_t *error = xcb_request_check(m_connection, cookie);
++    if (error) {
++        qWarning("GLX: XCB_FREE_PIXMAP failed with error code: 0x%x", error->error_code);
++        free(error);
++    }
++}
++
+ QT_END_NAMESPACE
+--- a/src/core/ozone/glx_helper.h
++++ b/src/core/ozone/glx_helper.h
+@@ -34,4 +34,5 @@
+     GLXPixmap importBufferAsPixmap(int dmaBufFd, uint32_t size, uint16_t width, uint16_t height,
+                                    uint16_t stride) const;
++    void freePixmap(uint32_t pixmapId) const;
+     bool isDmaBufSupported() const { return m_isDmaBufSupported; }
+ 
diff --git a/dev-qt/qtwebengine/qtwebengine-6.9.0_rc.ebuild b/dev-qt/qtwebengine/qtwebengine-6.9.0.ebuild
index 14ce19f4b48d..b71ffaf8fb34 100644
--- a/dev-qt/qtwebengine/qtwebengine-6.9.0_rc.ebuild
+++ b/dev-qt/qtwebengine/qtwebengine-6.9.0.ebuild
@@ -33,7 +33,7 @@ RDEPEND="
 	app-arch/snappy:=
 	dev-libs/expat
 	dev-libs/libevent:=
-	dev-libs/libxml2[icu]
+	dev-libs/libxml2:=[icu]
 	dev-libs/libxslt
 	dev-libs/nspr
 	dev-libs/nss
@@ -108,6 +108,7 @@ PATCHES+=(
 	# add extras as needed here, may merge in set if carries across versions
 	"${FILESDIR}"/${PN}-6.8.2-glibc2.41.patch
 	"${FILESDIR}"/${PN}-6.8.3-pipewire1.4.patch
+	"${FILESDIR}"/${PN}-6.9.0-x11-pixmap-leak.patch
 )
 
 python_check_deps() {