[gentoo-commits] proj/kde:master commit in: kde-apps/libkdegames/files/
commit: 7aa179f0451215e8bb0065c724f2636705b178dd Author: Andreas Sturmlechner gentoo org> AuthorDate: Sat Jul 11 21:48:02 2020 + Commit: Andreas Sturmlechner gentoo org> CommitDate: Sun Jul 12 22:53:27 2020 + URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=7aa179f0 kde-apps/libkdegames: Drop obsolete patch Package-Manager: Portage-2.3.103, Repoman-2.3.23 Signed-off-by: Andreas Sturmlechner gentoo.org> .../files/libkdegames-20.04.2-optional-tests.patch | 28 -- 1 file changed, 28 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 deleted file mode 100644 index e7ffd23ade..00 --- a/kde-apps/libkdegames/files/libkdegames-20.04.2-optional-tests.patch +++ /dev/null @@ -1,28 +0,0 @@ -From f80393453a5645c0e9a4bdb8a23c9b303b0c4d41 Mon Sep 17 00:00:00 2001 -From: Andreas Sturmlechner -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 -
[gentoo-commits] proj/kde:master commit in: kde-apps/libkdegames/files/, kde-apps/libkdegames/
commit: 26b80c7b86e1f5319dd18c2c558102276634da9c
Author: Andreas Sturmlechner andreas.sturmlechner AT gmail DOT com
AuthorDate: Wed Jul 22 06:44:46 2015 +
Commit: Michael Palimaka kensington AT gentoo DOT org
CommitDate: Wed Jul 22 07:06:38 2015 +
URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=26b80c7b
[kde-apps/libkdegames] Drop DEPEND on kdelibs4support
Package-Manager: portage-2.2.20
kde-apps/libkdegames/files/libkdegames-tests-optional.patch | 2 +-
kde-apps/libkdegames/libkdegames-.ebuild| 1 -
2 files changed, 1 insertion(+), 2 deletions(-)
diff --git a/kde-apps/libkdegames/files/libkdegames-tests-optional.patch
b/kde-apps/libkdegames/files/libkdegames-tests-optional.patch
index fa07df0..0b019c1 100644
--- a/kde-apps/libkdegames/files/libkdegames-tests-optional.patch
+++ b/kde-apps/libkdegames/files/libkdegames-tests-optional.patch
@@ -17,7 +17,7 @@ index 2664fd4..32f453b 100644
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)
+ Bookmarks KIO NewStuff)
+find_package(Qt5Test ${QT_MIN_VERSION} QUIET)
+set_package_properties(Qt5Test PROPERTIES
diff --git a/kde-apps/libkdegames/libkdegames-.ebuild
b/kde-apps/libkdegames/libkdegames-.ebuild
index dac2741..ef90481 100644
--- a/kde-apps/libkdegames/libkdegames-.ebuild
+++ b/kde-apps/libkdegames/libkdegames-.ebuild
@@ -24,7 +24,6 @@ DEPEND=
$(add_frameworks_dep kcrash)
$(add_frameworks_dep kdbusaddons)
$(add_frameworks_dep kdeclarative)
- $(add_frameworks_dep kdelibs4support)
$(add_frameworks_dep kdnssd)
$(add_frameworks_dep kglobalaccel)
$(add_frameworks_dep kguiaddons)
[gentoo-commits] proj/kde:master commit in: kde-apps/libkdegames/files/, kde-apps/libkdegames/
commit: d4b833d89b502806ff70d080a7d16ff3d7749533
Author: Andreas Sturmlechner andreas.sturmlechner AT gmail DOT com
AuthorDate: Sat Feb 7 17:35:53 2015 +
Commit: Johannes Huber johu AT gentoo DOT org
CommitDate: Mon Feb 9 20:37:06 2015 +
URL:http://sources.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=d4b833d8
[kde-apps/libkdegames] Optional tests: kick it like kwin
Use a more promising patch already submitted for review.
Package-Manager: portage-2.2.14
---
.../files/libkdegames-5.-buildsystem.patch | 58 --
.../files/libkdegames--tests-optional.patch| 33
kde-apps/libkdegames/libkdegames-.ebuild | 2 +-
3 files changed, 34 insertions(+), 59 deletions(-)
diff --git a/kde-apps/libkdegames/files/libkdegames-5.-buildsystem.patch
b/kde-apps/libkdegames/files/libkdegames-5.-buildsystem.patch
deleted file mode 100644
index 62a7186..000
--- a/kde-apps/libkdegames/files/libkdegames-5.-buildsystem.patch
+++ /dev/null
@@ -1,58 +0,0 @@
a/CMakeLists.txt 2015-01-18 21:48:57.436568121 +0100
-+++ b/CMakeLists.txt 2015-01-18 21:49:04.667567906 +0100
-@@ -1,5 +1,3 @@
--enable_testing()
--
- project(libkdegames)
-
- cmake_minimum_required (VERSION 2.8.12 FATAL_ERROR)
-@@ -9,7 +7,7 @@
- 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
-@@ -51,7 +49,10 @@
- add_subdirectory( highscore )
- add_subdirectory( includes )
- add_subdirectory( libkdegamesprivate )
--add_subdirectory( tests )
-+
-+if(BUILD_TESTING)
-+add_subdirectory( tests )
-+endif()
-
- include_directories(
- ${CMAKE_CURRENT_SOURCE_DIR}/highscore
a/tests/CMakeLists.txt 2015-01-18 21:34:42.477593601 +0100
-+++ b/tests/CMakeLists.txt 2015-01-18 21:39:09.461585644 +0100
-@@ -1,3 +1,5 @@
-+find_package(Qt5Test ${QT_MIN_VERSION} REQUIRED NO_MODULE)
-+
- set( EXECUTABLE_OUTPUT_PATH ${CMAKE_CURRENT_BINARY_DIR} )
- include_directories( ${CMAKE_SOURCE_DIR}/libkdegames )
-
a/libkdegamesprivate/CMakeLists.txt2015-01-18 21:49:50.737566533
+0100
-+++ b/libkdegamesprivate/CMakeLists.txt2015-01-18 21:51:18.496563917
+0100
-@@ -1,7 +1,8 @@
--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
a/libkdegamesprivate/tests/CMakeLists.txt 2015-01-18 21:49:50.737566533
+0100
-+++ b/libkdegamesprivate/tests/CMakeLists.txt 2015-01-18 21:54:04.201558979
+0100
-@@ -1,3 +1,5 @@
-+find_package(Qt5Test ${QT_MIN_VERSION} REQUIRED NO_MODULE)
-+
- set( EXECUTABLE_OUTPUT_PATH ${CMAKE_CURRENT_BINARY_DIR} )
- include_directories(${CMAKE_CURRENT_SOURCE_DIR}/..)
-
diff --git a/kde-apps/libkdegames/files/libkdegames--tests-optional.patch
b/kde-apps/libkdegames/files/libkdegames--tests-optional.patch
new file mode 100644
index 000..fa07df0
--- /dev/null
+++ b/kde-apps/libkdegames/files/libkdegames--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
[gentoo-commits] proj/kde:master commit in: kde-apps/libkdegames/files/, kde-apps/libkdegames/
commit: 44f96eb41babf00422248297fa7ac90ed4c71497
Author: Andreas Sturmlechner andreas.sturmlechner AT gmail DOT com
AuthorDate: Sun Jan 18 12:27:33 2015 +
Commit: Johannes Huber johu AT gentoo DOT org
CommitDate: Mon Jan 19 19:12:33 2015 +
URL:http://sources.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=44f96eb4
[kde-apps/libkdegames] Add KF5 version
---
.../files/libkdegames-5.-buildsystem.patch | 58 ++
kde-apps/libkdegames/libkdegames-5..ebuild | 52 +++
2 files changed, 110 insertions(+)
diff --git a/kde-apps/libkdegames/files/libkdegames-5.-buildsystem.patch
b/kde-apps/libkdegames/files/libkdegames-5.-buildsystem.patch
new file mode 100644
index 000..62a7186
--- /dev/null
+++ b/kde-apps/libkdegames/files/libkdegames-5.-buildsystem.patch
@@ -0,0 +1,58 @@
+--- a/CMakeLists.txt 2015-01-18 21:48:57.436568121 +0100
b/CMakeLists.txt 2015-01-18 21:49:04.667567906 +0100
+@@ -1,5 +1,3 @@
+-enable_testing()
+-
+ project(libkdegames)
+
+ cmake_minimum_required (VERSION 2.8.12 FATAL_ERROR)
+@@ -9,7 +7,7 @@
+ 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
+@@ -51,7 +49,10 @@
+ add_subdirectory( highscore )
+ add_subdirectory( includes )
+ add_subdirectory( libkdegamesprivate )
+-add_subdirectory( tests )
++
++if(BUILD_TESTING)
++add_subdirectory( tests )
++endif()
+
+ include_directories(
+ ${CMAKE_CURRENT_SOURCE_DIR}/highscore
+--- a/tests/CMakeLists.txt 2015-01-18 21:34:42.477593601 +0100
b/tests/CMakeLists.txt 2015-01-18 21:39:09.461585644 +0100
+@@ -1,3 +1,5 @@
++find_package(Qt5Test ${QT_MIN_VERSION} REQUIRED NO_MODULE)
++
+ set( EXECUTABLE_OUTPUT_PATH ${CMAKE_CURRENT_BINARY_DIR} )
+ include_directories( ${CMAKE_SOURCE_DIR}/libkdegames )
+
+--- a/libkdegamesprivate/CMakeLists.txt2015-01-18 21:49:50.737566533
+0100
b/libkdegamesprivate/CMakeLists.txt2015-01-18 21:51:18.496563917
+0100
+@@ -1,7 +1,8 @@
+-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
+--- a/libkdegamesprivate/tests/CMakeLists.txt 2015-01-18 21:49:50.737566533
+0100
b/libkdegamesprivate/tests/CMakeLists.txt 2015-01-18 21:54:04.201558979
+0100
+@@ -1,3 +1,5 @@
++find_package(Qt5Test ${QT_MIN_VERSION} REQUIRED NO_MODULE)
++
+ set( EXECUTABLE_OUTPUT_PATH ${CMAKE_CURRENT_BINARY_DIR} )
+ include_directories(${CMAKE_CURRENT_SOURCE_DIR}/..)
+
diff --git a/kde-apps/libkdegames/libkdegames-5..ebuild
b/kde-apps/libkdegames/libkdegames-5..ebuild
new file mode 100644
index 000..b413dcd
--- /dev/null
+++ b/kde-apps/libkdegames/libkdegames-5..ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI=5
+
+EGIT_BRANCH=frameworks
+KDE_TEST=true
+VIRTUALX_REQUIRED=test
+inherit kde5
+
+DESCRIPTION=Base library common to many KDE games
+KEYWORDS=
+IUSE=
+
+DEPEND=
+ $(add_frameworks_dep karchive)
+ $(add_frameworks_dep kbookmarks)
+ $(add_frameworks_dep kcodecs)
+ $(add_frameworks_dep kcompletion)
+ $(add_frameworks_dep kconfig)
+ $(add_frameworks_dep kconfigwidgets)
+ $(add_frameworks_dep kcoreaddons)
+ $(add_frameworks_dep kcrash)
+ $(add_frameworks_dep kdbusaddons)
+ $(add_frameworks_dep kdeclarative)
+ $(add_frameworks_dep kdelibs4support)
+ $(add_frameworks_dep kdnssd)
+ $(add_frameworks_dep kglobalaccel)
+ $(add_frameworks_dep kguiaddons)
+ $(add_frameworks_dep ki18n)
+ $(add_frameworks_dep kiconthemes)
+ $(add_frameworks_dep kio)
+ $(add_frameworks_dep kitemviews)
+ $(add_frameworks_dep kjobwidgets)
+ $(add_frameworks_dep knewstuff)
+ $(add_frameworks_dep kservice)
+ $(add_frameworks_dep ktextwidgets)
+ $(add_frameworks_dep kwidgetsaddons)
+ $(add_frameworks_dep kxmlgui)
+ dev-qt/qtdeclarative:5[widgets]
+ dev-qt/qtgui:5
+ dev-qt/qtnetwork:5
+ dev-qt/qtwidgets:5
+ dev-qt/qtsvg:5
+ media-libs/libsndfile
+ media-libs/openal
+
+
+RDEPEND=${DEPEND}
+
+PATCHES=( ${FILESDIR}/${PN}-5.-buildsystem.patch )
