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 <[email protected]> +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" )
