[gentoo-commits] proj/kde:master commit in: kde-plasma/discover/files/, kde-plasma/discover/

["Andreas Sturmlechner" <asturm@gentoo.org>]

commit:     0990b1569434d047125d1ddc4a54ca1c7a40b2dc
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sat Sep 17 11:59:09 2022 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sat Sep 17 12:00:34 2022 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=0990b156

kde-plasma/discover: Rebase tests-optional.patch

Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 kde-plasma/discover/discover-5.25.90.ebuild        |  2 +-
 kde-plasma/discover/discover-5.26.49.9999.ebuild   |  2 +-
 kde-plasma/discover/discover-9999.ebuild           |  2 +-
 ...patch => discover-5.25.90-tests-optional.patch} | 22 +++++++++++-----------
 4 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/kde-plasma/discover/discover-5.25.90.ebuild b/kde-plasma/discover/discover-5.25.90.ebuild
index be798a7185..a7aa853225 100644
--- a/kde-plasma/discover/discover-5.25.90.ebuild
+++ b/kde-plasma/discover/discover-5.25.90.ebuild
@@ -55,7 +55,7 @@ RDEPEND="${DEPEND}
 	>=dev-qt/qtquickcontrols2-${QTMIN}:5
 "
 
-PATCHES=( "${FILESDIR}/${PN}-5.25.1-tests-optional.patch" )
+PATCHES=( "${FILESDIR}/${P}-tests-optional.patch" )
 
 src_prepare() {
 	ecm_src_prepare

diff --git a/kde-plasma/discover/discover-5.26.49.9999.ebuild b/kde-plasma/discover/discover-5.26.49.9999.ebuild
index 28ffa33928..b1f9e2848c 100644
--- a/kde-plasma/discover/discover-5.26.49.9999.ebuild
+++ b/kde-plasma/discover/discover-5.26.49.9999.ebuild
@@ -55,7 +55,7 @@ RDEPEND="${DEPEND}
 	>=dev-qt/qtquickcontrols2-${QTMIN}:5
 "
 
-PATCHES=( "${FILESDIR}/${PN}-5.25.1-tests-optional.patch" )
+PATCHES=( "${FILESDIR}/${PN}-5.25.90-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 3b629cdbcd..e7a86646e9 100644
--- a/kde-plasma/discover/discover-9999.ebuild
+++ b/kde-plasma/discover/discover-9999.ebuild
@@ -55,7 +55,7 @@ RDEPEND="${DEPEND}
 	>=dev-qt/qtquickcontrols2-${QTMIN}:5
 "
 
-PATCHES=( "${FILESDIR}/${PN}-5.25.1-tests-optional.patch" )
+PATCHES=( "${FILESDIR}/${PN}-5.25.90-tests-optional.patch" )
 
 src_prepare() {
 	ecm_src_prepare

diff --git a/kde-plasma/discover/files/discover-5.25.1-tests-optional.patch b/kde-plasma/discover/files/discover-5.25.90-tests-optional.patch
similarity index 83%
rename from kde-plasma/discover/files/discover-5.25.1-tests-optional.patch
rename to kde-plasma/discover/files/discover-5.25.90-tests-optional.patch
index fc01ca3214..188f7d5b9e 100644
--- a/kde-plasma/discover/files/discover-5.25.1-tests-optional.patch
+++ b/kde-plasma/discover/files/discover-5.25.90-tests-optional.patch
@@ -1,4 +1,4 @@
-From 608e1dc8232002bc4cff600eae7571a100856334 Mon Sep 17 00:00:00 2001
+From e7ff50753b17ba97c3abfe08dfe2eb43f264ab6b 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
@@ -15,24 +15,24 @@ Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>
  5 files changed, 17 insertions(+), 5 deletions(-)
 
 diff --git a/CMakeLists.txt b/CMakeLists.txt
-index cd8c61aa..8ce3fa8c 100644
+index 3127d0e92..4fac1c926 100644
 --- a/CMakeLists.txt
 +++ b/CMakeLists.txt
-@@ -22,7 +22,11 @@
+@@ -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)
-+find_package(Qt${QT_MAJOR_VERSION} ${QT_MIN_VERSION} REQUIRED CONFIG COMPONENTS Widgets Network Xml Concurrent DBus Quick)
+-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)
 +
 +if(BUILD_TESTING)
-+    find_package(Qt${QT_MAJOR_VERSION}Test ${QT_MIN_VERSION} CONFIG REQUIRED)
++    find_package(Qt${QT_MAJOR_VERSION} ${QT_MIN_VERSION} CONFIG REQUIRED)
 +endif()
  
  find_package(PkgConfig REQUIRED)
  
 diff --git a/libdiscover/CMakeLists.txt b/libdiscover/CMakeLists.txt
-index a26d6934..ca827f3b 100644
+index 023b110fd..7778fab0c 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_
@@ -47,7 +47,7 @@ index a26d6934..ca827f3b 100644
  set(discovercommon_SRCS
      Category/Category.cpp
 diff --git a/libdiscover/backends/DummyBackend/CMakeLists.txt b/libdiscover/backends/DummyBackend/CMakeLists.txt
-index 5b4aef10..38377d80 100644
+index 5b4aef10c..38377d808 100644
 --- a/libdiscover/backends/DummyBackend/CMakeLists.txt
 +++ b/libdiscover/backends/DummyBackend/CMakeLists.txt
 @@ -1,4 +1,6 @@
@@ -59,7 +59,7 @@ index 5b4aef10..38377d80 100644
  set(dummy-backend_SRCS
      DummyResource.cpp
 diff --git a/libdiscover/backends/FlatpakBackend/CMakeLists.txt b/libdiscover/backends/FlatpakBackend/CMakeLists.txt
-index 55e6b38e..e2d11b93 100644
+index a051a4a21..f228f1ec0 100644
 --- a/libdiscover/backends/FlatpakBackend/CMakeLists.txt
 +++ b/libdiscover/backends/FlatpakBackend/CMakeLists.txt
 @@ -1,4 +1,6 @@
@@ -71,7 +71,7 @@ index 55e6b38e..e2d11b93 100644
  set(flatpak-backend_SRCS
      FlatpakResource.cpp
 diff --git a/libdiscover/backends/KNSBackend/CMakeLists.txt b/libdiscover/backends/KNSBackend/CMakeLists.txt
-index 54f19e1f..ec3443e9 100644
+index d52bee9d0..7d5ba8dc9 100644
 --- a/libdiscover/backends/KNSBackend/CMakeLists.txt
 +++ b/libdiscover/backends/KNSBackend/CMakeLists.txt
 @@ -1,4 +1,6 @@
@@ -83,5 +83,5 @@ index 54f19e1f..ec3443e9 100644
  add_library(kns-backend MODULE
      KNSBackend.cpp
 -- 
-2.35.1
+2.37.3