| 1 |
commit: f0e4482c6d36030e7cc3146d4de54b78ba047453 |
| 2 |
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Sun Feb 17 22:54:19 2019 +0000 |
| 4 |
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sun Feb 17 22:59:28 2019 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f0e4482c |
| 7 |
|
| 8 |
media-gfx/digikam: Un-break optional Qt5 detection |
| 9 |
|
| 10 |
Package-Manager: Portage-2.3.60, Repoman-2.3.12 |
| 11 |
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org> |
| 12 |
|
| 13 |
media-gfx/digikam/digikam-6.0.0.ebuild | 2 + |
| 14 |
media-gfx/digikam/files/digikam-6.0.0-cmake.patch | 62 +++++++++++++++++++++++ |
| 15 |
2 files changed, 64 insertions(+) |
| 16 |
|
| 17 |
diff --git a/media-gfx/digikam/digikam-6.0.0.ebuild b/media-gfx/digikam/digikam-6.0.0.ebuild |
| 18 |
index 4288c82dc56..0c70439cb3f 100644 |
| 19 |
--- a/media-gfx/digikam/digikam-6.0.0.ebuild |
| 20 |
+++ b/media-gfx/digikam/digikam-6.0.0.ebuild |
| 21 |
@@ -105,6 +105,8 @@ RDEPEND="${COMMON_DEPEND} |
| 22 |
RESTRICT+=" test" |
| 23 |
# bug 366505 |
| 24 |
|
| 25 |
+PATCHES=( "${FILESDIR}/${P}-cmake.patch" ) |
| 26 |
+ |
| 27 |
pkg_pretend() { |
| 28 |
[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp |
| 29 |
kde5_pkg_pretend |
| 30 |
|
| 31 |
diff --git a/media-gfx/digikam/files/digikam-6.0.0-cmake.patch b/media-gfx/digikam/files/digikam-6.0.0-cmake.patch |
| 32 |
new file mode 100644 |
| 33 |
index 00000000000..f90067f4812 |
| 34 |
--- /dev/null |
| 35 |
+++ b/media-gfx/digikam/files/digikam-6.0.0-cmake.patch |
| 36 |
@@ -0,0 +1,62 @@ |
| 37 |
+From 0d24a8971700454533c66ab9fc63043c67d44da6 Mon Sep 17 00:00:00 2001 |
| 38 |
+From: Andreas Sturmlechner <andreas.sturmlechner@×××××.com> |
| 39 |
+Date: Sun, 17 Feb 2019 23:51:03 +0100 |
| 40 |
+Subject: [PATCH] Un-break optional Qt5 detection |
| 41 |
+ |
| 42 |
+--- |
| 43 |
+ core/CMakeLists.txt | 22 ++++++++++------------ |
| 44 |
+ 1 file changed, 10 insertions(+), 12 deletions(-) |
| 45 |
+ |
| 46 |
+diff --git a/core/CMakeLists.txt b/core/CMakeLists.txt |
| 47 |
+index 27d3819323..17c8aa0320 100644 |
| 48 |
+--- a/core/CMakeLists.txt |
| 49 |
++++ b/core/CMakeLists.txt |
| 50 |
+@@ -134,16 +134,14 @@ find_package(Qt5 ${QT_MIN_VERSION} |
| 51 |
+ ) |
| 52 |
+ |
| 53 |
+ if(ENABLE_QWEBENGINE) |
| 54 |
+- find_package(Qt5 ${QT_MIN_VERSION} NO_MODULE COMPONENTS WebEngineWidgets) |
| 55 |
++ find_package(Qt5WebEngineWidgets ${QT_MIN_VERSION} NO_MODULE) |
| 56 |
+ else() |
| 57 |
+- find_package(Qt5 ${QT_MIN_VERSION} NO_MODULE COMPONENTS WebKitWidgets) |
| 58 |
++ find_package(Qt5WebKitWidgets ${QT_MIN_VERSION} NO_MODULE) |
| 59 |
+ endif() |
| 60 |
+ |
| 61 |
+-find_package(Qt5 ${QT_MIN_VERSION} |
| 62 |
+- OPTIONAL_COMPONENTS |
| 63 |
+- DBus |
| 64 |
+- OpenGL |
| 65 |
+-) |
| 66 |
++find_package(Qt5DBus ${QT_MIN_VERSION}) |
| 67 |
++ |
| 68 |
++find_package(Qt5OpenGL ${QT_MIN_VERSION}) |
| 69 |
+ |
| 70 |
+ if(ENABLE_DBUS) |
| 71 |
+ if(NOT Qt5DBus_FOUND) |
| 72 |
+@@ -154,10 +152,10 @@ endif() |
| 73 |
+ # Dependencies For unit tests and CLI test tools |
| 74 |
+ |
| 75 |
+ if(BUILD_TESTING) |
| 76 |
+- find_package(Qt5 ${QT_MIN_VERSION} NO_MODULE COMPONENTS |
| 77 |
+- Test |
| 78 |
+- Qml WebView # Optional, for 'sialis' O2 library test tool. |
| 79 |
+- ) |
| 80 |
++ find_package(Qt5Test ${QT_MIN_VERSION} NO_MODULE) |
| 81 |
++ # Optional, for 'sialis' O2 library test tool. |
| 82 |
++ find_package(Qt5Qml ${QT_MIN_VERSION} NO_MODULE) |
| 83 |
++ find_package(Qt5WebView ${QT_MIN_VERSION} NO_MODULE) |
| 84 |
+ endif() |
| 85 |
+ |
| 86 |
+ find_package(KF5 ${KF5_MIN_VERSION} |
| 87 |
+@@ -323,7 +321,7 @@ find_package(OpenGL) # For Presentation tool. |
| 88 |
+ find_package(X11) |
| 89 |
+ |
| 90 |
+ if(X11_FOUND) |
| 91 |
+- find_package(Qt5 ${QT_MIN_VERSION} NO_MODULE COMPONENTS X11Extras) |
| 92 |
++ find_package(Qt5X11Extras ${QT_MIN_VERSION} NO_MODULE) |
| 93 |
+ set(HAVE_X11 TRUE) |
| 94 |
+ else() |
| 95 |
+ set(HAVE_X11 FALSE) |
| 96 |
+-- |
| 97 |
+2.20.1 |
| 98 |
+ |
Archives