* [gentoo-commits] proj/kde:master commit in: kde-plasma/discover/, kde-plasma/discover/files/
@ 2022-06-21 21:19 Andreas Sturmlechner
0 siblings, 0 replies; 7+ messages in thread
From: Andreas Sturmlechner @ 2022-06-21 21:19 UTC (permalink / raw
To: gentoo-commits
commit: 46f3f4f169d104d996b44a1bb9e2ac13506715ac
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Tue Jun 21 21:16:35 2022 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Tue Jun 21 21:19:44 2022 +0000
URL: https://gitweb.gentoo.org/proj/kde.git/commit/?id=46f3f4f1
kde-plasma/discover: Rebase tests-optional.patch
Package-Manager: Portage-3.0.30, Repoman-3.0.3
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
kde-plasma/discover/discover-5.25.49.9999.ebuild | 2 +-
kde-plasma/discover/discover-9999.ebuild | 2 +-
...ptional.patch => discover-5.25.1-tests-optional.patch} | 15 ++++-----------
3 files changed, 6 insertions(+), 13 deletions(-)
diff --git a/kde-plasma/discover/discover-5.25.49.9999.ebuild b/kde-plasma/discover/discover-5.25.49.9999.ebuild
index a600cf3575..5574202fa8 100644
--- a/kde-plasma/discover/discover-5.25.49.9999.ebuild
+++ b/kde-plasma/discover/discover-5.25.49.9999.ebuild
@@ -54,7 +54,7 @@ RDEPEND="${DEPEND}
>=kde-frameworks/kirigami-${KFMIN}:5
"
-PATCHES=( "${FILESDIR}/${PN}-5.24.90-tests-optional.patch" )
+PATCHES=( "${FILESDIR}/${PN}-5.25.1-tests-optional.patch" )
src_prepare() {
ecm_src_prepare
diff --git a/kde-plasma/discover/discover-9999.ebuild b/kde-plasma/discover/discover-9999.ebuild
index 76eacbc097..79b033b729 100644
--- a/kde-plasma/discover/discover-9999.ebuild
+++ b/kde-plasma/discover/discover-9999.ebuild
@@ -54,7 +54,7 @@ RDEPEND="${DEPEND}
>=kde-frameworks/kirigami-${KFMIN}:5
"
-PATCHES=( "${FILESDIR}/${PN}-5.24.90-tests-optional.patch" )
+PATCHES=( "${FILESDIR}/${PN}-5.25.1-tests-optional.patch" )
src_prepare() {
ecm_src_prepare
diff --git a/kde-plasma/discover/files/discover-5.24.90-tests-optional.patch b/kde-plasma/discover/files/discover-5.25.1-tests-optional.patch
similarity index 84%
rename from kde-plasma/discover/files/discover-5.24.90-tests-optional.patch
rename to kde-plasma/discover/files/discover-5.25.1-tests-optional.patch
index f90f81abf5..fc01ca3214 100644
--- a/kde-plasma/discover/files/discover-5.24.90-tests-optional.patch
+++ b/kde-plasma/discover/files/discover-5.25.1-tests-optional.patch
@@ -18,26 +18,19 @@ diff --git a/CMakeLists.txt b/CMakeLists.txt
index cd8c61aa..8ce3fa8c 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
-@@ -22,7 +22,7 @@ include(GenerateExportHeader)
+@@ -22,7 +22,11 @@
include(ECMQtDeclareLoggingCategory)
include(KDEClangFormat)
include(KDEGitCommitHooks)
-find_package(Qt${QT_MAJOR_VERSION} ${QT_MIN_VERSION} REQUIRED CONFIG COMPONENTS Widgets Test Network Xml Concurrent DBus Quick)
+find_package(Qt${QT_MAJOR_VERSION} ${QT_MIN_VERSION} REQUIRED CONFIG COMPONENTS Widgets Network Xml Concurrent DBus Quick)
-
- if (QT_MAJOR_VERSION STREQUAL "5")
- find_package(Qt5X11Extras REQUIRED)
-@@ -30,6 +30,10 @@ elseif (QT_MAJOR_VERSION STREQUAL "6")
- find_package(Qt${QT_MAJOR_VERSION} ${REQUIRED_QT_VERSION} CONFIG REQUIRED Gui) # qtx11extras_p.h
- endif()
-
++
+if(BUILD_TESTING)
-+ find_package(Qt${QT_MAJOR_VERSION} ${QT_MIN_VERSION} CONFIG REQUIRED)
++ find_package(Qt${QT_MAJOR_VERSION}Test ${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 a26d6934..ca827f3b 100644
--- a/libdiscover/CMakeLists.txt
^ permalink raw reply related [flat|nested] 7+ messages in thread* [gentoo-commits] proj/kde:master commit in: kde-plasma/discover/, kde-plasma/discover/files/
@ 2024-03-27 12:19 Andreas Sturmlechner
0 siblings, 0 replies; 7+ messages in thread
From: Andreas Sturmlechner @ 2024-03-27 12:19 UTC (permalink / raw
To: gentoo-commits
commit: f98cacf5b0f22d7e768af220f6df4141faf2de60
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Wed Mar 27 12:12:25 2024 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Wed Mar 27 12:12:25 2024 +0000
URL: https://gitweb.gentoo.org/proj/kde.git/commit/?id=f98cacf5
kde-plasma/discover: Rebase tests-optional.patch on top of HEAD
Pending MR: https://invent.kde.org/plasma/discover/-/merge_requests/805
Closes: https://bugs.gentoo.org/927951
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
kde-plasma/discover/discover-9999.ebuild | 2 +-
.../files/discover-6.0.80-tests-optional.patch | 111 +++++++++++++++++++++
2 files changed, 112 insertions(+), 1 deletion(-)
diff --git a/kde-plasma/discover/discover-9999.ebuild b/kde-plasma/discover/discover-9999.ebuild
index 12baab4d88..340acd5629 100644
--- a/kde-plasma/discover/discover-9999.ebuild
+++ b/kde-plasma/discover/discover-9999.ebuild
@@ -51,7 +51,7 @@ RDEPEND="${DEPEND}
"
BDEPEND=">=kde-frameworks/kcmutils-${KFMIN}:6"
-PATCHES=( "${FILESDIR}/${PN}-5.25.90-tests-optional.patch" )
+PATCHES=( "${FILESDIR}/${PN}-6.0.80-tests-optional.patch" )
src_prepare() {
ecm_src_prepare
diff --git a/kde-plasma/discover/files/discover-6.0.80-tests-optional.patch b/kde-plasma/discover/files/discover-6.0.80-tests-optional.patch
new file mode 100644
index 0000000000..2568efeaea
--- /dev/null
+++ b/kde-plasma/discover/files/discover-6.0.80-tests-optional.patch
@@ -0,0 +1,111 @@
+From 45b61189358db327fe51872e060cdc590c4e1eb5 Mon Sep 17 00:00:00 2001
+From: Andreas Sturmlechner <asturm@gentoo.org>
+Date: Fri, 14 May 2021 12:38:57 +0200
+Subject: [PATCH] Don't build tests unless requested by BUILD_TESTING
+
+Variable is provided by KDECMakeSettings and default enabled.
+
+Cleanup cmake a bit, Qt 6.6.0 is minimum by now.
+
+Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>
+---
+ CMakeLists.txt | 4 +++-
+ appiumtests/CMakeLists.txt | 9 ---------
+ libdiscover/CMakeLists.txt | 4 +++-
+ libdiscover/backends/DummyBackend/CMakeLists.txt | 4 +++-
+ libdiscover/backends/FlatpakBackend/CMakeLists.txt | 4 +++-
+ libdiscover/backends/KNSBackend/CMakeLists.txt | 4 +++-
+ 6 files changed, 15 insertions(+), 14 deletions(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 95c3bd7e7..4da1df6a1 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -63,7 +63,9 @@ add_definitions(-DQT_NO_SIGNALS_SLOTS_KEYWORDS -DQT_NO_URL_CAST_FROM_STRING)
+
+ configure_file(DiscoverVersion.h.in DiscoverVersion.h)
+
+-add_subdirectory(appiumtests)
++if(BUILD_TESTING AND CMAKE_SYSTEM_NAME MATCHES "Linux")
++ add_subdirectory(appiumtests)
++endif()
+ add_subdirectory(libdiscover)
+ add_subdirectory(discover)
+ add_subdirectory(exporter)
+diff --git a/appiumtests/CMakeLists.txt b/appiumtests/CMakeLists.txt
+index d0214ec5c..8e610d3a4 100644
+--- a/appiumtests/CMakeLists.txt
++++ b/appiumtests/CMakeLists.txt
+@@ -1,15 +1,6 @@
+ # SPDX-License-Identifier: BSD-3-Clause
+ # SPDX-FileCopyrightText: 2022 Harald Sitter <sitter@kde.org>
+
+-if(NOT Qt6_VERSION VERSION_GREATER_EQUAL "6.5.0")
+- # Before Qt 6.5 the AbstractButtons didn't trigger properly at all.
+- return()
+-endif()
+-
+-if(NOT BUILD_TESTING OR NOT CMAKE_SYSTEM_NAME MATCHES "Linux")
+- return()
+-endif()
+-
+ find_package(SeleniumWebDriverATSPI)
+ set_package_properties(SeleniumWebDriverATSPI PROPERTIES
+ DESCRIPTION "Server component for selenium tests using Linux accessibility infrastructure"
+diff --git a/libdiscover/CMakeLists.txt b/libdiscover/CMakeLists.txt
+index 6e23a2f10..ff7038878 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()
+
+ if (TARGET AppStreamQt)
+ add_library(DiscoverAppStreamIntegration STATIC
+diff --git a/libdiscover/backends/DummyBackend/CMakeLists.txt b/libdiscover/backends/DummyBackend/CMakeLists.txt
+index 1c4fbea16..c8f2efeea 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 9190b49dc..d20a66fef 100644
+--- a/libdiscover/backends/FlatpakBackend/CMakeLists.txt
++++ b/libdiscover/backends/FlatpakBackend/CMakeLists.txt
+@@ -17,7 +17,9 @@ target_link_libraries(libdiscover-backend-flatpak-logging-category
+ Qt::Core
+ )
+
+-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 fe39611f5..4d0e59bf1 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.44.0
+
^ permalink raw reply related [flat|nested] 7+ messages in thread* [gentoo-commits] proj/kde:master commit in: kde-plasma/discover/, kde-plasma/discover/files/
@ 2023-12-22 15:41 Sam James
0 siblings, 0 replies; 7+ messages in thread
From: Sam James @ 2023-12-22 15:41 UTC (permalink / raw
To: gentoo-commits
commit: cb10e9e5ec650fbfbcdcf48044a308dccc44c7ac
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Fri Dec 22 15:41:27 2023 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Fri Dec 22 15:41:27 2023 +0000
URL: https://gitweb.gentoo.org/proj/kde.git/commit/?id=cb10e9e5
kde-plasma/discover: backport kuserfeedback optionality fix
Bug: https://bugs.kde.org/show_bug.cgi?id=478766
Thanks-to: Alfred Wingate <parona <AT> protonmail.com>
Signed-off-by: Sam James <sam <AT> gentoo.org>
kde-plasma/discover/discover-5.91.0.ebuild | 5 ++++-
.../discover-5.91.0-kuserfeedback-optional.patch | 22 ++++++++++++++++++++++
2 files changed, 26 insertions(+), 1 deletion(-)
diff --git a/kde-plasma/discover/discover-5.91.0.ebuild b/kde-plasma/discover/discover-5.91.0.ebuild
index 43aa365255..58c7ba5240 100644
--- a/kde-plasma/discover/discover-5.91.0.ebuild
+++ b/kde-plasma/discover/discover-5.91.0.ebuild
@@ -50,7 +50,10 @@ RDEPEND="${DEPEND}"
# snap? ( app-containers/snapd )
BDEPEND=">=kde-frameworks/kcmutils-${KFMIN}:6"
-PATCHES=( "${FILESDIR}/${PN}-5.25.90-tests-optional.patch" )
+PATCHES=(
+ "${FILESDIR}/${PN}-5.25.90-tests-optional.patch"
+ "${FILESDIR}/${PN}-5.91.0-kuserfeedback-optional.patch"
+)
src_prepare() {
ecm_src_prepare
diff --git a/kde-plasma/discover/files/discover-5.91.0-kuserfeedback-optional.patch b/kde-plasma/discover/files/discover-5.91.0-kuserfeedback-optional.patch
new file mode 100644
index 0000000000..d52b52ad7a
--- /dev/null
+++ b/kde-plasma/discover/files/discover-5.91.0-kuserfeedback-optional.patch
@@ -0,0 +1,22 @@
+https://invent.kde.org/plasma/discover/-/merge_requests/724
+
+From 47ac41ac57e4df182b0443bb1bde3b8ff60f05e2 Mon Sep 17 00:00:00 2001
+From: Alfred Wingate <parona@protonmail.com>
+Date: Wed, 20 Dec 2023 20:48:59 +0200
+Subject: [PATCH] Make UserFeedback an optional component
+
+BUG: 478766
+Signed-off-by: Alfred Wingate <parona@protonmail.com>
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -28,7 +28,7 @@ find_package(Qt6 ${QT_MIN_VERSION} CONFIG OPTIONAL_COMPONENTS WebView)
+ find_package(PkgConfig REQUIRED)
+
+ find_package(KF6 ${KF6_MIN_VERSION} REQUIRED Kirigami CoreAddons Config Crash DBusAddons I18n Archive XmlGui KIO KCMUtils IdleTime Notifications Purpose Auth StatusNotifierItem)
+-find_package(KF6 ${KF6_MIN_VERSION} COMPONENTS UserFeedback)
++find_package(KF6 ${KF6_MIN_VERSION} OPTIONAL_COMPONENTS UserFeedback)
+
+ find_package(packagekitqt6 1.0.1 CONFIG)
+ find_package(AppStreamQt 1.0 CONFIG REQUIRED)
+--
+GitLab
^ permalink raw reply related [flat|nested] 7+ messages in thread* [gentoo-commits] proj/kde:master commit in: kde-plasma/discover/, kde-plasma/discover/files/
@ 2022-09-20 19:05 Andreas Sturmlechner
0 siblings, 0 replies; 7+ messages in thread
From: Andreas Sturmlechner @ 2022-09-20 19:05 UTC (permalink / raw
To: gentoo-commits
commit: b557ce87a82bda203b010127e532a16e6f219232
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Tue Sep 20 18:52:30 2022 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Tue Sep 20 19:05:00 2022 +0000
URL: https://gitweb.gentoo.org/proj/kde.git/commit/?id=b557ce87
kde-plasma/discover: Add IUSE webengine, respin tests-optional.patch
Upstream commit 08f0ab031e74d722fd2b569f89c98f1c61a00b35
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
kde-plasma/discover/discover-5.25.90.ebuild | 4 +++-
kde-plasma/discover/discover-5.26.49.9999.ebuild | 4 +++-
kde-plasma/discover/discover-9999.ebuild | 5 +++--
.../files/discover-5.25.90-tests-optional.patch | 26 ++++++++++------------
kde-plasma/discover/metadata.xml | 1 +
5 files changed, 22 insertions(+), 18 deletions(-)
diff --git a/kde-plasma/discover/discover-5.25.90.ebuild b/kde-plasma/discover/discover-5.25.90.ebuild
index a7aa853225..1f6fd4255c 100644
--- a/kde-plasma/discover/discover-5.25.90.ebuild
+++ b/kde-plasma/discover/discover-5.25.90.ebuild
@@ -15,7 +15,7 @@ HOMEPAGE="https://userbase.kde.org/Discover"
LICENSE="GPL-2" # TODO: CHECK
SLOT="5"
KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
-IUSE="+firmware flatpak share telemetry"
+IUSE="+firmware flatpak share telemetry webengine"
# libmarkdown (app-text/discount) only used in PackageKitBackend
DEPEND="
@@ -50,6 +50,7 @@ DEPEND="
)
share? ( >=kde-frameworks/purpose-${KFMIN}:5 )
telemetry? ( dev-libs/kuserfeedback:5 )
+ webengine? ( >=dev-qt/qtwebview-${QTMIN}:5 )
"
RDEPEND="${DEPEND}
>=dev-qt/qtquickcontrols2-${QTMIN}:5
@@ -77,6 +78,7 @@ src_configure() {
-DBUILD_FwupdBackend=$(usex firmware)
$(cmake_use_find_package share KF5Purpose)
$(cmake_use_find_package telemetry KUserFeedback)
+ $(cmake_use_find_package webengine Qt5WebView)
)
ecm_src_configure
diff --git a/kde-plasma/discover/discover-5.26.49.9999.ebuild b/kde-plasma/discover/discover-5.26.49.9999.ebuild
index b1f9e2848c..dc5b90d983 100644
--- a/kde-plasma/discover/discover-5.26.49.9999.ebuild
+++ b/kde-plasma/discover/discover-5.26.49.9999.ebuild
@@ -15,7 +15,7 @@ HOMEPAGE="https://userbase.kde.org/Discover"
LICENSE="GPL-2" # TODO: CHECK
SLOT="5"
KEYWORDS=""
-IUSE="+firmware flatpak share telemetry"
+IUSE="+firmware flatpak share telemetry webengine"
# libmarkdown (app-text/discount) only used in PackageKitBackend
DEPEND="
@@ -50,6 +50,7 @@ DEPEND="
)
share? ( >=kde-frameworks/purpose-${KFMIN}:5 )
telemetry? ( dev-libs/kuserfeedback:5 )
+ webengine? ( >=dev-qt/qtwebview-${QTMIN}:5 )
"
RDEPEND="${DEPEND}
>=dev-qt/qtquickcontrols2-${QTMIN}:5
@@ -77,6 +78,7 @@ src_configure() {
-DBUILD_FwupdBackend=$(usex firmware)
$(cmake_use_find_package share KF5Purpose)
$(cmake_use_find_package telemetry KUserFeedback)
+ $(cmake_use_find_package webengine Qt5WebView)
)
ecm_src_configure
diff --git a/kde-plasma/discover/discover-9999.ebuild b/kde-plasma/discover/discover-9999.ebuild
index e7a86646e9..9d527966ea 100644
--- a/kde-plasma/discover/discover-9999.ebuild
+++ b/kde-plasma/discover/discover-9999.ebuild
@@ -15,7 +15,7 @@ HOMEPAGE="https://userbase.kde.org/Discover"
LICENSE="GPL-2" # TODO: CHECK
SLOT="5"
KEYWORDS=""
-IUSE="+firmware flatpak share telemetry"
+IUSE="+firmware flatpak share telemetry webengine"
# libmarkdown (app-text/discount) only used in PackageKitBackend
DEPEND="
@@ -24,7 +24,6 @@ DEPEND="
>=dev-qt/qtdeclarative-${QTMIN}:5
>=dev-qt/qtgui-${QTMIN}:5
>=dev-qt/qtnetwork-${QTMIN}:5
- >=dev-qt/qtwebview-${QTMIN}:5
>=dev-qt/qtwidgets-${QTMIN}:5
>=dev-qt/qtxml-${QTMIN}:5
>=kde-frameworks/attica-${KFMIN}:5
@@ -50,6 +49,7 @@ DEPEND="
)
share? ( >=kde-frameworks/purpose-${KFMIN}:5 )
telemetry? ( dev-libs/kuserfeedback:5 )
+ webengine? ( >=dev-qt/qtwebview-${QTMIN}:5 )
"
RDEPEND="${DEPEND}
>=dev-qt/qtquickcontrols2-${QTMIN}:5
@@ -77,6 +77,7 @@ src_configure() {
-DBUILD_FwupdBackend=$(usex firmware)
$(cmake_use_find_package share KF5Purpose)
$(cmake_use_find_package telemetry KUserFeedback)
+ $(cmake_use_find_package webengine Qt5WebView)
)
ecm_src_configure
diff --git a/kde-plasma/discover/files/discover-5.25.90-tests-optional.patch b/kde-plasma/discover/files/discover-5.25.90-tests-optional.patch
index 188f7d5b9e..50f1175116 100644
--- a/kde-plasma/discover/files/discover-5.25.90-tests-optional.patch
+++ b/kde-plasma/discover/files/discover-5.25.90-tests-optional.patch
@@ -1,4 +1,4 @@
-From e7ff50753b17ba97c3abfe08dfe2eb43f264ab6b Mon Sep 17 00:00:00 2001
+From 8706a81bccfbaf9d06a3aedf9f968d760757af07 Mon Sep 17 00:00:00 2001
From: Andreas Sturmlechner <asturm@gentoo.org>
Date: Fri, 14 May 2021 12:38:57 +0200
Subject: [PATCH] Use BUILD_TESTING to make tests optional
@@ -7,30 +7,28 @@ Variable is provided by KDECMakeSettings and default enabled.
Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>
---
- CMakeLists.txt | 6 +++++-
+ CMakeLists.txt | 4 ++++
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(-)
+ 5 files changed, 16 insertions(+), 4 deletions(-)
diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 3127d0e92..4fac1c926 100644
+index 13fe64228..7453c8bfb 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
-@@ -22,7 +22,11 @@ include(GenerateExportHeader)
- include(ECMQtDeclareLoggingCategory)
- include(KDEClangFormat)
- include(KDEGitCommitHooks)
--find_package(Qt${QT_MAJOR_VERSION} ${QT_MIN_VERSION} REQUIRED CONFIG COMPONENTS Widgets Test Network Xml Concurrent DBus Quick WebView)
-+find_package(Qt${QT_MAJOR_VERSION} ${QT_MIN_VERSION} REQUIRED CONFIG COMPONENTS Widgets Network Xml Concurrent DBus Quick WebView)
-+
+@@ -25,6 +25,10 @@ include(KDEGitCommitHooks)
+ find_package(Qt${QT_MAJOR_VERSION} ${QT_MIN_VERSION} REQUIRED CONFIG COMPONENTS Widgets Test Network Xml Concurrent DBus Quick)
+ find_package(Qt${QT_MAJOR_VERSION} ${QT_MIN_VERSION} CONFIG OPTIONAL_COMPONENTS WebView)
+
+if(BUILD_TESTING)
-+ find_package(Qt${QT_MAJOR_VERSION} ${QT_MIN_VERSION} CONFIG REQUIRED)
++ find_package(Qt${QT_MAJOR_VERSION}Test ${QT_MIN_VERSION} CONFIG REQUIRED)
+endif()
-
++
find_package(PkgConfig REQUIRED)
+ find_package(KF5 ${KF5_MIN_VERSION} REQUIRED CoreAddons Config Crash DBusAddons I18n Archive XmlGui KIO Declarative KCMUtils IdleTime Notifications Purpose)
diff --git a/libdiscover/CMakeLists.txt b/libdiscover/CMakeLists.txt
index 023b110fd..7778fab0c 100644
--- a/libdiscover/CMakeLists.txt
@@ -59,7 +57,7 @@ index 5b4aef10c..38377d808 100644
set(dummy-backend_SRCS
DummyResource.cpp
diff --git a/libdiscover/backends/FlatpakBackend/CMakeLists.txt b/libdiscover/backends/FlatpakBackend/CMakeLists.txt
-index a051a4a21..f228f1ec0 100644
+index eac5a3241..e9ee78fd0 100644
--- a/libdiscover/backends/FlatpakBackend/CMakeLists.txt
+++ b/libdiscover/backends/FlatpakBackend/CMakeLists.txt
@@ -1,4 +1,6 @@
diff --git a/kde-plasma/discover/metadata.xml b/kde-plasma/discover/metadata.xml
index d275ea3a63..cac82ca8e8 100644
--- a/kde-plasma/discover/metadata.xml
+++ b/kde-plasma/discover/metadata.xml
@@ -12,5 +12,6 @@
<flag name="share">Enable support for a sharing application URLs <pkg>kde-frameworks/purpose</pkg></flag>
<flag name="firmware">Enable support for firmware upgrades using <pkg>sys-apps/fwupd</pkg></flag>
<flag name="flatpak">Enable support for flatpak repositories using <pkg>sys-apps/flatpak</pkg></flag>
+ <flag name="webengine">Enable webflow support using <pkg>dev-qt/qtwebview</pkg> and <pkg>dev-qt/qtwebengine</pkg> instead of default URL handler</flag>
</use>
</pkgmetadata>
^ permalink raw reply related [flat|nested] 7+ messages in thread* [gentoo-commits] proj/kde:master commit in: kde-plasma/discover/, kde-plasma/discover/files/
@ 2022-03-07 16:53 Andreas Sturmlechner
0 siblings, 0 replies; 7+ messages in thread
From: Andreas Sturmlechner @ 2022-03-07 16:53 UTC (permalink / raw
To: gentoo-commits
commit: 3b49f48d5f32e2af6061820f90cbd450535410c3
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Mon Mar 7 16:53:40 2022 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Mon Mar 7 16:53:40 2022 +0000
URL: https://gitweb.gentoo.org/proj/kde.git/commit/?id=3b49f48d
kde-plasma/discover: Rebase tests-optional.patch
Closes: https://bugs.gentoo.org/834691
Package-Manager: Portage-3.0.30, Repoman-3.0.3
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
kde-plasma/discover/discover-9999.ebuild | 2 +-
.../files/discover-5.24.90-tests-optional.patch | 94 ++++++++++++++++++++++
2 files changed, 95 insertions(+), 1 deletion(-)
diff --git a/kde-plasma/discover/discover-9999.ebuild b/kde-plasma/discover/discover-9999.ebuild
index 7ea0d466e9..934f14c1cf 100644
--- a/kde-plasma/discover/discover-9999.ebuild
+++ b/kde-plasma/discover/discover-9999.ebuild
@@ -56,7 +56,7 @@ RDEPEND="${DEPEND}
>=kde-frameworks/kirigami-${KFMIN}:5
"
-PATCHES=( "${FILESDIR}/${PN}-5.21.90-tests-optional.patch" )
+PATCHES=( "${FILESDIR}/${PN}-5.24.90-tests-optional.patch" )
src_prepare() {
ecm_src_prepare
diff --git a/kde-plasma/discover/files/discover-5.24.90-tests-optional.patch b/kde-plasma/discover/files/discover-5.24.90-tests-optional.patch
new file mode 100644
index 0000000000..f90f81abf5
--- /dev/null
+++ b/kde-plasma/discover/files/discover-5.24.90-tests-optional.patch
@@ -0,0 +1,94 @@
+From 608e1dc8232002bc4cff600eae7571a100856334 Mon Sep 17 00:00:00 2001
+From: Andreas Sturmlechner <asturm@gentoo.org>
+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 <asturm@gentoo.org>
+---
+ 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 cd8c61aa..8ce3fa8c 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -22,7 +22,7 @@ include(GenerateExportHeader)
+ include(ECMQtDeclareLoggingCategory)
+ include(KDEClangFormat)
+ include(KDEGitCommitHooks)
+-find_package(Qt${QT_MAJOR_VERSION} ${QT_MIN_VERSION} REQUIRED CONFIG COMPONENTS Widgets Test Network Xml Concurrent DBus Quick)
++find_package(Qt${QT_MAJOR_VERSION} ${QT_MIN_VERSION} REQUIRED CONFIG COMPONENTS Widgets Network Xml Concurrent DBus Quick)
+
+ if (QT_MAJOR_VERSION STREQUAL "5")
+ find_package(Qt5X11Extras REQUIRED)
+@@ -30,6 +30,10 @@ elseif (QT_MAJOR_VERSION STREQUAL "6")
+ find_package(Qt${QT_MAJOR_VERSION} ${REQUIRED_QT_VERSION} CONFIG REQUIRED Gui) # qtx11extras_p.h
+ endif()
+
++if(BUILD_TESTING)
++ find_package(Qt${QT_MAJOR_VERSION} ${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 a26d6934..ca827f3b 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 55e6b38e..e2d11b93 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 54f19e1f..ec3443e9 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.35.1
+
^ permalink raw reply related [flat|nested] 7+ messages in thread* [gentoo-commits] proj/kde:master commit in: kde-plasma/discover/, kde-plasma/discover/files/
@ 2021-08-26 16:46 Andreas Sturmlechner
0 siblings, 0 replies; 7+ messages in thread
From: Andreas Sturmlechner @ 2021-08-26 16:46 UTC (permalink / raw
To: gentoo-commits
commit: 30ba2161fc1d32508cd92b32ded8dd18e7172fda
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Thu Aug 26 15:20:55 2021 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Thu Aug 26 15:20:55 2021 +0000
URL: https://gitweb.gentoo.org/proj/kde.git/commit/?id=30ba2161
kde-plasma/discover: Disable updates KCM
Upstream commit 725ae1f2b9d4a8995881faafb323c541ff6d3c1b
See also: https://invent.kde.org/plasma/discover/-/merge_requests/142
Package-Manager: Portage-3.0.22, Repoman-3.0.3
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
kde-plasma/discover/discover-5.22.49.9999.ebuild | 6 ++++-
kde-plasma/discover/discover-9999.ebuild | 1 +
.../files/discover-5.22.5-no-updates-kcm.patch | 30 ++++++++++++++++++++++
3 files changed, 36 insertions(+), 1 deletion(-)
diff --git a/kde-plasma/discover/discover-5.22.49.9999.ebuild b/kde-plasma/discover/discover-5.22.49.9999.ebuild
index 18cba0b621..7326ebca86 100644
--- a/kde-plasma/discover/discover-5.22.49.9999.ebuild
+++ b/kde-plasma/discover/discover-5.22.49.9999.ebuild
@@ -56,7 +56,10 @@ RDEPEND="${DEPEND}
>=kde-frameworks/kirigami-${KFMIN}:5
"
-PATCHES=( "${FILESDIR}/${PN}-5.21.90-tests-optional.patch" )
+PATCHES=(
+ "${FILESDIR}/${PN}-5.21.90-tests-optional.patch"
+ "${FILESDIR}/${PN}-5.22.5-no-updates-kcm.patch"
+)
src_prepare() {
ecm_src_prepare
@@ -68,6 +71,7 @@ src_configure() {
local mycmakeargs=(
-DCMAKE_DISABLE_FIND_PACKAGE_packagekitqt5=ON
-DCMAKE_DISABLE_FIND_PACKAGE_Snapd=ON
+ -DWITH_KCM=OFF
-DBUILD_FlatpakBackend=$(usex flatpak)
$(cmake_use_find_package flatpak AppStreamQt)
-DBUILD_FwupdBackend=$(usex firmware)
diff --git a/kde-plasma/discover/discover-9999.ebuild b/kde-plasma/discover/discover-9999.ebuild
index 2fc53ff9f1..c94a2d0760 100644
--- a/kde-plasma/discover/discover-9999.ebuild
+++ b/kde-plasma/discover/discover-9999.ebuild
@@ -68,6 +68,7 @@ src_configure() {
local mycmakeargs=(
-DCMAKE_DISABLE_FIND_PACKAGE_packagekitqt5=ON
-DCMAKE_DISABLE_FIND_PACKAGE_Snapd=ON
+ -DWITH_KCM=OFF
-DBUILD_FlatpakBackend=$(usex flatpak)
$(cmake_use_find_package flatpak AppStreamQt)
-DBUILD_FwupdBackend=$(usex firmware)
diff --git a/kde-plasma/discover/files/discover-5.22.5-no-updates-kcm.patch b/kde-plasma/discover/files/discover-5.22.5-no-updates-kcm.patch
new file mode 100644
index 0000000000..e2c21ac1b9
--- /dev/null
+++ b/kde-plasma/discover/files/discover-5.22.5-no-updates-kcm.patch
@@ -0,0 +1,30 @@
+From 725ae1f2b9d4a8995881faafb323c541ff6d3c1b Mon Sep 17 00:00:00 2001
+From: Antonio Rojas <arojas@archlinux.org>
+Date: Thu, 1 Jul 2021 22:24:40 +0200
+Subject: [PATCH] Make building updates KCM optional
+
+Some distros (such as Arch) don't support offline updates or automatic updates, so the options in the KCM are misleading and can cause unexpected behavior.
+---
+ CMakeLists.txt | 6 +++++-
+ 1 file changed, 5 insertions(+), 1 deletion(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index fa27fc77a..26387b2f0 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -53,7 +53,11 @@ add_subdirectory(libdiscover)
+ add_subdirectory(discover)
+ add_subdirectory(exporter)
+ add_subdirectory(update)
+-add_subdirectory(kcm)
++
++option(WITH_KCM "Build and install the updates KCM" ON)
++if(WITH_KCM)
++ add_subdirectory(kcm)
++endif()
+
+ option(WITH_NOTIFIER "Build and install the notifier plasmoid" ON)
+ if(WITH_NOTIFIER)
+--
+GitLab
+
^ permalink raw reply related [flat|nested] 7+ messages in thread* [gentoo-commits] proj/kde:master commit in: kde-plasma/discover/, kde-plasma/discover/files/
@ 2021-05-14 12:09 Andreas Sturmlechner
0 siblings, 0 replies; 7+ messages in thread
From: Andreas Sturmlechner @ 2021-05-14 12:09 UTC (permalink / raw
To: gentoo-commits
commit: 07ed4f629ac1d2d38cdbf09eac0ff7017d5343be
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Fri May 14 10:44:00 2021 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Fri May 14 10:57:32 2021 +0000
URL: https://gitweb.gentoo.org/proj/kde.git/commit/?id=07ed4f62
kde-plasma/discover: Make tests optional
Package-Manager: Portage-3.0.18, Repoman-3.0.3
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
kde-plasma/discover/discover-9999.ebuild | 4 +-
.../files/discover-5.21.90-tests-optional.patch | 94 ++++++++++++++++++++++
2 files changed, 97 insertions(+), 1 deletion(-)
diff --git a/kde-plasma/discover/discover-9999.ebuild b/kde-plasma/discover/discover-9999.ebuild
index 7f338a238a..d1ba0d83c3 100644
--- a/kde-plasma/discover/discover-9999.ebuild
+++ b/kde-plasma/discover/discover-9999.ebuild
@@ -3,7 +3,7 @@
EAPI=7
-ECM_TEST="forceoptional"
+ECM_TEST="true"
KFMIN=9999
QTMIN=5.15.2
VIRTUALX_REQUIRED="test"
@@ -56,6 +56,8 @@ RDEPEND="${DEPEND}
>=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
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 0000000000..43976d145b
--- /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 <asturm@gentoo.org>
+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 <asturm@gentoo.org>
+---
+ 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
+
^ permalink raw reply related [flat|nested] 7+ messages in thread
end of thread, other threads:[~2024-03-27 12:19 UTC | newest]
Thread overview: 7+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2022-06-21 21:19 [gentoo-commits] proj/kde:master commit in: kde-plasma/discover/, kde-plasma/discover/files/ Andreas Sturmlechner
-- strict thread matches above, loose matches on Subject: below --
2024-03-27 12:19 Andreas Sturmlechner
2023-12-22 15:41 Sam James
2022-09-20 19:05 Andreas Sturmlechner
2022-03-07 16:53 Andreas Sturmlechner
2021-08-26 16:46 Andreas Sturmlechner
2021-05-14 12:09 Andreas Sturmlechner
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox