From d18bf1e01b65ee4bf0c804e2843b282d3d4e5d7c Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Tue, 15 Jun 2021 14:57:03 +0100 Subject: gentoo resync : 15.06.2021 --- kde-plasma/discover/Manifest | 8 +- kde-plasma/discover/discover-5.20.5-r1.ebuild | 87 -------------------- kde-plasma/discover/discover-5.21.5.ebuild | 2 +- kde-plasma/discover/discover-5.22.0.ebuild | 87 ++++++++++++++++++++ .../files/discover-5.20.5-CVE-2021-28117.patch | 28 ------- .../files/discover-5.21.90-tests-optional.patch | 94 ++++++++++++++++++++++ 6 files changed, 186 insertions(+), 120 deletions(-) delete mode 100644 kde-plasma/discover/discover-5.20.5-r1.ebuild create mode 100644 kde-plasma/discover/discover-5.22.0.ebuild delete mode 100644 kde-plasma/discover/files/discover-5.20.5-CVE-2021-28117.patch create mode 100644 kde-plasma/discover/files/discover-5.21.90-tests-optional.patch (limited to 'kde-plasma/discover') diff --git a/kde-plasma/discover/Manifest b/kde-plasma/discover/Manifest index 44972ba0e7fb..482ada5fbbc0 100644 --- a/kde-plasma/discover/Manifest +++ b/kde-plasma/discover/Manifest @@ -1,7 +1,7 @@ -AUX discover-5.20.5-CVE-2021-28117.patch 1434 BLAKE2B c31d0032cdfe3f8d96ad5e7f736c92c2dfcd6cc8e2b8c9b9e90a4a3d41159d961b80427d14ff6a22caa06e6dbdc17535be6243180d439e04879bbd957309859c SHA512 1059cce1be5f8f24a4345488c60decb2e4782fdc11f02ef625111164b6f8b32343528282ec4d03a015e36aa076cd6f9fcfa24e9b7d5c02fe25295cf03c7511a3 AUX discover-5.21.4-missing-link.patch 2141 BLAKE2B 23b81f9f4e0daa05183ed3a31e98d8c1f3ac3ecfdb08511c3fb14bbf726a14086c5c834d3c7b7cc3f575500eb86f4cc85e141c48361597329a62c47c45807956 SHA512 f8201dad0e00e1a36338ab9dc956cd1baa7268ce4dd23c3d2b5a7ba9c9922da216697115396b7c32c3656faa60a107da62343af3b7a250d64e6d51c43768a9ae -DIST discover-5.20.5.tar.xz 10305280 BLAKE2B fe47718014d420947c1509577e28ec642ccdc975d2b9fa6d2000bfd190880aff4fa1f2ca4597a77980995209847647cc5fb5963bb1c0a88a8010fc1b198c49b7 SHA512 e33f1027a09c8c7733c0b9da81ee82f0c90237c736435ad93cfdb127d79e0ddee0d4d8214774032c81a4078613d278688f0fddbf287aa03a5192cfcdb1eeffa7 +AUX discover-5.21.90-tests-optional.patch 3372 BLAKE2B 9c1ee887d31b48b730350cb599f3f8e7ca4b802ba2d68dce72cede96b7a6d0e83451697b9e9e3da67c611514a3d808affb9616a515b80cc3788365fc3ca01997 SHA512 43a7152fb04224f52e417f2684fda6561cfd26888ff6493899e70b313f725066be1aefe9a0350c1aa260d799c44bdd5643a79e4a84dd6cfa34511dbc098ff93d DIST discover-5.21.5.tar.xz 8431164 BLAKE2B 36d539ec0efdfa9d70c6fa3d45fb8abba5228d35a1d7260fa701610a9859ce7c9bd3d98e12b67dade598358a60ceeae78300635ea5ceb1017cc7e7fa3b046c11 SHA512 933a16dd5f99c18e61fdf77330a78e3c5251d13ce6aa99daa4f7b939320a3ddde2c66ead85e1bc31e7719c0cf657ef46516f35f08863cd6f2be25efcbf156fbf -EBUILD discover-5.20.5-r1.ebuild 2217 BLAKE2B 41d5493274bf956d46e9719c4e174a145db849ea28650e1526935e3dd07ec7b8ef158c5d166712fedff439a4187f6e508ed34f1a5df615b9d827b9d7c03fbfdd SHA512 5b1e6e3721b21f2d927bb96c8f8cc89c5e87fec0f0271257f18be0fa72581710d4902c5163d3d7e9e5c29bc1d3a9154fd6927285fd54efa207ade598b786c757 -EBUILD discover-5.21.5.ebuild 2220 BLAKE2B 9c9bb819e84c1e9cfb777ecb8ee984b88bbcd1ed526a25c6a6653b3fc5f2290358472715a360506341eed77f4ee72ccfa030b01087d5e8a1065d6684a88f0679 SHA512 5bbe2bb595a0c89dc6c7828b914ff6f2646fa9a7c6fa7e4670438873a65b1b0698c295452d337a70b39102c7565818869c94b7b659dee425886b2c15fade31b2 +DIST discover-5.22.0.tar.xz 8455148 BLAKE2B 7ce36561ad5e1dc221b62b81822e49878f0b76ebcfc05278338ac90e90847a4cfbe3330146fac679aeedde20eeff14bed35d7696aace1f975030f58353f2190b SHA512 0612ef86b1a49ea06da9a89e5ef537d34d80ad3c9b748d1e91e6e574670eb545094eb52e858747567c82b0d13a064fb27a8378d1eda3059fb1e1958ad30df945 +EBUILD discover-5.21.5.ebuild 2217 BLAKE2B d6f0facf92e314fd59f5dd10422d0c065d9103ccfa0e3a78c1a9a7d39a00eb5bf31ab5d1855edd0e225a4d09ad387a9d37cd296702d21ea8b293da5ac9b8cd94 SHA512 c1e6c91410e560705e1be62818bbef63016bf879df5c8792be4f95451dd2c173016cb029c82bb75a801dba190120e6940c439db7d801294ea6cf0de16afd7158 +EBUILD discover-5.22.0.ebuild 2273 BLAKE2B 3ba30e3e9df6909855333ed312decf9a1b7c8ab6e0b4b9edd4d1b69b4fa1ea52321ce8c021311f21c0bedf8ff2f468062490a539b2a4b1ec8c2cf030464700a9 SHA512 a7891c220e26aefe53872c8def74a5dfd891f78e60c88f9609d97d9a5855227146769c52cf7e2696d7a92e4e64dad1b58fa003039a3454164fc80eea52667828 MISC metadata.xml 468 BLAKE2B cd98862045ebe78aecaf3dc74526afd4ff2bd377816993e2a0aa4d61cd4f14f7b3e5779d5892244233cbef03b9aba6404aa9fe9aa161f2fc868e369df6ea626f SHA512 a8807c50a9ab4b8e9fe2876fe159a3880bbaeb36a84ad7e7fed55cf6367b1c17ed7e0af135a579685bd4a5d8b550f38b240ac31c00e463befc22de35fd67b2ff 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/discover-5.21.5.ebuild b/kde-plasma/discover/discover-5.21.5.ebuild index d7ff1db71470..6546053e346e 100644 --- a/kde-plasma/discover/discover-5.21.5.ebuild +++ b/kde-plasma/discover/discover-5.21.5.ebuild @@ -14,7 +14,7 @@ HOMEPAGE="https://userbase.kde.org/Discover" LICENSE="GPL-2" # TODO: CHECK SLOT="5" -KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86" +KEYWORDS="amd64 ~arm arm64 ~ppc64 x86" IUSE="+firmware flatpak telemetry" # libmarkdown (app-text/discount) only used in PackageKitBackend diff --git a/kde-plasma/discover/discover-5.22.0.ebuild b/kde-plasma/discover/discover-5.22.0.ebuild new file mode 100644 index 000000000000..56b279a23564 --- /dev/null +++ b/kde-plasma/discover/discover-5.22.0.ebuild @@ -0,0 +1,87 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +ECM_TEST="true" +KFMIN=5.82.0 +QTMIN=5.15.2 +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/qtx11extras-${QTMIN}:5 + >=dev-qt/qtxml-${QTMIN}:5 + >=kde-frameworks/attica-${KFMIN}:5 + >=kde-frameworks/kcmutils-${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/kidletime-${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-1.5.0 ) + flatpak? ( + >=dev-libs/appstream-0.12.8:= + sys-apps/flatpak + ) + telemetry? ( dev-libs/kuserfeedback:5 ) +" +RDEPEND="${DEPEND} + >=dev-qt/qtquickcontrols2-${QTMIN}:5 + >=kde-frameworks/kirigami-${KFMIN}:5 +" + +PATCHES=( "${FILESDIR}/${PN}-5.21.90-tests-optional.patch" ) + +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 -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("\\2")); - return ret; - } --- -GitLab - diff --git a/kde-plasma/discover/files/discover-5.21.90-tests-optional.patch b/kde-plasma/discover/files/discover-5.21.90-tests-optional.patch new file mode 100644 index 000000000000..43976d145baf --- /dev/null +++ b/kde-plasma/discover/files/discover-5.21.90-tests-optional.patch @@ -0,0 +1,94 @@ +From f9e0be7a43665a7020e4bfffde0f48b332ec366b Mon Sep 17 00:00:00 2001 +From: Andreas Sturmlechner +Date: Fri, 14 May 2021 12:38:57 +0200 +Subject: [PATCH] Use BUILD_TESTING to make tests optional + +Variable is provided by KDECMakeSettings and default enabled. + +Signed-off-by: Andreas Sturmlechner +--- + CMakeLists.txt | 6 +++++- + libdiscover/CMakeLists.txt | 4 +++- + libdiscover/backends/DummyBackend/CMakeLists.txt | 4 +++- + libdiscover/backends/FlatpakBackend/CMakeLists.txt | 4 +++- + libdiscover/backends/KNSBackend/CMakeLists.txt | 4 +++- + 5 files changed, 17 insertions(+), 5 deletions(-) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 73061dde..7d230317 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -11,7 +11,7 @@ find_package(ECM ${KF5_MIN_VERSION} REQUIRED NO_MODULE) + + set(CMAKE_MODULE_PATH ${ECM_MODULE_PATH} "${CMAKE_SOURCE_DIR}/cmake") + +-find_package(Qt5 ${QT_MIN_VERSION} REQUIRED CONFIG COMPONENTS Widgets Test Network Xml Concurrent DBus Quick X11Extras) ++find_package(Qt5 ${QT_MIN_VERSION} REQUIRED CONFIG COMPONENTS Widgets Network Xml Concurrent DBus Quick X11Extras) + include(KDEInstallDirs) + include(KDECMakeSettings) + include(KDECompilerSettings NO_POLICY_SCOPE) +@@ -23,6 +23,10 @@ include(ECMQtDeclareLoggingCategory) + include(KDEClangFormat) + include(KDEGitCommitHooks) + ++if(BUILD_TESTING) ++ find_package(Qt5Test ${QT_MIN_VERSION} CONFIG REQUIRED) ++endif() ++ + find_package(PkgConfig REQUIRED) + + find_package(KF5 ${KF5_MIN_VERSION} REQUIRED CoreAddons Config Crash DBusAddons I18n Archive XmlGui ItemModels KIO Declarative KCMUtils IdleTime) +diff --git a/libdiscover/CMakeLists.txt b/libdiscover/CMakeLists.txt +index 661c371b..56c72008 100644 +--- a/libdiscover/CMakeLists.txt ++++ b/libdiscover/CMakeLists.txt +@@ -4,7 +4,9 @@ configure_file(${CMAKE_CURRENT_SOURCE_DIR}/config-paths.h.cmake ${CMAKE_CURRENT_ + + add_subdirectory(backends) + add_subdirectory(notifiers) +-add_subdirectory(tests) ++if(BUILD_TESTING) ++ add_subdirectory(tests) ++endif() + + set(discovercommon_SRCS + Category/Category.cpp +diff --git a/libdiscover/backends/DummyBackend/CMakeLists.txt b/libdiscover/backends/DummyBackend/CMakeLists.txt +index 5b4aef10..38377d80 100644 +--- a/libdiscover/backends/DummyBackend/CMakeLists.txt ++++ b/libdiscover/backends/DummyBackend/CMakeLists.txt +@@ -1,4 +1,6 @@ +-add_subdirectory(tests) ++if(BUILD_TESTING) ++ add_subdirectory(tests) ++endif() + + set(dummy-backend_SRCS + DummyResource.cpp +diff --git a/libdiscover/backends/FlatpakBackend/CMakeLists.txt b/libdiscover/backends/FlatpakBackend/CMakeLists.txt +index 2006a829..810238f0 100644 +--- a/libdiscover/backends/FlatpakBackend/CMakeLists.txt ++++ b/libdiscover/backends/FlatpakBackend/CMakeLists.txt +@@ -1,4 +1,6 @@ +-add_subdirectory(tests) ++if(BUILD_TESTING) ++ add_subdirectory(tests) ++endif() + + set(flatpak-backend_SRCS + FlatpakResource.cpp +diff --git a/libdiscover/backends/KNSBackend/CMakeLists.txt b/libdiscover/backends/KNSBackend/CMakeLists.txt +index e2cb4e52..195cb98a 100644 +--- a/libdiscover/backends/KNSBackend/CMakeLists.txt ++++ b/libdiscover/backends/KNSBackend/CMakeLists.txt +@@ -1,4 +1,6 @@ +-add_subdirectory(tests) ++if(BUILD_TESTING) ++ add_subdirectory(tests) ++endif() + + add_library(kns-backend MODULE + KNSBackend.cpp +-- +2.31.1 + -- cgit v1.2.3