diff options
Diffstat (limited to 'dev-qt')
| -rw-r--r-- | dev-qt/Manifest.gz | bin | 11908 -> 11908 bytes | |||
| -rw-r--r-- | dev-qt/qtbase/Manifest | 3 | ||||
| -rw-r--r-- | dev-qt/qtbase/files/qtbase-6.8.2-QTBUG-133500.patch | 58 | ||||
| -rw-r--r-- | dev-qt/qtbase/qtbase-6.8.2-r1.ebuild (renamed from dev-qt/qtbase/qtbase-6.8.2.ebuild) | 1 |
4 files changed, 61 insertions, 1 deletions
diff --git a/dev-qt/Manifest.gz b/dev-qt/Manifest.gz Binary files differindex b4d1a744523a..ecf0e7eee68f 100644 --- a/dev-qt/Manifest.gz +++ b/dev-qt/Manifest.gz diff --git a/dev-qt/qtbase/Manifest b/dev-qt/qtbase/Manifest index 070d9b61acef..83671dfe60a5 100644 --- a/dev-qt/qtbase/Manifest +++ b/dev-qt/qtbase/Manifest @@ -3,10 +3,11 @@ 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-QTBUG-133500.patch 1800 BLAKE2B cc5af9a4d2a6956589bab2d1e9f669a4fd8e33f76c0ca713ed1309870fc35155c4b447feb4e9708d723aff18947ac2245913eccb726631c2b210751a719fb3ab SHA512 ed68106db666693f48215e3053ba3b40d78713661e081aaa23e6e0cd380b8d13374f92fb22df049a04e21b6265781c44160758e4613114f645275e5e388ead4a DIST qtbase-everywhere-src-6.8.1.tar.xz 48220752 BLAKE2B b42d562f9069cf3d68807c63492f0ae1dcb9cb9a057a8d8548a7d134b36af169e403324e2902fa59c6c82ce087add107173c7606dff952dbbbc06c33b056ddff SHA512 87b7df95a63f7c28bfc7659f19658e4151b9da55b0dc4d34dc0e04c5270254b01a72f8deac0b2fc5543fce8d7542128addb398833de9c3248196aa96b2dd1601 DIST qtbase-everywhere-src-6.8.2.tar.xz 48264736 BLAKE2B 3c4a71a0c515d7433eda3a6155a0499ea43ce708fb25614843499bf8a7a71ef06ba93dad9e7dd04a28b86a88eea00151ad3500d06bd09b9b37a4e070774e2684 SHA512 4a074aca1c8bcca536fd428c969c0119f5131d0d52b67028edbb75a81dc6e0c15394f69e29cef513e6d8c6e93384cedc38dd03b0eed6ab1bbafbe2b5bbc85799 EBUILD qtbase-6.8.1.ebuild 10455 BLAKE2B 47d0e9fda4aa3a2347b6feeddccc820f528849cd32ec707175cd243a5c390b99fa78bccd23054ad5f14e15ab1ba457f9ac1af6ae3bf0477f646a179aa6692f42 SHA512 d9a21714af5063b3b2c76eb2606ea6d597cfdabc9c3ab3edb36df547d55ce15d38e605c8b54cc9da257237b209b72c6c06c3eac0477bc95dfcb2756f6ebbad87 -EBUILD qtbase-6.8.2.ebuild 10461 BLAKE2B 1e5ac52cd2551966132c5a821cb33d090c2e38f3cbcfe39d6ef8ee300e8d94884e8f9392d3512e0ceb4c9d9c35441476a0bfe95e41568ab4d6459337b3e2efe9 SHA512 1bbd2f11788e640a0ec4c4a7c512fddf3ed22ec8cd75970adda5d7009766ad0776b31c0bf6690548fc9ba6aae3e4ec1a08df9e73b3bacd751d408cef7beed028 +EBUILD qtbase-6.8.2-r1.ebuild 10500 BLAKE2B ea6dc1905a4f70401a79aaaf422b470ff6a5bf5503140e23aff82dd4d4d79fd8610341a91ace1d605df191057503f9291c6f30cc21b92d71fb9e526dd508ad09 SHA512 4b5d09819b051c6530ee824b4c00a316240c08437dc3b5159eb8ffba2d5f273ec1a8dae243ac0fc55251e8c61bf9d407e50a49dfaa5f0b6feb87e6b122d75e9c EBUILD qtbase-6.8.9999.ebuild 10461 BLAKE2B 1e5ac52cd2551966132c5a821cb33d090c2e38f3cbcfe39d6ef8ee300e8d94884e8f9392d3512e0ceb4c9d9c35441476a0bfe95e41568ab4d6459337b3e2efe9 SHA512 1bbd2f11788e640a0ec4c4a7c512fddf3ed22ec8cd75970adda5d7009766ad0776b31c0bf6690548fc9ba6aae3e4ec1a08df9e73b3bacd751d408cef7beed028 EBUILD qtbase-6.9.9999.ebuild 10447 BLAKE2B ad7dcb0b911dc13777025baad5eb34e6ed6802591b06cb4c6db9fde94498ff06902c51a5471fc845b4e2b3530f94ed454a8a2f85cb5e3dfe4a680795fb0b2a8f SHA512 4f1d0f53d795744cf74b04ed6a42493646b5bf540d7d4ff6176529e55f2c4927db922d09d603ee4270f0b0911c8c55d38126de68db88067bbf8e9fdffff0a91f EBUILD qtbase-6.9999.ebuild 10447 BLAKE2B ad7dcb0b911dc13777025baad5eb34e6ed6802591b06cb4c6db9fde94498ff06902c51a5471fc845b4e2b3530f94ed454a8a2f85cb5e3dfe4a680795fb0b2a8f SHA512 4f1d0f53d795744cf74b04ed6a42493646b5bf540d7d4ff6176529e55f2c4927db922d09d603ee4270f0b0911c8c55d38126de68db88067bbf8e9fdffff0a91f diff --git a/dev-qt/qtbase/files/qtbase-6.8.2-QTBUG-133500.patch b/dev-qt/qtbase/files/qtbase-6.8.2-QTBUG-133500.patch new file mode 100644 index 000000000000..89a388eed6aa --- /dev/null +++ b/dev-qt/qtbase/files/qtbase-6.8.2-QTBUG-133500.patch @@ -0,0 +1,58 @@ +Combined backport of [1][2][3] from upcoming Qt 6.8.3 for [4][5][6]. + +[1] https://github.com/qt/qtbase/commit/12d4bf1ab52748cb84894f50d437064b439e0b7d +[2] https://github.com/qt/qtbase/commit/2ef615228bba9a8eb282437bfb7472f925610e89 +[3] https://github.com/qt/qtbase/commit/a43c7e58046604796aa69974ea1c5d3e2648c755 +[4] https://bugreports.qt.io/browse/QTBUG-133206 +[5] https://bugreports.qt.io/browse/QTBUG-133500 +[6] https://bugs.kde.org/show_bug.cgi?id=499537 +--- a/src/corelib/global/qlibraryinfo.cpp ++++ b/src/corelib/global/qlibraryinfo.cpp +@@ -7,4 +7,5 @@ + #include "qfile.h" + #if QT_CONFIG(settings) ++#include "qresource.h" + #include "qsettings.h" + #endif +@@ -104,5 +105,5 @@ + + QString qtconfig = QStringLiteral(":/qt/etc/qt.conf"); +- if (QFile::exists(qtconfig)) ++ if (QResource(qtconfig, QLocale::c()).isValid()) + return std::make_unique<QSettings>(qtconfig, QSettings::IniFormat); + #ifdef Q_OS_DARWIN +--- a/src/corelib/text/qlocale.cpp ++++ b/src/corelib/text/qlocale.cpp +@@ -1113,8 +1113,11 @@ + + QLocale::QLocale() +- : d(*defaultLocalePrivate) ++ : d(c_private()) + { +- // Make sure system data is up to date: +- systemData(); ++ if (!defaultLocalePrivate.isDestroyed()) { ++ // Make sure system data is up to date: ++ systemData(); ++ d = *defaultLocalePrivate; ++ } + } + +--- a/src/corelib/text/qlocale_unix.cpp ++++ b/src/corelib/text/qlocale_unix.cpp +@@ -128,4 +128,6 @@ + { + QSystemLocaleData *d = qSystemLocaleData(); ++ if (!d) ++ return QVariant(); + + if (type == LocaleChanged) { +--- a/src/corelib/text/qlocale_win.cpp ++++ b/src/corelib/text/qlocale_win.cpp +@@ -829,4 +829,6 @@ + { + QSystemLocalePrivate *d = systemLocalePrivate(); ++ if (!d) ++ return QVariant(); + switch(type) { + case DecimalPoint: diff --git a/dev-qt/qtbase/qtbase-6.8.2.ebuild b/dev-qt/qtbase/qtbase-6.8.2-r1.ebuild index a4a17c32f1ed..af4d6a54a114 100644 --- a/dev-qt/qtbase/qtbase-6.8.2.ebuild +++ b/dev-qt/qtbase/qtbase-6.8.2-r1.ebuild @@ -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}"/${P}-QTBUG-133500.patch ) src_prepare() { |