diff options
| author | V3n3RiX <venerix@koprulu.sector> | 2025-01-21 06:42:16 +0000 |
|---|---|---|
| committer | V3n3RiX <venerix@koprulu.sector> | 2025-01-21 06:42:16 +0000 |
| commit | 30c47f3c341cb37e4808aaa3842b679d0ca420e8 (patch) | |
| tree | 30eb5383b9ae93fec49d9a5660b34201e6190933 /dev-qt/qtbase | |
| parent | cd57012a0ef40d302cf7d5a92dd2f3dfae285d2f (diff) | |
gentoo auto-resync : 21:01:2025 - 06:42:16
Diffstat (limited to 'dev-qt/qtbase')
| -rw-r--r-- | dev-qt/qtbase/Manifest | 3 | ||||
| -rw-r--r-- | dev-qt/qtbase/files/qtbase-6.8.2-pyqt6.patch | 18 | ||||
| -rw-r--r-- | dev-qt/qtbase/qtbase-6.8.9999.ebuild | 3 |
3 files changed, 22 insertions, 2 deletions
diff --git a/dev-qt/qtbase/Manifest b/dev-qt/qtbase/Manifest index 2240d3d2dec4..dfee88f55100 100644 --- a/dev-qt/qtbase/Manifest +++ b/dev-qt/qtbase/Manifest @@ -3,9 +3,10 @@ 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.3-gcc14-avx512fp16.patch 470 BLAKE2B 616b4fdcee6819a0ca4de1220f7524e0df00e13912e2e28d5c204d1a3e2bc351b9cdc212b9169e4d84e2884df76d9722a73f29734c18fe50cc8e6583e41a5cc2 SHA512 1effa903d5d3c65ffc6af5fb2f9896346b4b90cd1f8a54f0a697f23f1c118dd1803b5f4fa9b4959cf4ba1c433d36ca21a6abe6cb3bfae84a811297566388e907 AUX qtbase-6.8.0-qcontiguouscache.patch 526 BLAKE2B b701f92d8365e8408a2ff79c812c397ac0042aa6b6316cf167a7877d48044ffaa0d2683fa27ffcbe80c8e74f8ff0c8af220b927889e83340c6b5325b1fbf16ab SHA512 19f33f2dd856c8328b9175458250929f3da34cde179d5f52ec1982e5e5f1772412f2541e146763a6258ce3377e0b624f07926fe4af56de7364c34835151b8995 +AUX qtbase-6.8.2-pyqt6.patch 780 BLAKE2B 50e8400961d2d48be53d2c892bb751ee568c0c3969339787219c5ffc49bd9740328c99cf2a98e50462e2d354964309ce05a36e5f6deaef43128306366dc8658e SHA512 a3e29ec324e4762ad54de8e60258ed3dc5c167562d1f9cbb7a1e61535cc823587d44c7d51fe438bcf021b370ab918a57ef2a822a63f17b5fecc0564632f276de DIST qtbase-everywhere-src-6.8.1.tar.xz 48220752 BLAKE2B b42d562f9069cf3d68807c63492f0ae1dcb9cb9a057a8d8548a7d134b36af169e403324e2902fa59c6c82ce087add107173c7606dff952dbbbc06c33b056ddff SHA512 87b7df95a63f7c28bfc7659f19658e4151b9da55b0dc4d34dc0e04c5270254b01a72f8deac0b2fc5543fce8d7542128addb398833de9c3248196aa96b2dd1601 EBUILD qtbase-6.8.1.ebuild 10455 BLAKE2B 47d0e9fda4aa3a2347b6feeddccc820f528849cd32ec707175cd243a5c390b99fa78bccd23054ad5f14e15ab1ba457f9ac1af6ae3bf0477f646a179aa6692f42 SHA512 d9a21714af5063b3b2c76eb2606ea6d597cfdabc9c3ab3edb36df547d55ce15d38e605c8b54cc9da257237b209b72c6c06c3eac0477bc95dfcb2756f6ebbad87 -EBUILD qtbase-6.8.9999.ebuild 10461 BLAKE2B 950b76161b91e97a7de963370dc15ef98ed1043167b0ec306ba9c8a736f95d0d2e236f3f84ce6c81d32ae2a0a3a44c2e4b42973de1e64365a04b9ec8ef322271 SHA512 303e240140391cfbe37762862d0b3ba1908f6a80598b7be0ec5e4cb8fab6849491d46f3f365d02d142f0214ee5266d39f54a70fefdb29b3f5534be7b06c4d9fa +EBUILD qtbase-6.8.9999.ebuild 10500 BLAKE2B d6f63ddd4b8467ee0009f799dfd681aafea8c7423d900bceea6a3f0aba7ce9fabb054adda36fa41e9449179784d9ef00a2b5a4baa5a6cca1e329d3d232c686cc SHA512 456740fc75780d578df645d757ee0c3cd0344d3b11f1aca6835ca2eb398587e1e92a246ba0b871d2e788f5d59d95ce5229d2146fcee6263895e45b269094adc6 EBUILD qtbase-6.9.9999.ebuild 10447 BLAKE2B ad7dcb0b911dc13777025baad5eb34e6ed6802591b06cb4c6db9fde94498ff06902c51a5471fc845b4e2b3530f94ed454a8a2f85cb5e3dfe4a680795fb0b2a8f SHA512 4f1d0f53d795744cf74b04ed6a42493646b5bf540d7d4ff6176529e55f2c4927db922d09d603ee4270f0b0911c8c55d38126de68db88067bbf8e9fdffff0a91f EBUILD qtbase-6.9999.ebuild 10447 BLAKE2B ad7dcb0b911dc13777025baad5eb34e6ed6802591b06cb4c6db9fde94498ff06902c51a5471fc845b4e2b3530f94ed454a8a2f85cb5e3dfe4a680795fb0b2a8f SHA512 4f1d0f53d795744cf74b04ed6a42493646b5bf540d7d4ff6176529e55f2c4927db922d09d603ee4270f0b0911c8c55d38126de68db88067bbf8e9fdffff0a91f MISC metadata.xml 1965 BLAKE2B e91aa3bc2379fa587766cfc7c4053b382a8894c0092d075543b2a5d466dfa001105bb0f564008fab8e71d4517954e527618896de41069c6bafb4258f6201cdbe SHA512 a71f6fe0fb01e60716aa6632605a423f765983f41da2c8ca761afca548cd061bd52bc328f7441fa831e890d75bcfc2820112c946802588dab1de706fbb7ac531 diff --git a/dev-qt/qtbase/files/qtbase-6.8.2-pyqt6.patch b/dev-qt/qtbase/files/qtbase-6.8.2-pyqt6.patch new file mode 100644 index 000000000000..de728b73f404 --- /dev/null +++ b/dev-qt/qtbase/files/qtbase-6.8.2-pyqt6.patch @@ -0,0 +1,18 @@ +Revert of [1] which breaks PyQt6, and reverting "shouldn't" +negatively affected anything. Can probably leave this until +6.9.x instead (or at least until PyQt6-6.8.2 is released). +Please file a bug to Gentoo if believe that this is wrong. + +Ideally need to fix PyQt6 itself, but proper fix hasn't been +figured out yet, and PyQt6-6.8.2 may take a while to release. +--- a/src/corelib/text/qstringconverter_base.h ++++ b/src/corelib/text/qstringconverter_base.h +@@ -81,8 +81,5 @@ public: + }; + protected: +- QStringConverterBase() = default; + ~QStringConverterBase() = default; +- QStringConverterBase(QStringConverterBase &&) = default; +- QStringConverterBase &operator=(QStringConverterBase &&) = default; + }; + Q_DECLARE_OPERATORS_FOR_FLAGS(QStringConverterBase::Flags) diff --git a/dev-qt/qtbase/qtbase-6.8.9999.ebuild b/dev-qt/qtbase/qtbase-6.8.9999.ebuild index 11036a11512b..584b606a0590 100644 --- a/dev-qt/qtbase/qtbase-6.8.9999.ebuild +++ b/dev-qt/qtbase/qtbase-6.8.9999.ebuild @@ -1,4 +1,4 @@ -# Copyright 2021-2024 Gentoo Authors +# Copyright 2021-2025 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -146,6 +146,7 @@ PATCHES=( "${FILESDIR}"/${PN}-6.6.1-forkfd-childstack-size.patch "${FILESDIR}"/${PN}-6.6.3-gcc14-avx512fp16.patch "${FILESDIR}"/${PN}-6.8.0-qcontiguouscache.patch + "${FILESDIR}"/${PN}-6.8.2-pyqt6.patch ) src_prepare() { |