diff options
Diffstat (limited to 'media-gfx/digikam/files/digikam-6.3.0-cmake.patch')
-rw-r--r-- | media-gfx/digikam/files/digikam-6.3.0-cmake.patch | 66 |
1 files changed, 66 insertions, 0 deletions
diff --git a/media-gfx/digikam/files/digikam-6.3.0-cmake.patch b/media-gfx/digikam/files/digikam-6.3.0-cmake.patch new file mode 100644 index 000000000000..f14f406d88d5 --- /dev/null +++ b/media-gfx/digikam/files/digikam-6.3.0-cmake.patch @@ -0,0 +1,66 @@ +From beb8eb984aac519ed5dfd13615f430ec14e73f16 Mon Sep 17 00:00:00 2001 +From: Andreas Sturmlechner <andreas.sturmlechner@gmail.com> +Date: Sun, 17 Feb 2019 23:51:03 +0100 +Subject: [PATCH] Un-break optional Qt5 detection + +--- + core/CMakeLists.txt | 26 ++++++++++---------------- + 1 file changed, 10 insertions(+), 16 deletions(-) + +diff --git a/core/CMakeLists.txt b/core/CMakeLists.txt +index 633760d194..736826d234 100644 +--- a/core/CMakeLists.txt ++++ b/core/CMakeLists.txt +@@ -136,16 +136,14 @@ find_package(Qt5 ${QT_MIN_VERSION} REQUIRED + ) + + if(ENABLE_QWEBENGINE) +- find_package(Qt5 ${QT_MIN_VERSION} NO_MODULE COMPONENTS WebEngineWidgets) ++ find_package(Qt5WebEngineWidgets ${QT_MIN_VERSION} NO_MODULE) + else() +- find_package(Qt5 ${QT_MIN_VERSION} NO_MODULE COMPONENTS WebKitWidgets) ++ find_package(Qt5WebKitWidgets ${QT_MIN_VERSION} NO_MODULE) + endif() + +-find_package(Qt5 ${QT_MIN_VERSION} +- OPTIONAL_COMPONENTS +- DBus +- OpenGL +-) ++find_package(Qt5DBus ${QT_MIN_VERSION}) ++ ++find_package(Qt5OpenGL ${QT_MIN_VERSION}) + + if(ENABLE_DBUS) + if(NOT Qt5DBus_FOUND) +@@ -156,14 +154,10 @@ endif() + # Dependencies For unit tests and CLI test tools + + if(BUILD_TESTING) +- find_package(Qt5 ${QT_MIN_VERSION} REQUIRED +- NO_MODULE COMPONENTS +- Test +- ) +- find_package(Qt5 ${QT_MIN_VERSION} +- OPTIONAL_COMPONENTS +- Qml WebView # Optional, for 'sialis' O2 library test tool. +- ) ++ find_package(Qt5Test ${QT_MIN_VERSION} NO_MODULE) ++ # Optional, for 'sialis' O2 library test tool. ++ find_package(Qt5Qml ${QT_MIN_VERSION} NO_MODULE) ++ find_package(Qt5WebView ${QT_MIN_VERSION} NO_MODULE) + endif() + + find_package(KF5 ${KF5_MIN_VERSION} REQUIRED +@@ -335,7 +329,7 @@ endif() + find_package(X11) + + if(X11_FOUND) +- find_package(Qt5 ${QT_MIN_VERSION} NO_MODULE COMPONENTS X11Extras) ++ find_package(Qt5X11Extras ${QT_MIN_VERSION} NO_MODULE) + set(HAVE_X11 TRUE) + else() + set(HAVE_X11 FALSE) +-- +2.23.0 + |