[gentoo-commits] proj/kde:master commit in: kde-apps/libkdegames/, kde-apps/libkdegames/files/

[gentoo-commits] proj/kde:master commit in: kde-apps/libkdegames/, kde-apps/libkdegames/files/

[Johannes Huber]

commit:     ed9e1f38f1adba14965e0834d69ecfc9a7c77f12
Author:     Johannes Huber <johu <AT> gentoo <DOT> org>
AuthorDate: Fri Jun 19 14:38:52 2015 +0000
Commit:     Johannes Huber <johu <AT> gentoo <DOT> org>
CommitDate: Fri Jun 19 14:38:52 2015 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=ed9e1f38

[kde-apps/libkdegames] Rename patch

Package-Manager: portage-2.2.20

 ...games-9999-tests-optional.patch => libkdegames-tests-optional.patch} | 0
 kde-apps/libkdegames/libkdegames-15.04.2.ebuild                         | 2 +-
 kde-apps/libkdegames/libkdegames-15.04.49.9999.ebuild                   | 2 +-
 kde-apps/libkdegames/libkdegames-9999.ebuild                            | 2 +-
 4 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/kde-apps/libkdegames/files/libkdegames-9999-tests-optional.patch b/kde-apps/libkdegames/files/libkdegames-tests-optional.patch
similarity index 100%
rename from kde-apps/libkdegames/files/libkdegames-9999-tests-optional.patch
rename to kde-apps/libkdegames/files/libkdegames-tests-optional.patch

diff --git a/kde-apps/libkdegames/libkdegames-15.04.2.ebuild b/kde-apps/libkdegames/libkdegames-15.04.2.ebuild
index f81a880..ef61e55 100644
--- a/kde-apps/libkdegames/libkdegames-15.04.2.ebuild
+++ b/kde-apps/libkdegames/libkdegames-15.04.2.ebuild
@@ -49,4 +49,4 @@ DEPEND="
 
 RDEPEND="${DEPEND}"
 
-PATCHES=( "${FILESDIR}/${PN}-9999-tests-optional.patch" )
+PATCHES=( "${FILESDIR}/${PN}-tests-optional.patch" )

diff --git a/kde-apps/libkdegames/libkdegames-15.04.49.9999.ebuild b/kde-apps/libkdegames/libkdegames-15.04.49.9999.ebuild
index 5362c90..dac2741 100644
--- a/kde-apps/libkdegames/libkdegames-15.04.49.9999.ebuild
+++ b/kde-apps/libkdegames/libkdegames-15.04.49.9999.ebuild
@@ -49,4 +49,4 @@ DEPEND="
 
 RDEPEND="${DEPEND}"
 
-PATCHES=( "${FILESDIR}/${PN}-9999-tests-optional.patch" )
+PATCHES=( "${FILESDIR}/${PN}-tests-optional.patch" )

diff --git a/kde-apps/libkdegames/libkdegames-9999.ebuild b/kde-apps/libkdegames/libkdegames-9999.ebuild
index 5362c90..dac2741 100644
--- a/kde-apps/libkdegames/libkdegames-9999.ebuild
+++ b/kde-apps/libkdegames/libkdegames-9999.ebuild
@@ -49,4 +49,4 @@ DEPEND="
 
 RDEPEND="${DEPEND}"
 
-PATCHES=( "${FILESDIR}/${PN}-9999-tests-optional.patch" )
+PATCHES=( "${FILESDIR}/${PN}-tests-optional.patch" )

[gentoo-commits] proj/kde:master commit in: kde-apps/libkdegames/, kde-apps/libkdegames/files/

[Johannes Huber]

commit:     76e66fce310f3e43f552d728d47dff990bf53da5
Author:     Andreas Sturmlechner <andreas.sturmlechner <AT> gmail <DOT> com>
AuthorDate: Sun Jul 26 21:20:16 2015 +0000
Commit:     Johannes Huber <johu <AT> gentoo <DOT> org>
CommitDate: Mon Jul 27 16:36:01 2015 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=76e66fce

[kde-apps/libkdegames] Fix patch for bug 555980

Package-Manager: portage-2.2.20

 .../files/libkdegames-15.04.3-tests-optional.patch | 33 ++++++++++++++++++++++
 kde-apps/libkdegames/libkdegames-15.04.3.ebuild    |  2 +-
 2 files changed, 34 insertions(+), 1 deletion(-)

diff --git a/kde-apps/libkdegames/files/libkdegames-15.04.3-tests-optional.patch b/kde-apps/libkdegames/files/libkdegames-15.04.3-tests-optional.patch
new file mode 100644
index 0000000..fa07df0
--- /dev/null
+++ b/kde-apps/libkdegames/files/libkdegames-15.04.3-tests-optional.patch
@@ -0,0 +1,33 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 2664fd4..32f453b 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -1,5 +1,3 @@
+-enable_testing()
+-
+ project(libkdegames)
+ 
+ cmake_minimum_required (VERSION 2.8.12 FATAL_ERROR)
+@@ -9,12 +7,21 @@ find_package(ECM 1.3.0 REQUIRED NO_MODULE)
+ set(CMAKE_MODULE_PATH ${CMAKE_CURRENT_SOURCE_DIR}/cmake/modules ${ECM_MODULE_PATH} ${ECM_KDE_MODULE_DIR})
+ 
+ 
+-find_package(Qt5 ${QT_MIN_VERSION} REQUIRED NO_MODULE COMPONENTS Widgets Qml Quick QuickWidgets Svg Test)
++find_package(Qt5 ${QT_MIN_VERSION} REQUIRED NO_MODULE COMPONENTS Widgets Qml Quick QuickWidgets Svg)
+ find_package(KF5 REQUIRED COMPONENTS CoreAddons Config WidgetsAddons Codecs Archive
+     DBusAddons DNSSD Declarative
+     I18n GuiAddons Service ConfigWidgets ItemViews IconThemes Completion JobWidgets TextWidgets GlobalAccel XmlGui Crash
+     Bookmarks KIO NewStuff KDELibs4Support)
+ 
++find_package(Qt5Test ${QT_MIN_VERSION} QUIET)
++set_package_properties(Qt5Test PROPERTIES
++    PURPOSE "Required for tests"
++    TYPE OPTIONAL)
++add_feature_info("Qt5Test" Qt5Test_FOUND "Required for building tests")
++if (NOT Qt5Test_FOUND)
++    set(BUILD_TESTING OFF CACHE BOOL "Build the testing tree.")
++endif()
++
+ include(FeatureSummary)
+ include(GenerateExportHeader)
+ include(ECMPackageConfigHelpers)

diff --git a/kde-apps/libkdegames/libkdegames-15.04.3.ebuild b/kde-apps/libkdegames/libkdegames-15.04.3.ebuild
index ef61e55..48d1eac 100644
--- a/kde-apps/libkdegames/libkdegames-15.04.3.ebuild
+++ b/kde-apps/libkdegames/libkdegames-15.04.3.ebuild
@@ -49,4 +49,4 @@ DEPEND="
 
 RDEPEND="${DEPEND}"
 
-PATCHES=( "${FILESDIR}/${PN}-tests-optional.patch" )
+PATCHES=( "${FILESDIR}/${P}-tests-optional.patch" )

[gentoo-commits] proj/kde:master commit in: kde-apps/libkdegames/, kde-apps/libkdegames/files/

[Michael Palimaka]

commit:     70de04485f0acd21563dd14f73905344997bab53
Author:     Andreas Sturmlechner <andreas.sturmlechner <AT> gmail <DOT> com>
AuthorDate: Tue Dec  1 14:36:34 2015 +0000
Commit:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Sun Dec  6 09:49:05 2015 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=70de0448

kde-apps/libkdegames: Doxygen, Fix DEPEND, patch -> KDE_TEST=forceoptional

Package-Manager: portage-2.2.26

 .../files/libkdegames-tests-optional.patch         | 33 ----------------------
 .../libkdegames/libkdegames-15.12.49.9999.ebuild   |  4 ++-
 kde-apps/libkdegames/libkdegames-9999.ebuild       |  4 ++-
 3 files changed, 6 insertions(+), 35 deletions(-)

diff --git a/kde-apps/libkdegames/files/libkdegames-tests-optional.patch b/kde-apps/libkdegames/files/libkdegames-tests-optional.patch
deleted file mode 100644
index 0b019c1..0000000
--- a/kde-apps/libkdegames/files/libkdegames-tests-optional.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 2664fd4..32f453b 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -1,5 +1,3 @@
--enable_testing()
--
- project(libkdegames)
- 
- cmake_minimum_required (VERSION 2.8.12 FATAL_ERROR)
-@@ -9,12 +7,21 @@ find_package(ECM 1.3.0 REQUIRED NO_MODULE)
- set(CMAKE_MODULE_PATH ${CMAKE_CURRENT_SOURCE_DIR}/cmake/modules ${ECM_MODULE_PATH} ${ECM_KDE_MODULE_DIR})
- 
- 
--find_package(Qt5 ${QT_MIN_VERSION} REQUIRED NO_MODULE COMPONENTS Widgets Qml Quick QuickWidgets Svg Test)
-+find_package(Qt5 ${QT_MIN_VERSION} REQUIRED NO_MODULE COMPONENTS Widgets Qml Quick QuickWidgets Svg)
- find_package(KF5 REQUIRED COMPONENTS CoreAddons Config WidgetsAddons Codecs Archive
-     DBusAddons DNSSD Declarative
-     I18n GuiAddons Service ConfigWidgets ItemViews IconThemes Completion JobWidgets TextWidgets GlobalAccel XmlGui Crash
-     Bookmarks KIO NewStuff)
- 
-+find_package(Qt5Test ${QT_MIN_VERSION} QUIET)
-+set_package_properties(Qt5Test PROPERTIES
-+    PURPOSE "Required for tests"
-+    TYPE OPTIONAL)
-+add_feature_info("Qt5Test" Qt5Test_FOUND "Required for building tests")
-+if (NOT Qt5Test_FOUND)
-+    set(BUILD_TESTING OFF CACHE BOOL "Build the testing tree.")
-+endif()
-+
- include(FeatureSummary)
- include(GenerateExportHeader)
- include(ECMPackageConfigHelpers)

diff --git a/kde-apps/libkdegames/libkdegames-15.12.49.9999.ebuild b/kde-apps/libkdegames/libkdegames-15.12.49.9999.ebuild
index 01869df..dbe7fbc 100644
--- a/kde-apps/libkdegames/libkdegames-15.12.49.9999.ebuild
+++ b/kde-apps/libkdegames/libkdegames-15.12.49.9999.ebuild
@@ -5,7 +5,8 @@
 EAPI=5
 
 KDE_BLOCK_SLOT4="false"
-KDE_TEST="true"
+KDE_DOXYGEN="true"
+KDE_TEST="forceoptional"
 VIRTUALX_REQUIRED="test"
 inherit kde5
 
@@ -42,6 +43,7 @@ DEPEND="
 	dev-qt/qtnetwork:5
 	dev-qt/qtwidgets:5
 	dev-qt/qtsvg:5
+	dev-qt/qtxml:5
 	media-libs/libsndfile
 	media-libs/openal
 "

diff --git a/kde-apps/libkdegames/libkdegames-9999.ebuild b/kde-apps/libkdegames/libkdegames-9999.ebuild
index 01869df..dbe7fbc 100644
--- a/kde-apps/libkdegames/libkdegames-9999.ebuild
+++ b/kde-apps/libkdegames/libkdegames-9999.ebuild
@@ -5,7 +5,8 @@
 EAPI=5
 
 KDE_BLOCK_SLOT4="false"
-KDE_TEST="true"
+KDE_DOXYGEN="true"
+KDE_TEST="forceoptional"
 VIRTUALX_REQUIRED="test"
 inherit kde5
 
@@ -42,6 +43,7 @@ DEPEND="
 	dev-qt/qtnetwork:5
 	dev-qt/qtwidgets:5
 	dev-qt/qtsvg:5
+	dev-qt/qtxml:5
 	media-libs/libsndfile
 	media-libs/openal
 "

[gentoo-commits] proj/kde:master commit in: kde-apps/libkdegames/, kde-apps/libkdegames/files/

[Andreas Sturmlechner]

commit:     adcecf9fd16f813688fbc9c8a329f268a5ad8eb9
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Wed Jun 17 15:55:54 2020 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Wed Jun 17 16:16:12 2020 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=adcecf9f

kde-apps/libkdegames: Set ECM_TEST="forceoptional" and use patch

Package-Manager: Portage-2.3.101, Repoman-2.3.22
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 .../files/libkdegames-20.04.2-optional-tests.patch | 28 ++++++++++++++++++++++
 .../libkdegames/libkdegames-20.04.49.9999.ebuild   |  4 +++-
 kde-apps/libkdegames/libkdegames-9999.ebuild       |  4 +++-
 3 files changed, 34 insertions(+), 2 deletions(-)

diff --git a/kde-apps/libkdegames/files/libkdegames-20.04.2-optional-tests.patch b/kde-apps/libkdegames/files/libkdegames-20.04.2-optional-tests.patch
new file mode 100644
index 0000000000..e7ffd23ade
--- /dev/null
+++ b/kde-apps/libkdegames/files/libkdegames-20.04.2-optional-tests.patch
@@ -0,0 +1,28 @@
+From f80393453a5645c0e9a4bdb8a23c9b303b0c4d41 Mon Sep 17 00:00:00 2001
+From: Andreas Sturmlechner <asturm@gentoo.org>
+Date: Wed, 17 Jun 2020 17:51:36 +0200
+Subject: [PATCH] Also add BUILD_TESTING condition in subdir
+
+Follow-up to 02679f6d.
+---
+ libkdegamesprivate/CMakeLists.txt | 4 +++-
+ 1 file changed, 3 insertions(+), 1 deletion(-)
+
+diff --git a/libkdegamesprivate/CMakeLists.txt b/libkdegamesprivate/CMakeLists.txt
+index b122f37a..c2e9572e 100644
+--- a/libkdegamesprivate/CMakeLists.txt
++++ b/libkdegamesprivate/CMakeLists.txt
+@@ -1,7 +1,9 @@
+ enable_testing()
+ project(libkdegamesprivate)
+ 
+-add_subdirectory(tests)
++if(BUILD_TESTING)
++    add_subdirectory(tests)
++endif()
+ 
+ # NOTE: The libkdegamesprivate target is compiled in the parent directory,
+ # because CMake can't cope with exported libraries in two different
+-- 
+2.27.0
+

diff --git a/kde-apps/libkdegames/libkdegames-20.04.49.9999.ebuild b/kde-apps/libkdegames/libkdegames-20.04.49.9999.ebuild
index fb766a03b4..6926d3e232 100644
--- a/kde-apps/libkdegames/libkdegames-20.04.49.9999.ebuild
+++ b/kde-apps/libkdegames/libkdegames-20.04.49.9999.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-ECM_TEST="forceoptional-recursive"
+ECM_TEST="forceoptional"
 KFMIN=5.70.0
 QTMIN=5.14.2
 VIRTUALX_REQUIRED="test"
@@ -49,3 +49,5 @@ DEPEND="
 	media-libs/openal
 "
 RDEPEND="${DEPEND}"
+
+PATCHES=( "${FILESDIR}/${PN}-20.04.2-optional-tests.patch" )

diff --git a/kde-apps/libkdegames/libkdegames-9999.ebuild b/kde-apps/libkdegames/libkdegames-9999.ebuild
index 47ebe3ccdf..7c2c7d0f6d 100644
--- a/kde-apps/libkdegames/libkdegames-9999.ebuild
+++ b/kde-apps/libkdegames/libkdegames-9999.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-ECM_TEST="forceoptional-recursive"
+ECM_TEST="forceoptional"
 KFMIN=5.71.0
 QTMIN=5.14.2
 VIRTUALX_REQUIRED="test"
@@ -49,3 +49,5 @@ DEPEND="
 	media-libs/openal
 "
 RDEPEND="${DEPEND}"
+
+PATCHES=( "${FILESDIR}/${PN}-20.04.2-optional-tests.patch" )