From 9e65a38a260a44292ceb8a0bf4fea5f0b5666826 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sat, 19 Apr 2025 08:46:18 +0100 Subject: gentoo auto-resync : 19:04:2025 - 08:46:17 --- dev-qt/Manifest.gz | Bin 11547 -> 11545 bytes dev-qt/qtwebengine/Manifest | 7 +++--- .../files/qtwebengine-6.8.3-gperf3.2.patch | 26 +++++++++++++++++++++ dev-qt/qtwebengine/qtwebengine-6.8.3.ebuild | 1 + dev-qt/qtwebengine/qtwebengine-6.9.0-r1.ebuild | 1 + dev-qt/qtwebengine/qtwebengine-6.9.9999.ebuild | 1 + 6 files changed, 33 insertions(+), 3 deletions(-) create mode 100644 dev-qt/qtwebengine/files/qtwebengine-6.8.3-gperf3.2.patch (limited to 'dev-qt') diff --git a/dev-qt/Manifest.gz b/dev-qt/Manifest.gz index 867088f6c36e..8fabeff01d66 100644 Binary files a/dev-qt/Manifest.gz and b/dev-qt/Manifest.gz differ diff --git a/dev-qt/qtwebengine/Manifest b/dev-qt/qtwebengine/Manifest index 23ef80907107..189df84912b8 100644 --- a/dev-qt/qtwebengine/Manifest +++ b/dev-qt/qtwebengine/Manifest @@ -8,6 +8,7 @@ AUX qtwebengine-6.8.1-aarch64-xnnpack.patch 629 BLAKE2B 2809c1e159252c3131c318cd AUX qtwebengine-6.8.2-cstdint.patch 1221 BLAKE2B 8e2131e54dc398c7518ba49b75e38db69517c9abddf44dad2bcddb0c1e364316965cdf8f439502fa9c8b92916532fb7f5316dd8122dee7852508a098f1556976 SHA512 8169ef9bbce67b1e51aea3611ef3c4dc8809d89fcda78cb91fb7e4952aa7c6a5b66c7c4b73724953c2b69107c240f60e37e7d2d209cdbfe84ab2f8c76c15b561 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-gperf3.2.patch 1445 BLAKE2B e8962d9450a334471d7aa27bd53cb30f00e8207346ff1176f412c67a72c89a06f72d323b1612a79995f9e2768580f48ff03168063b94b3d140762b50c8028161 SHA512 ec9f044f19d0ab762a20fa1de9af45c469b3b0a0a294b3664a2115336674feccceb6141faf6f5b9abcaa09fb9a610fcd75bfacea4ae17b04235c61c6a58f4d99 AUX qtwebengine-6.8.3-pipewire1.4.patch 837 BLAKE2B 3266bcfbc1b76e491f51cc094ad03a579a89795895bed915356d91470daf21914cacd13ed28f6f178bd0c34dfd135c26fbcb7c665239c804fdc90a14c0b94c88 SHA512 d8defe246f194256e68c75a8fb011824f47c200f6003d65292384607b33f6d01ad682e42194a8f1ea98a2a6b087e92b202570ed1960bf566ae86648e97ec53d5 AUX qtwebengine-6.9.0-QTBUG-133570.patch 3680 BLAKE2B 7841470adec5ce0dbae703afb70b227d5c9933127012e69a7284b4fca8e51ff51a234080681dfcf690474a06d1241056f3d1a8c5a8fb7fa3dadd21570d8f6243 SHA512 77548bea3a45f99d3c4e9427a48cf1e7b8909c9ab75db2c4fd5b01c4f1b15e5cccb13cecb5320f72cd729814114e02c5d871fd43f94fe172e1a95621a4fa1b1c AUX qtwebengine-6.9.0-x11-pixmap-leak.patch 1789 BLAKE2B 609280175bdacddfbf03cc553aa814ab4ff6be147f43c864416f2c1611f043ef6d4a05f9c1e3f2a834a175f91ef10e8eb881a582ee4ef3d4eefa26cf96d6bbb1 SHA512 53d932583942b2dd7fc04b2a7a8c5a5b6860f28312c7a1f0ed0571149ddb34c1d180218847d5898c33f2b3039fa06c5751f25a7d85afcb8b54a0fa6992e6644b @@ -20,8 +21,8 @@ DIST qtwebengine-everywhere-src-6.8.3.tar.xz 566553436 BLAKE2B a3188d79f9d3b5242 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 10790 BLAKE2B da8ac30e223c5f9e1f5d90f102eb045fb6a3e168987911b14fce104cf31d8477e27b3708973ef6a93b342e00b35d4dbfdf2557833af4379c069776d2e097fbcd SHA512 ca6a4f00d096413f1b9c2afea9e65a20794052e2a2d21e39da08bf9ebc3bf1c021d29cf65842065ebddfff765ab2be4c4529397ff2396dd73e72fd776266fe0e -EBUILD qtwebengine-6.9.0-r1.ebuild 10911 BLAKE2B 919a6645b04887188c47987d593d849f92f3eb93c8589fdabe0bd9891324cd36bcdf0ee6136315cd020c2f0f85cb52609e5094dd5a34faf1b0cbaedaa1539c9b SHA512 943954e55b96dab041d96cdf50e7db7d47ffae3409e814a40e5084fffef6c608ef1a278671d987abd7f828842d6c63bd9aba086d98d6540db69cccd715bf54f6 -EBUILD qtwebengine-6.9.9999.ebuild 10816 BLAKE2B 858f79a55105a96b7b8e47d4881fd5ae67fb3e3aa016bffa689701c652b7ea3791583e4622c12e785864897c238b307029e8bfbbd361e1fce0ecda3a7645c25e SHA512 b248eb9c405346751ee87e885c28073fd406ad3e2d25014e8e7078d88a08f86f29677b512bd8e167a383487df937aeddefffd8f4a9b429af1a610c187e8a958f +EBUILD qtwebengine-6.8.3.ebuild 10832 BLAKE2B 5f10a818da1fca3aa5f5d0dd3e4f8b70f8c27c43ba1af54e13ca8b63e995469a9a6fb0ebc2500076e055b4660cfdce45b90aac11eee7ffb25e79402c5a0cc406 SHA512 e1aa5607f9d9694ae4418da3d615c77eda2193b06d556c0a956c827168ea9fe2004f85c85fbf5802afdd912d46a08065536324e3dc0c12c33ba88cf9912396e4 +EBUILD qtwebengine-6.9.0-r1.ebuild 10953 BLAKE2B 4cd803344794b8f28beb33d1b2628a0e0108a207937234b5b0288e0a238be95dc8f2bcb72c12375645065db01a7bfa6ec58fbbff39e5f5c9aea9616d890014c1 SHA512 3a167bb783866d9b509eb5a63c53121e07985ec8512a06f86d8892a691cc70aec3da067d7e442bc4dc3073ff47b5e1cf4bea61d8fd619d54410f6d18816d5edc +EBUILD qtwebengine-6.9.9999.ebuild 10858 BLAKE2B befe0669edc84acdeeca46dead7d90c846ac9003221aa26d14ffd9f77219a02042a4ee1d3d3c134bb47a0268b577982959c09eb3c3b6ca18b75af34caab1c458 SHA512 a68a0503dd476ae4522f4ef4e2b48f6b4b1df4fe8b231d58698fd0bfa7804c84f22d63b3fb525a9e684338bce1fff4787a709cf75c9c17aff3cd57f9a633f661 EBUILD qtwebengine-6.9999.ebuild 10728 BLAKE2B 1930caabeb0d322516d83d0fa478f27f0c3f3a15dee67348f3f805c16d9fc3f4c4acf2ebbdbaa7d60946bd8ac7ff509fe16508fc15f2cda3c8784240c6db52ff SHA512 0b225462f640996869ba915ffba4a5230563e7d268ed1572e76312e5f4de41e77b4eb92acf242a920d5cb27795cacbc52c3e7aa82c8e52d043768b15cbf2c5f7 MISC metadata.xml 1236 BLAKE2B 9a47d6cb2641ee53f22926095457c11f8da65a3705863a3ae0496d5bb656ac65acb744b5420deb95afee6ac9f141933b4f45690459e92c71089fe72727854a28 SHA512 9a640a386cc03804858fc02b24299896c03eff53a07db00862bab9d7dd259ca839e890921fcf222c8275cad16b418e423e7e485c03e74e01ab86979553251b4c diff --git a/dev-qt/qtwebengine/files/qtwebengine-6.8.3-gperf3.2.patch b/dev-qt/qtwebengine/files/qtwebengine-6.8.3-gperf3.2.patch new file mode 100644 index 000000000000..b44934ab59d3 --- /dev/null +++ b/dev-qt/qtwebengine/files/qtwebengine-6.8.3-gperf3.2.patch @@ -0,0 +1,26 @@ +Patch status: fixed in >=chromium-137.0.7126.0 + +A old workaround for a gperf-3.1 issue[1] breaks building with the +now fixed gperf-3.2, backport the conditional check[2] which should +work with either. + +[1] https://savannah.gnu.org/bugs/index.php?53029 +[2] https://crrev.com/f8f21fb4aa01f75acbb12abf5ea8c263c6817141 +--- a/src/3rdparty/chromium/third_party/blink/renderer/build/scripts/gperf.py ++++ b/src/3rdparty/chromium/third_party/blink/renderer/build/scripts/gperf.py +@@ -36,8 +36,11 @@ + gperf_output = re.sub(r'\bregister ', '', gperf_output) + # -Wimplicit-fallthrough needs an explicit fallthrough statement, +- # so replace gperf's /*FALLTHROUGH*/ comment with the statement. +- # https://savannah.gnu.org/bugs/index.php?53029 +- gperf_output = gperf_output.replace('/*FALLTHROUGH*/', +- ' [[fallthrough]];') ++ # so replace gperf 3.1's /*FALLTHROUGH*/ comment with the statement. ++ # https://savannah.gnu.org/bugs/index.php?53029 (fixed in 3.2) ++ if re.search( ++ r'/\* C\+\+ code produced by gperf version 3\.[01](\.\d+)? \*/', ++ gperf_output): ++ gperf_output = gperf_output.replace('/*FALLTHROUGH*/', ++ ' [[fallthrough]];') + # -Wpointer-to-int-cast warns about casting pointers to smaller ints + # Replace {(int)(long)&(foo), bar} with diff --git a/dev-qt/qtwebengine/qtwebengine-6.8.3.ebuild b/dev-qt/qtwebengine/qtwebengine-6.8.3.ebuild index a6966b336a51..26d726baf01b 100644 --- a/dev-qt/qtwebengine/qtwebengine-6.8.3.ebuild +++ b/dev-qt/qtwebengine/qtwebengine-6.8.3.ebuild @@ -114,6 +114,7 @@ PATCHES+=( "${FILESDIR}"/${PN}-6.8.2-glibc2.41.patch "${FILESDIR}"/${PN}-6.8.3-clang20.patch "${FILESDIR}"/${PN}-6.8.3-pipewire1.4.patch + "${FILESDIR}"/${PN}-6.8.3-gperf3.2.patch ) python_check_deps() { diff --git a/dev-qt/qtwebengine/qtwebengine-6.9.0-r1.ebuild b/dev-qt/qtwebengine/qtwebengine-6.9.0-r1.ebuild index 81125ccc89f3..553345282707 100644 --- a/dev-qt/qtwebengine/qtwebengine-6.9.0-r1.ebuild +++ b/dev-qt/qtwebengine/qtwebengine-6.9.0-r1.ebuild @@ -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.8.3-gperf3.2.patch "${FILESDIR}"/${PN}-6.9.0-x11-pixmap-leak.patch "${FILESDIR}"/${PN}-6.9.0-QTBUG-133570.patch ) diff --git a/dev-qt/qtwebengine/qtwebengine-6.9.9999.ebuild b/dev-qt/qtwebengine/qtwebengine-6.9.9999.ebuild index 05000f1cc1ad..3df3a6306817 100644 --- a/dev-qt/qtwebengine/qtwebengine-6.9.9999.ebuild +++ b/dev-qt/qtwebengine/qtwebengine-6.9.9999.ebuild @@ -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.8.3-gperf3.2.patch ) python_check_deps() { -- cgit v1.2.3