diff options
| author | V3n3RiX <venerix@redcorelinux.org> | 2020-06-21 17:50:24 +0100 |
|---|---|---|
| committer | V3n3RiX <venerix@redcorelinux.org> | 2020-06-21 17:50:24 +0100 |
| commit | feb0daf81d888e9160f9f94502de09b66f2a63fd (patch) | |
| tree | b6e5c40ce2abef3da27ed50a023153f475e0ddef /kde-apps/libkdegames | |
| parent | 9452a6e87b6c2c70513bc47a2470bf9f1168920e (diff) | |
gentoo resync : 21.06.2020
Diffstat (limited to 'kde-apps/libkdegames')
| -rw-r--r-- | kde-apps/libkdegames/Manifest | 5 | ||||
| -rw-r--r-- | kde-apps/libkdegames/files/libkdegames-20.04.2-optional-tests.patch | 28 | ||||
| -rw-r--r-- | kde-apps/libkdegames/libkdegames-20.04.2.ebuild (renamed from kde-apps/libkdegames/libkdegames-20.04.1.ebuild) | 6 |
3 files changed, 35 insertions, 4 deletions
diff --git a/kde-apps/libkdegames/Manifest b/kde-apps/libkdegames/Manifest index c0bef2931b05..f051689251f4 100644 --- a/kde-apps/libkdegames/Manifest +++ b/kde-apps/libkdegames/Manifest @@ -1,5 +1,6 @@ +AUX libkdegames-20.04.2-optional-tests.patch 838 BLAKE2B 7eac9c9a2a6c316ee8573205a1a9cdf72806b3ed1b35512c4aa8b817e9dac47745afa72b0858906b8923d0f0607c532256c4151d263685c4cfc132afc089084b SHA512 bafbbb49184023e1e4adb7aa2b754b8d240a11f5ecb1f022b292b628dcca8db39f132c83ede52ab5956a10be06d1b3a01c0e17a3bbe78621701c3db49ba066e5 DIST libkdegames-19.12.3.tar.xz 6375220 BLAKE2B 1e70ad751871223351c33072a571d4b6376acc115c7544cb667f3277314e6b3c6e567a5422c172639b2fe956b1d1ab3142ad55b0851adfcb085e784639292b9a SHA512 4ef533dd126e5fe43c96749cc08ff7faee761d9f00876be5639416b02c52b7304c37dbbf31aa1cd42c737d7f2b2dcfd5d3b800c54b267e4c59ce1e08d033dd3b -DIST libkdegames-20.04.1.tar.xz 6378952 BLAKE2B 74dcbdb5b955b24651ce41b65f81a5799272b6c3ecdb55cb1c80dde966e1defad3f2970c47ec7a99a4e5079b8b72b6025eb5efca35e9b97f0827904074f92d8b SHA512 e05828b98be4d4c3f1202da203cbe95d1f8e7ca881aeca2e726e0fc8427eae1b39388c75c10487070faaace94cec0526195c19f45a2a2bd104eef1ce8b53ce7f +DIST libkdegames-20.04.2.tar.xz 6386556 BLAKE2B 99274e3c09fcded2311459a3eca4186e71bc8147e73005c6ab6f0bfc4760a5040862b55cb058cbcbc88d944ae07091e541e67cf0e9db8b6b2662ec42071c76d0 SHA512 15e6145dbdbc98a33e1527616ee9c2cc45e090ad5e382be62941de851d3d2621ffc696f38bf7ada0cd214fdf4c74615f4f4760adac677587b7308cbf6c20fb81 EBUILD libkdegames-19.12.3.ebuild 1480 BLAKE2B 61fb3bba8c0271d9e32166ae88479bdf2ad94dfc0d3c4e0c7bf8c29ca4acc84df8b2c4307dddee874995c0c412ae8d70f02246beb423f423fcba9a640d231862 SHA512 b35549d714ef311607bebfeaa5348e1c4e178b16c6277faad6aa746bb53be4f942c08257df2394664be70342aad26c73645f12c9d81c271de8a4f44926b83cfc -EBUILD libkdegames-20.04.1.ebuild 1483 BLAKE2B 42aa2ae4a12850c59918b599187703ddf05571a75be1963f9a681c34e5dbb4e8a453b13f8355ff77d760c54eebfebd993ddfc6a7f3f316951503ace74e19a78c SHA512 685e60eceeda195e8eb622fc6fc1e48917eafa0d5222acd6639df7fcb396c7fa11f468498b4784df671e6202d4a5b0418b5a3dbc464741ad975d6bd4ccc4c90f +EBUILD libkdegames-20.04.2.ebuild 1526 BLAKE2B a60837030ddabfea5d798717a500a18c839187dc69e5c212cbe59df5ce541a887683598aa1417241700711e64e5c61c6616a9317f1daa95192f8963fe1504ee7 SHA512 87ea5d4c2b30c73e58734e94a68cc9490f1f8731e590639aef41713503e26321d22de698ffd610d0598548bc0c5b4e01ddad411c74676a0a77f1a2daba6762c3 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3 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 000000000000..e7ffd23ade60 --- /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.1.ebuild b/kde-apps/libkdegames/libkdegames-20.04.2.ebuild index f0149cc2ba9d..fd783d7f2048 100644 --- a/kde-apps/libkdegames/libkdegames-20.04.1.ebuild +++ b/kde-apps/libkdegames/libkdegames-20.04.2.ebuild @@ -3,9 +3,9 @@ EAPI=7 -ECM_TEST="forceoptional-recursive" +ECM_TEST="forceoptional" KFMIN=5.70.0 -QTMIN=5.12.3 +QTMIN=5.14.1 VIRTUALX_REQUIRED="test" inherit ecm kde.org @@ -49,3 +49,5 @@ DEPEND=" media-libs/openal " RDEPEND="${DEPEND}" + +PATCHES=( "${FILESDIR}/${P}-optional-tests.patch" ) |