| 1 |
commit: bb441bed71aa28609df327c17fa17ab22c4864bf |
| 2 |
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Tue Oct 1 18:40:11 2019 +0000 |
| 4 |
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Tue Oct 1 23:41:44 2019 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bb441bed |
| 7 |
|
| 8 |
mail-client/kube: Properly eliminate dev-qt/qttest:5 in cmake |
| 9 |
|
| 10 |
Package-Manager: Portage-2.3.76, Repoman-2.3.17 |
| 11 |
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org> |
| 12 |
|
| 13 |
mail-client/kube/files/kube-0.7.0-tests-optional.patch | 4 +--- |
| 14 |
mail-client/kube/kube-0.7.0-r1.ebuild | 10 ++++++---- |
| 15 |
2 files changed, 7 insertions(+), 7 deletions(-) |
| 16 |
|
| 17 |
diff --git a/mail-client/kube/files/kube-0.7.0-tests-optional.patch b/mail-client/kube/files/kube-0.7.0-tests-optional.patch |
| 18 |
index efdf09c775b..0756cfb0cad 100644 |
| 19 |
--- a/mail-client/kube/files/kube-0.7.0-tests-optional.patch |
| 20 |
+++ b/mail-client/kube/files/kube-0.7.0-tests-optional.patch |
| 21 |
@@ -40,14 +40,12 @@ |
| 22 |
feature_summary(WHAT ALL FATAL_ON_MISSING_REQUIRED_PACKAGES) |
| 23 |
--- a/framework/src/domain/mime/mimetreeparser/CMakeLists.txt 2019-09-29 21:36:28.455107143 +0200 |
| 24 |
+++ b/framework/src/domain/mime/mimetreeparser/CMakeLists.txt 2019-09-29 21:36:28.458107171 +0200 |
| 25 |
-@@ -49,5 +49,9 @@ |
| 26 |
+@@ -49,5 +49,7 @@ |
| 27 |
Gpgme::Gpgme |
| 28 |
) |
| 29 |
|
| 30 |
+if(BUILD_TESTING) |
| 31 |
add_subdirectory(autotests) |
| 32 |
-+endif() |
| 33 |
-+if(BUILD_TESTING) |
| 34 |
add_subdirectory(tests) |
| 35 |
+endif() |
| 36 |
--- a/components/CMakeLists.txt 2019-09-29 21:36:28.463107218 +0200 |
| 37 |
|
| 38 |
diff --git a/mail-client/kube/kube-0.7.0-r1.ebuild b/mail-client/kube/kube-0.7.0-r1.ebuild |
| 39 |
index d1dc9b2e959..110722ceb00 100644 |
| 40 |
--- a/mail-client/kube/kube-0.7.0-r1.ebuild |
| 41 |
+++ b/mail-client/kube/kube-0.7.0-r1.ebuild |
| 42 |
@@ -25,7 +25,6 @@ RDEPEND=" |
| 43 |
dev-qt/qtnetwork:5 |
| 44 |
dev-qt/qtquickcontrols:5 |
| 45 |
dev-qt/qtquickcontrols2:5 |
| 46 |
- dev-qt/qttest:5 |
| 47 |
dev-qt/qtwebengine:5[widgets] |
| 48 |
dev-qt/qtwidgets:5 |
| 49 |
kde-apps/kmime:5 |
| 50 |
@@ -52,9 +51,12 @@ src_prepare() { |
| 51 |
cmake-utils_src_prepare |
| 52 |
|
| 53 |
if ! use test; then |
| 54 |
- sed \ |
| 55 |
- -e "/Qt5::Test/s/^/#DISABLED/" \ |
| 56 |
- -e "/set(BUILD_TESTING ON)/s/^/#DISABLED /" \ |
| 57 |
+ sed -e "/find_package.*Qt5/s/ Test//" \ |
| 58 |
+ -i {,components/}CMakeLists.txt CMakeLists.txt \ |
| 59 |
+ {extensions/api,framework}/src/CMakeLists.txt || die |
| 60 |
+ sed -e "/Qt5::Test/s/^/#DISABLED/" \ |
| 61 |
+ -i {extensions/api,framework}/src/CMakeLists.txt || die |
| 62 |
+ sed -e "/set(BUILD_TESTING ON)/s/^/#DISABLED /" \ |
| 63 |
-e "/domain\/modeltest.cpp/s/^/#DISABLED /" \ |
| 64 |
-i framework/src/CMakeLists.txt || die |
| 65 |
fi |
Archives