| 1 |
commit: e0b122677c959ea9ecb1c99ca85a85a817a0c689 |
| 2 |
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Tue Jun 26 16:13:04 2018 +0000 |
| 4 |
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Wed Jun 27 19:00:21 2018 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e0b12267 |
| 7 |
|
| 8 |
x11-themes/qtcurve: Drop 2/3 unused cmake variables |
| 9 |
|
| 10 |
Already upstreamed patch enables kde5.eclass to handle the option. |
| 11 |
|
| 12 |
Bug: https://bugs.gentoo.org/659190 |
| 13 |
Package-Manager: Portage-2.3.40, Repoman-2.3.9 |
| 14 |
|
| 15 |
.../files/qtcurve-1.9.0-build_testing.patch | 44 ++++++++++++++++++++++ |
| 16 |
x11-themes/qtcurve/qtcurve-1.9.0_rc1-r2.ebuild | 2 +- |
| 17 |
x11-themes/qtcurve/qtcurve-9999.ebuild | 1 - |
| 18 |
3 files changed, 45 insertions(+), 2 deletions(-) |
| 19 |
|
| 20 |
diff --git a/x11-themes/qtcurve/files/qtcurve-1.9.0-build_testing.patch b/x11-themes/qtcurve/files/qtcurve-1.9.0-build_testing.patch |
| 21 |
new file mode 100644 |
| 22 |
index 00000000000..16f7198aba8 |
| 23 |
--- /dev/null |
| 24 |
+++ b/x11-themes/qtcurve/files/qtcurve-1.9.0-build_testing.patch |
| 25 |
@@ -0,0 +1,44 @@ |
| 26 |
+From 237912b291dcc706fcc1d9b02a8398385d19f38f Mon Sep 17 00:00:00 2001 |
| 27 |
+From: Andreas Sturmlechner <asturm@g.o> |
| 28 |
+Date: Tue, 26 Jun 2018 18:03:06 +0200 |
| 29 |
+Subject: [PATCH] Switch from ENABLE_TEST to the ECM/CMake standard |
| 30 |
+ BUILD_TESTING |
| 31 |
+ |
| 32 |
+Summary: |
| 33 |
+BUILD_TESTING is used throughout KDE projects as provided by |
| 34 |
+CTest and/or KDECMakeSettings. |
| 35 |
+ |
| 36 |
+Reviewers: yuyichao |
| 37 |
+ |
| 38 |
+Reviewed By: yuyichao |
| 39 |
+ |
| 40 |
+Differential Revision: https://phabricator.kde.org/D13741 |
| 41 |
+--- |
| 42 |
+ CMakeLists.txt | 4 ++-- |
| 43 |
+ 1 file changed, 2 insertions(+), 2 deletions(-) |
| 44 |
+ |
| 45 |
+diff --git a/CMakeLists.txt b/CMakeLists.txt |
| 46 |
+index 70e21b3a..15f6b177 100644 |
| 47 |
+--- a/CMakeLists.txt |
| 48 |
++++ b/CMakeLists.txt |
| 49 |
+@@ -52,7 +52,7 @@ qtc_option(ENABLE_QT4 "Building Qt4 theme." On) |
| 50 |
+ qtc_option(ENABLE_QT5 "Building Qt5 theme." On) |
| 51 |
+ qtc_option(ENABLE_GTK2 "Building Gtk2 theme." On) |
| 52 |
+ # option(ENABLE_GTK3 "Building Gtk3 theme." On) |
| 53 |
+-option(ENABLE_TEST "Enable testing." On) |
| 54 |
++option(BUILD_TESTING "Enable testing." On) |
| 55 |
+ option(QTC_ENABLE_X11 "Enable X11" On) |
| 56 |
+ option(QTC_INSTALL_PO "Install translation files." On) |
| 57 |
+ |
| 58 |
+@@ -247,7 +247,7 @@ if(ENABLE_GTK2) |
| 59 |
+ add_subdirectory(gtk2) |
| 60 |
+ endif() |
| 61 |
+ add_subdirectory(tools) |
| 62 |
+-if(ENABLE_TEST) |
| 63 |
++if(BUILD_TESTING) |
| 64 |
+ enable_testing() |
| 65 |
+ add_subdirectory(test) |
| 66 |
+ endif() |
| 67 |
+-- |
| 68 |
+2.18.0 |
| 69 |
+ |
| 70 |
|
| 71 |
diff --git a/x11-themes/qtcurve/qtcurve-1.9.0_rc1-r2.ebuild b/x11-themes/qtcurve/qtcurve-1.9.0_rc1-r2.ebuild |
| 72 |
index ae1d8dc5cf1..e795ba2ee0f 100644 |
| 73 |
--- a/x11-themes/qtcurve/qtcurve-1.9.0_rc1-r2.ebuild |
| 74 |
+++ b/x11-themes/qtcurve/qtcurve-1.9.0_rc1-r2.ebuild |
| 75 |
@@ -67,6 +67,7 @@ DOCS=( AUTHORS ChangeLog.md README.md TODO.md ) |
| 76 |
|
| 77 |
PATCHES=( |
| 78 |
"${FILESDIR}/${PN}-1.9.0-rare_crash_hang_fix.patch" |
| 79 |
+ "${FILESDIR}/${PN}-1.9.0-build_testing.patch" |
| 80 |
) |
| 81 |
|
| 82 |
src_configure() { |
| 83 |
@@ -77,7 +78,6 @@ src_configure() { |
| 84 |
-DQTC_KDE4_DEFAULT_HOME=ON |
| 85 |
-DENABLE_GTK2="$(usex gtk)" |
| 86 |
-DENABLE_QT5="$(usex qt5)" |
| 87 |
- -DENABLE_TEST="$(usex test)" |
| 88 |
-DQTC_ENABLE_X11="$(usex X)" |
| 89 |
-DQTC_INSTALL_PO="$(usex nls)" |
| 90 |
-DQTC_QT5_ENABLE_KDE="$(usex plasma)" |
| 91 |
|
| 92 |
diff --git a/x11-themes/qtcurve/qtcurve-9999.ebuild b/x11-themes/qtcurve/qtcurve-9999.ebuild |
| 93 |
index ca3205965a3..d5f28086e7c 100644 |
| 94 |
--- a/x11-themes/qtcurve/qtcurve-9999.ebuild |
| 95 |
+++ b/x11-themes/qtcurve/qtcurve-9999.ebuild |
| 96 |
@@ -77,7 +77,6 @@ src_configure() { |
| 97 |
-DQTC_KDE4_DEFAULT_HOME=ON |
| 98 |
-DENABLE_GTK2="$(usex gtk)" |
| 99 |
-DENABLE_QT5="$(usex qt5)" |
| 100 |
- -DENABLE_TEST="$(usex test)" |
| 101 |
-DQTC_ENABLE_X11="$(usex X)" |
| 102 |
-DQTC_INSTALL_PO="$(usex nls)" |
| 103 |
-DQTC_QT5_ENABLE_KDE="$(usex plasma)" |
Archives