diff options
author | V3n3RiX <venerix@koprulu.sector> | 2024-04-06 00:30:33 +0100 |
---|---|---|
committer | V3n3RiX <venerix@koprulu.sector> | 2024-04-06 00:30:33 +0100 |
commit | 9323524b4d44f4ec3dc923bd8e9ea04bdde8a067 (patch) | |
tree | 8ca7b8c58d4e70389d5d4672ebd86cb475cf9f80 /dev-qt/qtbase | |
parent | 8c11cf748cc296d6338a189106a8cc9e3a1e0948 (diff) |
gentoo auto-resync : 06:04:2024 - 00:30:33
Diffstat (limited to 'dev-qt/qtbase')
-rw-r--r-- | dev-qt/qtbase/Manifest | 6 | ||||
-rw-r--r-- | dev-qt/qtbase/files/qtbase-6.6.3-pkgconf-deps.patch | 35 | ||||
-rw-r--r-- | dev-qt/qtbase/files/qtbase-6.7.0-qspan-ifdef.patch | 29 | ||||
-rw-r--r-- | dev-qt/qtbase/qtbase-6.6.3-r1.ebuild (renamed from dev-qt/qtbase/qtbase-6.6.3.ebuild) | 1 | ||||
-rw-r--r-- | dev-qt/qtbase/qtbase-6.7.0-r1.ebuild (renamed from dev-qt/qtbase/qtbase-6.7.0.ebuild) | 2 |
5 files changed, 71 insertions, 2 deletions
diff --git a/dev-qt/qtbase/Manifest b/dev-qt/qtbase/Manifest index 065df2716d17..ae8177a28fc6 100644 --- a/dev-qt/qtbase/Manifest +++ b/dev-qt/qtbase/Manifest @@ -4,12 +4,14 @@ AUX qtbase-6.5.2-no-symlink-check.patch 152 BLAKE2B 676ff8577f678fe3ed1e34e3fc8f AUX qtbase-6.6.1-forkfd-childstack-size.patch 1003 BLAKE2B abc1bc5633032fc55fca91ef3dcc33617b11694d7a9d97e5eac21c0b4aae900082b7158da08b8514a3424364a3c35cb49d46fa11a0739aadbb73766b7fee949a SHA512 9e1dfb3452858131db286cb30915871e46178bb0891b604a257745fad133676cdf0df5273b6f681c49b1c3d3245f2c6e0a5025ce19efe6a0ed8bf5a1b3a5a5f0 AUX qtbase-6.6.2-x32abi.patch 588 BLAKE2B 787230500a478aa11dc9b9625cd36d0d27eb3ef851b85004477c1505918e829e6b45cc4691bea10fb5afa78be79f6426d25fca86b090af96322c37d8d569bba6 SHA512 364fd14eb58227c3f9c5ba4a73c6c02e2250e16eb9e8c901ebc57ec89897cc630d02636814ec2551c8904115031f6f8b8e5f530b8fa59d5a674af78c8b85d789 AUX qtbase-6.6.3-gcc14-avx512fp16.patch 470 BLAKE2B 616b4fdcee6819a0ca4de1220f7524e0df00e13912e2e28d5c204d1a3e2bc351b9cdc212b9169e4d84e2884df76d9722a73f29734c18fe50cc8e6583e41a5cc2 SHA512 1effa903d5d3c65ffc6af5fb2f9896346b4b90cd1f8a54f0a697f23f1c118dd1803b5f4fa9b4959cf4ba1c433d36ca21a6abe6cb3bfae84a811297566388e907 +AUX qtbase-6.6.3-pkgconf-deps.patch 1873 BLAKE2B a801c6aba664e676dabf421d0a8b912359b3c66cd12a67b0f16f501feec101ba0e5247d34ac43279da1b1dfc513a504d57dd56dc9f114ecf7dca501c09703622 SHA512 1bacc3ca28dd9a866570f3f792ac6613a1a291e0a0a0b2cda5d8c314e6a0ab1ae8104d7066addabd3693d5424d390eccad953bcd94c1aa296ce1394141ff0f28 +AUX qtbase-6.7.0-qspan-ifdef.patch 1027 BLAKE2B 3ab8bb2b3ec7017ae8e6ef884e1acc67ea2bb342f8c5cb2c74f11d543930b228932d5c12141213dfd93ab9d28385dbded34406739318f1605db7d3b8d9fab48c SHA512 d23600d6efd4f5ad653105771c80c26d7bd463860ead47fe1562db5b1a66a320c41082e9fd3273834d90b8e7718e3365d46cc4bb5cbf88b359c11e234f501d7d DIST qtbase-everywhere-src-6.6.2.tar.xz 48689304 BLAKE2B e00f4ac7ede0694b7934612f7dc3acdd50139d385492034c3046625a973d8adbca059e9d4081e248502cab8c673806cdb6b8bc5cee6d9356bbb0a7845db528a2 SHA512 ea343bcf269779a4e078ed8baddfbe6c5ec4a34275c7d72b3f3928da60feece2ddc9ce4a380c6536a4e1654b483cee8918f8ad3038904725d2dd1c653ae83ece DIST qtbase-everywhere-src-6.6.3.tar.xz 48784716 BLAKE2B f79e369c31968d026fb50dd64d53931ea28c25bd7eb442806760f733dbcacd868774d1c991d4da80c5eb40e24d75ffaba61b2cb9036fdc2d189f865b22143596 SHA512 cd96903a3947a1f5cf6a3ff21ab0b3209ed421d2a8c45acb34ae5aa7ad0501cb79e26cfa81bc02141d5731ebfa662442f37806e97994332077d963c9e70a5f54 DIST qtbase-everywhere-src-6.7.0.tar.xz 49314276 BLAKE2B f4ec35fd3c15d56a28e1608dec927eaf34d84c2250405d921adadc16d90ec148f4983024dcf9be1832de91381d18e33fd7578d60d8654469e23530a210618e11 SHA512 72896cc5a677361779f49d60dbdfc33a21d77bd479e0586b0beb03eee2016d613aee56e798143a489431a07a5e7a7db4c7c046105a11b63dd178768f3a7f195a EBUILD qtbase-6.6.2-r1.ebuild 10021 BLAKE2B 6ae2a9a7936ef546aed4d69172e0a7ed2e9f55e41679f6b1acb2d8a8c3494f4659bbf3168e97b447bd73a3c845a32f9f3a70e143c4734338e20d76f621f33926 SHA512 0a57aab7621c5415e8172f74c6d240118df5202643f78de00f407f7308c89794ab60560b1e52c49583928c7da4bffa3d4fbf5f5f126b069033d096536c95acfe -EBUILD qtbase-6.6.3.ebuild 10102 BLAKE2B 7c2f4660a5082fba4e79a6f5be30fc34e75ae6822ea506bdbc58e050a6c1a8d0238eb0b2003f0a5d87c867ea7f84f3e67fa9e8dc3f82f8705a94b286bf683b9d SHA512 27216904c16e148e6d79b1f53306b3f69d70404931ea7879ef7559cbc2b23a140a8ed1fe10eaeffb4a38b6dbcf7555ecd965c117dadde34d1a6d3e94a7c3fc44 -EBUILD qtbase-6.7.0.ebuild 10469 BLAKE2B 0bb3dd926ef658a36feb141ac462fb7b116c8d491db1887671b862cab1e9814ebe7bd2cac5688447c6e21b26a3701ce4f21eb576f1992bd8e174d46f58220b1a SHA512 0e3c0535a25cddfc93dbe2274164fe0559df45adbb4c32a49c12fb2e542fdddd643d88349835fcf90b1a20ec4790a53518c35ccaf51019ffb58ff86e0dd2b860 +EBUILD qtbase-6.6.3-r1.ebuild 10148 BLAKE2B 0778bee274ce6360f0399506a965a4f4a3325494d7f0b9a8a39abb3ed6a31906cfd55cd8b1e20a72595823b20a5bb08b07ff9701bf0677e39c30fca46f724cc9 SHA512 495383fa2c27db4a7cd17f3d66561b61f66496884db22b5919b709adddf80143a7e840f19c04ece0dbf17145329cf4c3bd75510a0f585c9ea4af5aa60d3ee491 +EBUILD qtbase-6.7.0-r1.ebuild 10560 BLAKE2B c3d1bf833a8dc789d6a9c882041b0543da4d590d77eb8fdf7b136442b43d7d922ee7dfbfe53668e1e1393776496b9fbc1c62300090971d387ab33360d0495a97 SHA512 edf70a77ec3258da28fcb69ce51c3d6a420dedc38b9f580a2f0b83f2f9a1faaef14891270de0c8f861856fc3ff6966b8da9a08985afddf508955744c54bcff88 EBUILD qtbase-6.7.9999.ebuild 10469 BLAKE2B 0bb3dd926ef658a36feb141ac462fb7b116c8d491db1887671b862cab1e9814ebe7bd2cac5688447c6e21b26a3701ce4f21eb576f1992bd8e174d46f58220b1a SHA512 0e3c0535a25cddfc93dbe2274164fe0559df45adbb4c32a49c12fb2e542fdddd643d88349835fcf90b1a20ec4790a53518c35ccaf51019ffb58ff86e0dd2b860 EBUILD qtbase-6.9999.ebuild 10469 BLAKE2B 0bb3dd926ef658a36feb141ac462fb7b116c8d491db1887671b862cab1e9814ebe7bd2cac5688447c6e21b26a3701ce4f21eb576f1992bd8e174d46f58220b1a SHA512 0e3c0535a25cddfc93dbe2274164fe0559df45adbb4c32a49c12fb2e542fdddd643d88349835fcf90b1a20ec4790a53518c35ccaf51019ffb58ff86e0dd2b860 MISC metadata.xml 1655 BLAKE2B 1f3bdbe5f14716d1825ff0ce6d3a9439a87c0c18abd0bb6a2286c9709e815205f2f6911ef5d053b57598aa54471d4316f87c9a4d36004be15f499447785f14bd SHA512 d1479bae177f75991241eacaa1300f43d644730fa3d6d7e6e039b8a212f1289b920b6e1aad7c56576857049f133492f5cf648c7931228c6c4ee272d93437e351 diff --git a/dev-qt/qtbase/files/qtbase-6.6.3-pkgconf-deps.patch b/dev-qt/qtbase/files/qtbase-6.6.3-pkgconf-deps.patch new file mode 100644 index 000000000000..965dade1c133 --- /dev/null +++ b/dev-qt/qtbase/files/qtbase-6.6.3-pkgconf-deps.patch @@ -0,0 +1,35 @@ +https://bugs.gentoo.org/928299 +https://bugreports.qt.io/browse/QTBUG-124135 +https://codereview.qt-project.org/c/qt/qtbase/+/553372 +From: Alexey Edelev <alexey.edelev@qt.io> +Date: Fri, 05 Apr 2024 14:50:37 +0200 +Subject: [PATCH] Prefer the versioned targets over the namespaceless one when collecting deps + +Change the way we collect dependencies in __qt_internal_walk_libs. +Prefer the versioned Qt targets over the namespaceless. This fixes the +generating of the pkg-config configs. + +Pick-to: 6.5 6.6 6.7 +Task-number: QTBUG-124135 +Change-Id: I660376e122a99b5bc0874f2bc6ccd4d80c9ad453 +--- a/cmake/QtPublicWalkLibsHelpers.cmake ++++ b/cmake/QtPublicWalkLibsHelpers.cmake +@@ -184,13 +184,13 @@ + if(lib_target MATCHES "^::@") + continue() + elseif(TARGET ${lib_target}) +- if ("${lib_target}" MATCHES "^Qt::(.*)") +- # If both, Qt::Foo and Foo targets exist, prefer the target name without ++ if(NOT "${lib_target}" MATCHES "^(Qt|${QT_CMAKE_EXPORT_NAMESPACE})::.+") ++ # If both, Qt::Foo and Foo targets exist, prefer the target name with versioned + # namespace. Which one is preferred doesn't really matter. This code exists to + # avoid ending up with both, Qt::Foo and Foo in our dependencies. +- set(namespaceless_lib_target "${CMAKE_MATCH_1}") +- if(TARGET "${namespaceless_lib_target}") +- set(lib_target ${namespaceless_lib_target}) ++ set(versioned_qt_target "${QT_CMAKE_EXPORT_NAMESPACE}::${lib_target}") ++ if(TARGET "${versioned_qt_target}") ++ set(lib_target ${versioned_qt_target}) + endif() + endif() + get_target_property(lib_target_type ${lib_target} TYPE) diff --git a/dev-qt/qtbase/files/qtbase-6.7.0-qspan-ifdef.patch b/dev-qt/qtbase/files/qtbase-6.7.0-qspan-ifdef.patch new file mode 100644 index 000000000000..4c2a37cb6c35 --- /dev/null +++ b/dev-qt/qtbase/files/qtbase-6.7.0-qspan-ifdef.patch @@ -0,0 +1,29 @@ +https://bugreports.qt.io/browse/QTBUG-123937 +From 6810220218cbbf2854ecdedb291f7e4a84b31e54 Mon Sep 17 00:00:00 2001 +From: Albert Astals Cid <aacid@kde.org> +Date: Wed, 3 Apr 2024 00:47:01 +0200 +Subject: [PATCH] Use ifdef instead of if for __cpp_lib_span + +Like the other times it's used in this file + +This is causing compilation errors in projects that use -Werror=undef + +Fixes: QTBUG-123937 +Change-Id: I0cdd2910755dc9079890011dd8dbc27a6e64793e +Reviewed-by: Thiago Macieira <thiago.macieira@intel.com> +(cherry picked from commit 699ddcb15b5e981d32ea65d1c1a12f8fa0b06e0d) +Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org> +--- a/src/corelib/tools/qspan.h ++++ b/src/corelib/tools/qspan.h +@@ -297,7 +297,7 @@ public: + : QSpanBase(il.begin(), il.size()) + {} + +-#if __cpp_lib_span ++#ifdef __cpp_lib_span + template <typename S, size_t N, if_qualification_conversion<S> = true> + Q_IMPLICIT constexpr QSpanBase(std::span<S, N> other) noexcept + : QSpanBase(other.data(), other.size()) +-- +2.44.0 + diff --git a/dev-qt/qtbase/qtbase-6.6.3.ebuild b/dev-qt/qtbase/qtbase-6.6.3-r1.ebuild index 61f586a93393..e0cd4c8e4736 100644 --- a/dev-qt/qtbase/qtbase-6.6.3.ebuild +++ b/dev-qt/qtbase/qtbase-6.6.3-r1.ebuild @@ -138,6 +138,7 @@ PATCHES=( "${FILESDIR}"/${PN}-6.5.2-no-symlink-check.patch "${FILESDIR}"/${PN}-6.6.1-forkfd-childstack-size.patch "${FILESDIR}"/${PN}-6.6.3-gcc14-avx512fp16.patch + "${FILESDIR}"/${PN}-6.6.3-pkgconf-deps.patch ) src_prepare() { diff --git a/dev-qt/qtbase/qtbase-6.7.0.ebuild b/dev-qt/qtbase/qtbase-6.7.0-r1.ebuild index 016279f8fec5..12bb87d5843d 100644 --- a/dev-qt/qtbase/qtbase-6.7.0.ebuild +++ b/dev-qt/qtbase/qtbase-6.7.0-r1.ebuild @@ -139,6 +139,8 @@ PATCHES=( "${FILESDIR}"/${PN}-6.5.2-no-symlink-check.patch "${FILESDIR}"/${PN}-6.6.1-forkfd-childstack-size.patch "${FILESDIR}"/${PN}-6.6.3-gcc14-avx512fp16.patch + "${FILESDIR}"/${PN}-6.6.3-pkgconf-deps.patch + "${FILESDIR}"/${PN}-6.7.0-qspan-ifdef.patch ) src_prepare() { |