summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndreas Sturmlechner <asturm@gentoo.org>2021-06-06 18:24:22 +0200
committerAndreas Sturmlechner <asturm@gentoo.org>2021-06-10 17:29:28 +0200
commit7c3d47ccfb3968b956aa2a3c76554d43ae4d0a32 (patch)
tree526bd305d5419f2f7f5daad837a9d70114b02ba0
parentkde-plasma/breeze-plymouth: drop 5.20.5* (diff)
downloadgentoo-7c3d47ccfb3968b956aa2a3c76554d43ae4d0a32.tar.gz
gentoo-7c3d47ccfb3968b956aa2a3c76554d43ae4d0a32.tar.bz2
gentoo-7c3d47ccfb3968b956aa2a3c76554d43ae4d0a32.zip
kde-plasma/discover: drop 5.20.5*
Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>
-rw-r--r--kde-plasma/discover/Manifest1
-rw-r--r--kde-plasma/discover/discover-5.20.5-r1.ebuild87
-rw-r--r--kde-plasma/discover/files/discover-5.20.5-CVE-2021-28117.patch28
3 files changed, 0 insertions, 116 deletions
diff --git a/kde-plasma/discover/Manifest b/kde-plasma/discover/Manifest
index 98b287b605ef..f1da674d1b6d 100644
--- a/kde-plasma/discover/Manifest
+++ b/kde-plasma/discover/Manifest
@@ -1,2 +1 @@
-DIST discover-5.20.5.tar.xz 10305280 BLAKE2B fe47718014d420947c1509577e28ec642ccdc975d2b9fa6d2000bfd190880aff4fa1f2ca4597a77980995209847647cc5fb5963bb1c0a88a8010fc1b198c49b7 SHA512 e33f1027a09c8c7733c0b9da81ee82f0c90237c736435ad93cfdb127d79e0ddee0d4d8214774032c81a4078613d278688f0fddbf287aa03a5192cfcdb1eeffa7
DIST discover-5.21.5.tar.xz 8431164 BLAKE2B 36d539ec0efdfa9d70c6fa3d45fb8abba5228d35a1d7260fa701610a9859ce7c9bd3d98e12b67dade598358a60ceeae78300635ea5ceb1017cc7e7fa3b046c11 SHA512 933a16dd5f99c18e61fdf77330a78e3c5251d13ce6aa99daa4f7b939320a3ddde2c66ead85e1bc31e7719c0cf657ef46516f35f08863cd6f2be25efcbf156fbf
diff --git a/kde-plasma/discover/discover-5.20.5-r1.ebuild b/kde-plasma/discover/discover-5.20.5-r1.ebuild
deleted file mode 100644
index f66e12748b42..000000000000
--- a/kde-plasma/discover/discover-5.20.5-r1.ebuild
+++ /dev/null
@@ -1,87 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ECM_TEST="forceoptional"
-KFMIN=5.74.0
-QTMIN=5.15.1
-VIRTUALX_REQUIRED="test"
-inherit ecm kde.org
-
-DESCRIPTION="KDE Plasma resources management GUI"
-HOMEPAGE="https://userbase.kde.org/Discover"
-
-LICENSE="GPL-2" # TODO: CHECK
-SLOT="5"
-KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
-IUSE="+firmware flatpak telemetry"
-
-# libmarkdown (app-text/discount) only used in PackageKitBackend
-DEPEND="
- >=dev-qt/qtconcurrent-${QTMIN}:5
- >=dev-qt/qtdbus-${QTMIN}:5
- >=dev-qt/qtdeclarative-${QTMIN}:5
- >=dev-qt/qtgui-${QTMIN}:5
- >=dev-qt/qtnetwork-${QTMIN}:5
- >=dev-qt/qtwidgets-${QTMIN}:5
- >=dev-qt/qtxml-${QTMIN}:5
- >=kde-frameworks/attica-${KFMIN}:5
- >=kde-frameworks/kconfig-${KFMIN}:5
- >=kde-frameworks/kconfigwidgets-${KFMIN}:5
- >=kde-frameworks/kcoreaddons-${KFMIN}:5
- >=kde-frameworks/kcrash-${KFMIN}:5
- >=kde-frameworks/kdbusaddons-${KFMIN}:5
- >=kde-frameworks/kdeclarative-${KFMIN}:5
- >=kde-frameworks/ki18n-${KFMIN}:5
- >=kde-frameworks/kio-${KFMIN}:5
- >=kde-frameworks/kirigami-${KFMIN}:5
- >=kde-frameworks/kitemmodels-${KFMIN}:5
- >=kde-frameworks/knewstuff-${KFMIN}:5
- >=kde-frameworks/knotifications-${KFMIN}:5
- >=kde-frameworks/kwidgetsaddons-${KFMIN}:5
- >=kde-frameworks/kxmlgui-${KFMIN}:5
- firmware? ( sys-apps/fwupd )
- flatpak? (
- dev-libs/appstream:=
- sys-apps/flatpak
- )
- telemetry? ( dev-libs/kuserfeedback:5 )
-"
-RDEPEND="${DEPEND}
- >=dev-qt/qtquickcontrols2-${QTMIN}:5
- >=kde-frameworks/kirigami-${KFMIN}:5
-"
-
-PATCHES=(
- "${FILESDIR}/${P}-CVE-2021-28117.patch" # bug 777777
- "${FILESDIR}/${PN}-5.21.4-missing-link.patch" # bug 785457
-)
-
-src_prepare() {
- ecm_src_prepare
- # we don't need it with PackageKitBackend off
- ecm_punt_bogus_dep KF5 Archive
-}
-
-src_configure() {
- local mycmakeargs=(
- -DCMAKE_DISABLE_FIND_PACKAGE_packagekitqt5=ON
- -DCMAKE_DISABLE_FIND_PACKAGE_Snapd=ON
- -DBUILD_FlatpakBackend=$(usex flatpak)
- $(cmake_use_find_package flatpak AppStreamQt)
- -DBUILD_FwupdBackend=$(usex firmware)
- $(cmake_use_find_package telemetry KUserFeedback)
- )
-
- ecm_src_configure
-}
-
-src_test() {
- # bug 686392: needs network connection
- local myctestargs=(
- -E "(knsbackendtest)"
- )
-
- ecm_src_test
-}
diff --git a/kde-plasma/discover/files/discover-5.20.5-CVE-2021-28117.patch b/kde-plasma/discover/files/discover-5.20.5-CVE-2021-28117.patch
deleted file mode 100644
index 1a2685dbc8d1..000000000000
--- a/kde-plasma/discover/files/discover-5.20.5-CVE-2021-28117.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-From 94478827aab63d2e2321f0ca9ec5553718798e60 Mon Sep 17 00:00:00 2001
-From: Aleix Pol <aleixpol@kde.org>
-Date: Wed, 10 Mar 2021 21:48:53 +0100
-Subject: [PATCH] Only turn http[s] links into clickable links
-
-CVE-2021-28117
-
-(cherry picked from commit d375031ff0262cedac7d6ee2b26d6a164ddebb67)
----
- libdiscover/backends/KNSBackend/KNSResource.cpp | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/libdiscover/backends/KNSBackend/KNSResource.cpp b/libdiscover/backends/KNSBackend/KNSResource.cpp
-index 4394d5df..f7670c55 100644
---- a/libdiscover/backends/KNSBackend/KNSResource.cpp
-+++ b/libdiscover/backends/KNSBackend/KNSResource.cpp
-@@ -87,7 +87,7 @@ QString KNSResource::longDescription()
- ret.remove(QRegularExpression(QStringLiteral("\\[\\/?[a-z]*\\]")));
- // Find anything that looks like a link (but which also is not some html
- // tag value or another already) and make it a link
-- static const QRegularExpression urlRegExp(QStringLiteral("(^|\\s)([-a-zA-Z0-9@:%_\\+.~#?&//=]{2,256}\\.[a-z]{2,4}\\b(\\/[-a-zA-Z0-9@:;%_\\+.~#?&//=]*)?)"), QRegularExpression::CaseInsensitiveOption);
-+ static const QRegularExpression urlRegExp(QStringLiteral("(^|\\s)(http[-a-zA-Z0-9@:%_\\+.~#?&//=]{2,256}\\.[a-z]{2,4}\\b(\\/[-a-zA-Z0-9@:;%_\\+.~#?&//=]*)?)"), QRegularExpression::CaseInsensitiveOption);
- ret.replace(urlRegExp, QStringLiteral("<a href=\"\\2\">\\2</a>"));
- return ret;
- }
---
-GitLab
-