summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndreas Sturmlechner <asturm@gentoo.org>2021-08-26 19:56:13 +0200
committerAndreas Sturmlechner <asturm@gentoo.org>2021-10-17 02:40:31 +0200
commit0d7d27c3c9303f3794dd78532da28d59f8e93962 (patch)
tree10cfdb697aab77fc16698fb88327aaaabf7817a3 /dev-qt/qtconcurrent
parentdev-qt/qtgui: Drop vulnerable 5.15.2-r2 (diff)
downloadgentoo-0d7d27c3c9303f3794dd78532da28d59f8e93962.tar.gz
gentoo-0d7d27c3c9303f3794dd78532da28d59f8e93962.tar.bz2
gentoo-0d7d27c3c9303f3794dd78532da28d59f8e93962.zip
dev-qt: Drop old
Package-Manager: Portage-3.0.22, Repoman-3.0.3 Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>
Diffstat (limited to 'dev-qt/qtconcurrent')
-rw-r--r--dev-qt/qtconcurrent/Manifest2
-rw-r--r--dev-qt/qtconcurrent/files/qtconcurrent-5.15.2-gcc11.patch45
-rw-r--r--dev-qt/qtconcurrent/qtconcurrent-5.15.2-r1.ebuild30
-rw-r--r--dev-qt/qtconcurrent/qtconcurrent-5.15.2.ebuild27
4 files changed, 0 insertions, 104 deletions
diff --git a/dev-qt/qtconcurrent/Manifest b/dev-qt/qtconcurrent/Manifest
index c69b3ee123f0..4b8920365b9d 100644
--- a/dev-qt/qtconcurrent/Manifest
+++ b/dev-qt/qtconcurrent/Manifest
@@ -1,3 +1 @@
DIST qtbase-5.15.2-a4f9e569.tar.gz 67964648 BLAKE2B 2be7351221c46846ef37308a0238aa4a39369da63fe5c3be5e142ff700c80e125821c06b43c9e4e949bd9f285222a60888303aef956c9b427a9a6c8ee3bc6b1a SHA512 b4be8132a1d7119fd9728f7bf2d72cdd27d2092e7f178a1f15707204f5ffade7ce505c897fd658bb19274bdd6238b2eb16f7fcfedff2567877dc3458b4091388
-DIST qtbase-5.15.2-gcc11.patch.xz 1208 BLAKE2B a2e5764b723adda991eca5b84cf8e15437a4832febd12e3c93cdc394931af666e17c01e229e9be7e0efc446a955cc26388c0f93cadfcabd93cc6b6f03bb41eb0 SHA512 da3a41ea5d9573a029946d26b26d51d6dce9c8b91db6d78ca71d8343d3ceb5010d21750dcb45abb663e227b5f068985ff4ed51da07efd17c64cc8dd5aef8f3e4
-DIST qtbase-everywhere-src-5.15.2.tar.xz 50179672 BLAKE2B 0e4bdaab43cf59664bde89f87ea260c39acc2ef866d8629d41d9c326cab0ab68bcd943c86a472ae74bc9fb0b7ad50795ccb66275bb6b77d1fcf0a38b5662cb42 SHA512 a549bfaf867d746ff744ab224eb65ac1bdcdac7e8457dfa379941b2b225a90442fcfc1e1175b9afb1f169468f8130b7ab917c67be67156520a4bfb5c92d304f9
diff --git a/dev-qt/qtconcurrent/files/qtconcurrent-5.15.2-gcc11.patch b/dev-qt/qtconcurrent/files/qtconcurrent-5.15.2-gcc11.patch
deleted file mode 100644
index b27ac767b064..000000000000
--- a/dev-qt/qtconcurrent/files/qtconcurrent-5.15.2-gcc11.patch
+++ /dev/null
@@ -1,45 +0,0 @@
-https://bugs.gentoo.org/764977
-https://invent.kde.org/qt/qt/qtbase/-/commit/c9543da6998b0827fb75ffe22327c99e2da7d364
-
-From c9543da6998b0827fb75ffe22327c99e2da7d364 Mon Sep 17 00:00:00 2001
-From: Sona Kurazyan <sona.kurazyan@qt.io>
-Date: Wed, 17 Mar 2021 16:04:00 +0100
-Subject: [PATCH] Remove the unnecessary template parameter from the class
- specialization
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-This seems to cause errors when compiling with gcc-11. Although this is
-most likely a compiler bug, specifiying the template parameter type in
-this case isn't necessary.
-
-Fixes: QTBUG-91909
-Fixes: QTBUG-90568
-Change-Id: Ib231257ccb2e16cc533f23ca5840d31e26a66d53
-Reviewed-by: MÃ¥rten Nordheim <marten.nordheim@qt.io>
-(cherry picked from commit 659f7a06e91c04b239e3f4c0bcfccbe3581af1c3)
-Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
-(cherry picked from commit 049e14870c13235cd066758f29c42dc96c1ccdf8)
----
- src/concurrent/qtconcurrentthreadengine.h | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/src/concurrent/qtconcurrentthreadengine.h b/src/concurrent/qtconcurrentthreadengine.h
-index af413707e4..a4c8548cc4 100644
---- a/src/concurrent/qtconcurrentthreadengine.h
-+++ b/src/concurrent/qtconcurrentthreadengine.h
-@@ -247,8 +247,8 @@ template <>
- class ThreadEngineStarter<void> : public ThreadEngineStarterBase<void>
- {
- public:
-- ThreadEngineStarter<void>(ThreadEngine<void> *_threadEngine)
-- :ThreadEngineStarterBase<void>(_threadEngine) {}
-+ ThreadEngineStarter(ThreadEngine<void> *_threadEngine)
-+ : ThreadEngineStarterBase<void>(_threadEngine) {}
-
- void startBlocking()
- {
---
-GitLab
-
diff --git a/dev-qt/qtconcurrent/qtconcurrent-5.15.2-r1.ebuild b/dev-qt/qtconcurrent/qtconcurrent-5.15.2-r1.ebuild
deleted file mode 100644
index f0ecb6cd1f63..000000000000
--- a/dev-qt/qtconcurrent/qtconcurrent-5.15.2-r1.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-QT5_MODULE="qtbase"
-inherit qt5-build
-
-DESCRIPTION="Multi-threading concurrence support library for the Qt5 framework"
-SRC_URI+=" https://dev.gentoo.org/~asturm/distfiles/qtbase-${PV}-gcc11.patch.xz"
-
-if [[ ${QT5_BUILD_TYPE} == release ]]; then
- KEYWORDS="amd64 arm arm64 ~hppa ppc ppc64 ~riscv ~sparc x86"
-fi
-
-IUSE=""
-
-DEPEND="
- ~dev-qt/qtcore-${PV}:5=
-"
-RDEPEND="${DEPEND}"
-
-QT5_TARGET_SUBDIRS=(
- src/concurrent
-)
-
-PATCHES=(
- "${WORKDIR}"/qtbase-${PV}-gcc11.patch # bug 752012
- "${FILESDIR}"/${P}-gcc11.patch # bug #764977
-)
diff --git a/dev-qt/qtconcurrent/qtconcurrent-5.15.2.ebuild b/dev-qt/qtconcurrent/qtconcurrent-5.15.2.ebuild
deleted file mode 100644
index 346697ad3187..000000000000
--- a/dev-qt/qtconcurrent/qtconcurrent-5.15.2.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-QT5_MODULE="qtbase"
-inherit qt5-build
-
-DESCRIPTION="Multi-threading concurrence support library for the Qt5 framework"
-SRC_URI+=" https://dev.gentoo.org/~asturm/distfiles/qtbase-${PV}-gcc11.patch.xz"
-
-if [[ ${QT5_BUILD_TYPE} == release ]]; then
- KEYWORDS="amd64 arm arm64 ~hppa ppc ppc64 ~riscv ~sparc x86"
-fi
-
-IUSE=""
-
-DEPEND="
- ~dev-qt/qtcore-${PV}:5=
-"
-RDEPEND="${DEPEND}"
-
-QT5_TARGET_SUBDIRS=(
- src/concurrent
-)
-
-PATCHES=( "${WORKDIR}"/qtbase-${PV}-gcc11.patch ) # bug 752012