summaryrefslogtreecommitdiff
path: root/dev-qt
diff options
context:
space:
mode:
Diffstat (limited to 'dev-qt')
-rw-r--r--dev-qt/Manifest.gzbin11196 -> 11199 bytes
-rw-r--r--dev-qt/qtcore/Manifest4
-rw-r--r--dev-qt/qtcore/files/qtcore-5.15.8-fix-crash-w-debug.patch41
-rw-r--r--dev-qt/qtcore/qtcore-5.15.8-r3.ebuild (renamed from dev-qt/qtcore/qtcore-5.15.8-r2.ebuild)4
-rw-r--r--dev-qt/qtgui/Manifest4
-rw-r--r--dev-qt/qtgui/qtgui-5.15.8-r3.ebuild (renamed from dev-qt/qtgui/qtgui-5.15.8-r2.ebuild)2
-rw-r--r--dev-qt/qtwidgets/Manifest4
-rw-r--r--dev-qt/qtwidgets/qtwidgets-5.15.8-r2.ebuild (renamed from dev-qt/qtwidgets/qtwidgets-5.15.8-r1.ebuild)2
8 files changed, 9 insertions, 52 deletions
diff --git a/dev-qt/Manifest.gz b/dev-qt/Manifest.gz
index 09600f13179c..9b27e2645272 100644
--- a/dev-qt/Manifest.gz
+++ b/dev-qt/Manifest.gz
Binary files differ
diff --git a/dev-qt/qtcore/Manifest b/dev-qt/qtcore/Manifest
index 6dd7fc9e8f05..224221cf38a9 100644
--- a/dev-qt/qtcore/Manifest
+++ b/dev-qt/qtcore/Manifest
@@ -1,7 +1,7 @@
-AUX qtcore-5.15.8-fix-crash-w-debug.patch 1427 BLAKE2B 3ef8d7e4fcd2969e6ce3931e0bd07fe7d410d18834bb2de7a760949dd4c822bb9942a4245d720a2736c4927ea536bc0a41efe3ac7e0913dd9b7ca35eb27d313b SHA512 dfdd1f30057498b0f3043faa84fda1239b17ecc02c3838a329cad46b157e91cb2cbbe488eeeebd761b0449e4c045e8a47e7354d081453bf6fe7f35a6989f30da
DIST qtbase-5.15-gentoo-patchset-3.tar.xz 3856 BLAKE2B 0752426f9bc2dfa1ab2bc246b29f5d00305df05175a7801d7d5eddacfa46fcb605d9a317547edc01d3ef339f6effc2fcee7549cb7aecced37f0098166c70dbe2 SHA512 2515bea53232e76ca3e40bdaf1dd52fdf452052a2f40002ee91360d1fcceea3c5c2f5a8d2a3bfc0f9c2bacd61460a632c5b351accd73fd37b64985593219148e
DIST qtbase-5.15.8-gentoo-kde-3.tar.xz 782344 BLAKE2B 115814a4d90ac286540cf6e50bd2b57baa8e0e327fc73c3ab06fe43ecd95e1e3739faecee5db112d95d17e4fb84494ad5557e70251f2c60142166715294bf366 SHA512 d50b0f02476ded9f053093ec15c5204a0ec664794dcc324996685f09400a2cbc76dc3fd0ebfc247ebd42fbe203b7d4c904e975fc985bf7928e43c6cd65f04f34
+DIST qtbase-5.15.8-gentoo-kde-5.tar.xz 793372 BLAKE2B f486a0275fdf4da28a88ba40b7e6f227267fa05e8f466f734f720e792de1796501d5f1fb4427a84ca2d709bfa07abd695ad59210f7fd11227b1bf465484736b8 SHA512 f51d7ee2d121acda1141b9816197afc57ac0176a12acc08a93c2a793694afb734f8f1ad280a5bf95170cf912e32edb4a6612befeb4198fec78a7e50bbb6a61cd
DIST qtbase-everywhere-opensource-src-5.15.8.tar.xz 50259432 BLAKE2B cb1b790a384a5cad9a95fdc448e275d48a68c6ee2addf08b40f9963cc5762fd7ab15852dea8392dc76da39f1565c1e23ddb5875c280f0177e802082f4b4f7f2b SHA512 29e8877bafdbc908072209f1b27a5040b022e2b71f17f4ab4cecd570adeae21597f9af7f1d38758760f3cb30376eeb15c5f066bf02c6e9a9e3a4d07f967046ce
EBUILD qtcore-5.15.8-r1.ebuild 3070 BLAKE2B 610fccc1d08332b4ca2b1681906812fa1ca3b900ff487dfbd83fb4c0cafc5aa3accea3cd4450a3b7d46d261faf7fe7308a45642e73f84b37a9d16ea3af34afdb SHA512 d19b28d91138bfce589907ba79b67a0db2d3b248640050851017343f0400a1ccfeffa6f414d2849fc38c901893cad95c5bae0cd3e5eb22fa5f7ae94c252a10dc
-EBUILD qtcore-5.15.8-r2.ebuild 3194 BLAKE2B 92d43b2ce123f36845f69e2c45624d78cdc00d64d4c378ee62ee35bf576208550a710b4d6d11b59f58bc6a49255857a2c59a0fb16b54a1cd910218fa94b9cd15 SHA512 dd94327d908cab92e8b3b7f5bcaaac3a3a2aca6ceebda40e4d87fe0a088ec0fdcaba06aae2ada4791243fb710ed3f556468fcaf32dae68af7c1cd73394f36ee4
+EBUILD qtcore-5.15.8-r3.ebuild 3107 BLAKE2B 7855127e83de7642560f8dd89fa483f4cc4df667d82d5a34949502905144fd4b5b7e43c240930e0c0f427d105d9dbd0614d2c3381e28f5f8c2bfc52d9168640e SHA512 b45c52da1d9bf82d922ff7e030834dc8a2fdac3b3666ec558490f8c0ecd5083402d1d382d2731227c88503ce41c234f78b8024082f9871b203b71f1d4f22b951
MISC metadata.xml 833 BLAKE2B 79b441c34e55017f23dd85cdb062ef4cbcfce05dff74936de887256ba8b9b596632b570b55b7014c38467829751771bb116f067cd6a246a11309f20b67fb55f0 SHA512 f1ffedc2ad17d198ba14a9a93e6c8dd35a7709e6f1e07dae606c16c05868f2f8e696f25fa5cf2602ed50f41eb5a914ff0d652b9ac37163e5130ddbfb475a1ff5
diff --git a/dev-qt/qtcore/files/qtcore-5.15.8-fix-crash-w-debug.patch b/dev-qt/qtcore/files/qtcore-5.15.8-fix-crash-w-debug.patch
deleted file mode 100644
index 74f5ed5c4886..000000000000
--- a/dev-qt/qtcore/files/qtcore-5.15.8-fix-crash-w-debug.patch
+++ /dev/null
@@ -1,41 +0,0 @@
-From 0c0b34badb8a56f5c0d7d43c3847508774c8e553 Mon Sep 17 00:00:00 2001
-From: Harald Sitter <sitter@kde.org>
-Date: Mon, 2 Jan 2023 12:38:02 +0100
-Subject: [PATCH] correctly set up ref counting in
- QThreadPool::tryStart(std::function)
-
-this function was inconsistent with the QThreadPool::tryStart(QRunnable)
-overload, where ref counting does get set up correctly. the lack of ref
-counting setup would later cause trouble because we assert the ref
-counting state all over QThreadPool. to prevent failed assertions we
-correctly set up ref counting now.
-
-this change is not applicable to Qt6 because the ref counting has
-already been removed there:
-https://github.com/qt/qtbase/commit/ecfda98d1f91c6a7da0d89826558d856cd88e670
-
-BUG: 449688
----
- src/corelib/thread/qthreadpool.cpp | 4 ++++
- 1 file changed, 4 insertions(+)
-
-diff --git a/src/corelib/thread/qthreadpool.cpp b/src/corelib/thread/qthreadpool.cpp
-index 40cc646519..8aa06a4c8f 100644
---- a/src/corelib/thread/qthreadpool.cpp
-+++ b/src/corelib/thread/qthreadpool.cpp
-@@ -602,8 +602,12 @@ bool QThreadPool::tryStart(std::function<void()> functionToRun)
- return false;
-
- QRunnable *runnable = QRunnable::create(std::move(functionToRun));
-+ Q_ASSERT(runnable->ref == 0);
-+ ++runnable->ref;
- if (d->tryStart(runnable))
- return true;
-+ --runnable->ref;
-+ Q_ASSERT(runnable->ref == 0);
- delete runnable;
- return false;
- }
---
-GitLab
-
diff --git a/dev-qt/qtcore/qtcore-5.15.8-r2.ebuild b/dev-qt/qtcore/qtcore-5.15.8-r3.ebuild
index 5817a2b70616..7e19031cbe35 100644
--- a/dev-qt/qtcore/qtcore-5.15.8-r2.ebuild
+++ b/dev-qt/qtcore/qtcore-5.15.8-r3.ebuild
@@ -4,7 +4,7 @@
EAPI=8
if [[ ${PV} != *9999* ]]; then
- QT5_KDEPATCHSET_REV=3
+ QT5_KDEPATCHSET_REV=5
KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86"
fi
@@ -43,8 +43,6 @@ QT5_GENTOO_PRIVATE_CONFIG=(
!:xml
)
-PATCHES=( "${FILESDIR}/${P}-fix-crash-w-debug.patch" ) # bug 889160, pending upstream
-
pkg_pretend() {
use kernel_linux || return
get_running_version
diff --git a/dev-qt/qtgui/Manifest b/dev-qt/qtgui/Manifest
index 344f667722f7..5c7708b220ff 100644
--- a/dev-qt/qtgui/Manifest
+++ b/dev-qt/qtgui/Manifest
@@ -1,7 +1,7 @@
DIST qtbase-5.15-gentoo-patchset-3.tar.xz 3856 BLAKE2B 0752426f9bc2dfa1ab2bc246b29f5d00305df05175a7801d7d5eddacfa46fcb605d9a317547edc01d3ef339f6effc2fcee7549cb7aecced37f0098166c70dbe2 SHA512 2515bea53232e76ca3e40bdaf1dd52fdf452052a2f40002ee91360d1fcceea3c5c2f5a8d2a3bfc0f9c2bacd61460a632c5b351accd73fd37b64985593219148e
DIST qtbase-5.15.8-gentoo-kde-3.tar.xz 782344 BLAKE2B 115814a4d90ac286540cf6e50bd2b57baa8e0e327fc73c3ab06fe43ecd95e1e3739faecee5db112d95d17e4fb84494ad5557e70251f2c60142166715294bf366 SHA512 d50b0f02476ded9f053093ec15c5204a0ec664794dcc324996685f09400a2cbc76dc3fd0ebfc247ebd42fbe203b7d4c904e975fc985bf7928e43c6cd65f04f34
-DIST qtbase-5.15.8-gentoo-kde-4.tar.xz 789072 BLAKE2B bc781da32e7ad917fcbe3ec6fbf1ad17b5128f994e96f38590305b792b288b5c63ba8f71740bb2bb84bbf62386d154aa643cf162d0c5804a626f6c57682d7713 SHA512 1a65c40a82a2ae8cdfcb06ed6d0267f7c6257ed6e0637e17c8ca342702834d19c8ee12c02128754f41c7c4744e44cbc647982b2f8f215e36401b0eb47334a9bd
+DIST qtbase-5.15.8-gentoo-kde-5.tar.xz 793372 BLAKE2B f486a0275fdf4da28a88ba40b7e6f227267fa05e8f466f734f720e792de1796501d5f1fb4427a84ca2d709bfa07abd695ad59210f7fd11227b1bf465484736b8 SHA512 f51d7ee2d121acda1141b9816197afc57ac0176a12acc08a93c2a793694afb734f8f1ad280a5bf95170cf912e32edb4a6612befeb4198fec78a7e50bbb6a61cd
DIST qtbase-everywhere-opensource-src-5.15.8.tar.xz 50259432 BLAKE2B cb1b790a384a5cad9a95fdc448e275d48a68c6ee2addf08b40f9963cc5762fd7ab15852dea8392dc76da39f1565c1e23ddb5875c280f0177e802082f4b4f7f2b SHA512 29e8877bafdbc908072209f1b27a5040b022e2b71f17f4ab4cecd570adeae21597f9af7f1d38758760f3cb30376eeb15c5f066bf02c6e9a9e3a4d07f967046ce
EBUILD qtgui-5.15.8-r1.ebuild 3836 BLAKE2B a5216fc2e7a1ee2c146a89c79de2ea69f1300025740ba34fd076da437416c0e4a6b761e4e85699ec60b9a266482147b79f8e0874acf064af6685998b62b45072 SHA512 54409e756b9362237bc50b40f73d00da5b3d859002036ffb32ab59de9f29c05349300b1a386313738c7a99c6336fab1d920e714c93e94aad67d3de45ac2a84e3
-EBUILD qtgui-5.15.8-r2.ebuild 3842 BLAKE2B 504ec9c9caff125035fab7cd8f45eeaae1e9d881cb127728742a778a87f15ef652bd2877f7e0ec330696aa2afb065cdb2550c49d99d47092d1977f3b0a17e492 SHA512 71d67bf48cfdb5863fecf451a8361d1edb425fde98ae459044d4732ace99e5717b695269fc613886ad63e0e2e2575f508213d25e4e9340774dd231dd1ebfefa9
+EBUILD qtgui-5.15.8-r3.ebuild 3842 BLAKE2B b13a7f63898005d3759ae61407392853d64650502716bf72e4a308fb2523548574ed138a9cfd93eaf1959738793785869b43bd6931cf755c5e3863cb44d0df0a SHA512 643421d9486a4f887dc09ebf90a569d25e28d6e4d3a0c18bed8db3b29624870f75a12eededd2a5448d63462f032d75402c3382b6842e1b19a7d06ec9d989e2ec
MISC metadata.xml 1387 BLAKE2B a370bc2dc77b3efcca29b46e9690b1b5e5c08c5fbfcf06211c1a384c9b998517b4da4357b1cc33998d4f480f9c5481e41b42f3b20f8f72d2635b317ed1d5b412 SHA512 ffa4622291427193109a83d422ff53f373fc3eb7449855849f0f39091383abc30fbfcb88a7d53e29bf2d39e1ec1c40f7aac7433b4d7c0aeefd48983047e912d5
diff --git a/dev-qt/qtgui/qtgui-5.15.8-r2.ebuild b/dev-qt/qtgui/qtgui-5.15.8-r3.ebuild
index c7b0d5ead51a..f2af77c15d55 100644
--- a/dev-qt/qtgui/qtgui-5.15.8-r2.ebuild
+++ b/dev-qt/qtgui/qtgui-5.15.8-r3.ebuild
@@ -4,7 +4,7 @@
EAPI=8
if [[ ${PV} != *9999* ]]; then
- QT5_KDEPATCHSET_REV=4
+ QT5_KDEPATCHSET_REV=5
KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86"
fi
diff --git a/dev-qt/qtwidgets/Manifest b/dev-qt/qtwidgets/Manifest
index 15c5dedb5bcb..6b26bcab5d17 100644
--- a/dev-qt/qtwidgets/Manifest
+++ b/dev-qt/qtwidgets/Manifest
@@ -1,7 +1,7 @@
DIST qtbase-5.15-gentoo-patchset-3.tar.xz 3856 BLAKE2B 0752426f9bc2dfa1ab2bc246b29f5d00305df05175a7801d7d5eddacfa46fcb605d9a317547edc01d3ef339f6effc2fcee7549cb7aecced37f0098166c70dbe2 SHA512 2515bea53232e76ca3e40bdaf1dd52fdf452052a2f40002ee91360d1fcceea3c5c2f5a8d2a3bfc0f9c2bacd61460a632c5b351accd73fd37b64985593219148e
DIST qtbase-5.15.8-gentoo-kde-1.tar.xz 780764 BLAKE2B 6abb00127113595cbb0a0caf58eb6323423ca41cbde6262a63762aded12861b6c051c9548c9ce2d11ab073e8930c11b609c05579eba34d56201fb7187c78ee23 SHA512 8b59ba61e7364c78d5bf728b4d8c9bd0f8e1ed973f1a84cd40330b06195b246e052ec087067336ff5d4e80a12168a25e0bd47fd88d837c00f106d8cdeba0c016
-DIST qtbase-5.15.8-gentoo-kde-4.tar.xz 789072 BLAKE2B bc781da32e7ad917fcbe3ec6fbf1ad17b5128f994e96f38590305b792b288b5c63ba8f71740bb2bb84bbf62386d154aa643cf162d0c5804a626f6c57682d7713 SHA512 1a65c40a82a2ae8cdfcb06ed6d0267f7c6257ed6e0637e17c8ca342702834d19c8ee12c02128754f41c7c4744e44cbc647982b2f8f215e36401b0eb47334a9bd
+DIST qtbase-5.15.8-gentoo-kde-5.tar.xz 793372 BLAKE2B f486a0275fdf4da28a88ba40b7e6f227267fa05e8f466f734f720e792de1796501d5f1fb4427a84ca2d709bfa07abd695ad59210f7fd11227b1bf465484736b8 SHA512 f51d7ee2d121acda1141b9816197afc57ac0176a12acc08a93c2a793694afb734f8f1ad280a5bf95170cf912e32edb4a6612befeb4198fec78a7e50bbb6a61cd
DIST qtbase-everywhere-opensource-src-5.15.8.tar.xz 50259432 BLAKE2B cb1b790a384a5cad9a95fdc448e275d48a68c6ee2addf08b40f9963cc5762fd7ab15852dea8392dc76da39f1565c1e23ddb5875c280f0177e802082f4b4f7f2b SHA512 29e8877bafdbc908072209f1b27a5040b022e2b71f17f4ab4cecd570adeae21597f9af7f1d38758760f3cb30376eeb15c5f066bf02c6e9a9e3a4d07f967046ce
-EBUILD qtwidgets-5.15.8-r1.ebuild 1206 BLAKE2B 073672cf8e9da7c0f092397468c0e41a0a364bb9f8312359510e9fdc4df1ea396c2aae8641d77fe6922ebdc02c576a335c1f2c508d5f179bb11662bfe5f11c41 SHA512 e5e3918e84147aa1488053f51990cec089b2b02740e2272c1ffc8272ddfbebe7d549a4ac69c62c858036eb8651195b7d3b75ecef087b7882e032ebb9e22a15a4
+EBUILD qtwidgets-5.15.8-r2.ebuild 1206 BLAKE2B 6437af15f1a3793cdf1fa64be23baf416b49d0b2239f69aa0a058845c009156e5108621edc8a65e2be270c5f1cd6650760248c8008b6db568a0d2c43ca590a7b SHA512 eb22969ca1164ad0664397c00d13d444d7cabe6cbe91a73f10bf7821d0a9a3e1bc79a84f5c86f6c2ed2f0ad097bc5b7f776ad697ce6b027ff546d47004d0287e
EBUILD qtwidgets-5.15.8.ebuild 1200 BLAKE2B 2bc1142dc7261140c06366e41c370464735ec597938eb5fe82176546733e14ab7f8b413ed7f2d3315d2b69d7d9e3b6d3741139ca684b8705a0fce71feca290b2 SHA512 ffa0a95e59423a680a9a4a7761c5bd391ef84b1ca718203175185185f3bde56516acaad6f852280ff8f06590f1ba6a7f3d94537014c84a50fdcd5868a203463d
MISC metadata.xml 559 BLAKE2B 3ea80a5e419db32987d68d7e5033fa75fa0ff22b31b0842fd7ead902172cbe83650b0bbdf8657a57e428726e7cdf114d9011bd16066c080bc5f6ecb3f691d42c SHA512 51172365a186fbca09651bfd751284960dda4036390af2afab9812a7ae3fabdd9d60a336dee3cfc5e3d133a0216bf77e29660b9cdee2f0bcd2ce43c27297bdb1
diff --git a/dev-qt/qtwidgets/qtwidgets-5.15.8-r1.ebuild b/dev-qt/qtwidgets/qtwidgets-5.15.8-r2.ebuild
index fbbc45ae8079..c6c374f18d5e 100644
--- a/dev-qt/qtwidgets/qtwidgets-5.15.8-r1.ebuild
+++ b/dev-qt/qtwidgets/qtwidgets-5.15.8-r2.ebuild
@@ -4,7 +4,7 @@
EAPI=8
if [[ ${PV} != *9999* ]]; then
- QT5_KDEPATCHSET_REV=4
+ QT5_KDEPATCHSET_REV=5
KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86"
fi