diff options
| -rw-r--r-- | media-gfx/digikam/digikam-9999.ebuild | 13 | ||||
| -rw-r--r-- | media-gfx/digikam/files/digikam-7.3.0-cmake.patch | 118 |
2 files changed, 125 insertions, 6 deletions
diff --git a/media-gfx/digikam/digikam-9999.ebuild b/media-gfx/digikam/digikam-9999.ebuild index 9be42602ea5..ec7d91762b0 100644 --- a/media-gfx/digikam/digikam-9999.ebuild +++ b/media-gfx/digikam/digikam-9999.ebuild @@ -3,20 +3,19 @@ EAPI=8 -KFMIN=5.82.0 +KFMIN=5.88.0 QTMIN=5.15.2 inherit ecm kde.org toolchain-funcs if [[ ${KDE_BUILD_TYPE} != live ]]; then - MY_P=${PN}-${PV/_/-} if [[ ${PV} =~ beta[0-9]$ ]]; then SRC_URI="mirror://kde/unstable/${PN}/" else SRC_URI="mirror://kde/stable/${PN}/${PV}/" fi - SRC_URI+="${MY_P}.tar.xz" + SRC_URI+="digiKam-${PV/_/-}.tar.xz" KEYWORDS="~amd64 ~x86" - S="${WORKDIR}/${MY_P}" + S="${WORKDIR}/${PN}-${PV/_/-}" fi DESCRIPTION="Digital photo management application" @@ -54,7 +53,7 @@ COMMON_DEPEND=" >=kde-frameworks/kwindowsystem-${KFMIN}:5 >=kde-frameworks/kxmlgui-${KFMIN}:5 >=kde-frameworks/solid-${KFMIN}:5 - >=media-gfx/exiv2-0.27:= + >=media-gfx/exiv2-0.27:=[xmp] media-libs/lcms:2 media-libs/liblqr media-libs/libpng:0= @@ -107,6 +106,8 @@ BDEPEND=" ) " +PATCHES=( "${FILESDIR}/${PN}-7.3.0-cmake.patch" ) + pkg_pretend() { [[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp ecm_pkg_pretend @@ -138,7 +139,7 @@ src_configure() { $(cmake_use_find_package opengl OpenGL) $(cmake_use_find_package panorama KF5ThreadWeaver) $(cmake_use_find_package scanner KF5Sane) - $(cmake_use_find_package semantic-desktop KF5FileMetaData) + -DENABLE_KFILEMETADATASUPPORT=$(usex semantic-desktop) $(cmake_use_find_package X X11) ) diff --git a/media-gfx/digikam/files/digikam-7.3.0-cmake.patch b/media-gfx/digikam/files/digikam-7.3.0-cmake.patch new file mode 100644 index 00000000000..2b580f92a1c --- /dev/null +++ b/media-gfx/digikam/files/digikam-7.3.0-cmake.patch @@ -0,0 +1,118 @@ +From 370308fb8381b55e7ebfcdd77f1361b49a288f88 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/KF5 detection + +--- + core/CMakeLists.txt | 58 ++++++++++++++++----------------------------- + 1 file changed, 20 insertions(+), 38 deletions(-) + +diff --git a/core/CMakeLists.txt b/core/CMakeLists.txt +index 16bba83335..b8cdc59baa 100644 +--- a/core/CMakeLists.txt ++++ b/core/CMakeLists.txt +@@ -65,17 +65,14 @@ find_package(Qt5 ${QT_MIN_VERSION} REQUIRED + ) + + if(ENABLE_QWEBENGINE) +- find_package(Qt5 ${QT_MIN_VERSION} REQUIRED NO_MODULE COMPONENTS WebEngineWidgets) ++ find_package(Qt5WebEngineWidgets ${QT_MIN_VERSION} REQUIRED NO_MODULE) + else() +- find_package(Qt5 ${QT_MIN_VERSION} REQUIRED NO_MODULE COMPONENTS WebKitWidgets) ++ find_package(Qt5WebKitWidgets ${QT_MIN_VERSION} REQUIRED NO_MODULE) + endif() + +-find_package(Qt5 ${QT_MIN_VERSION} +- OPTIONAL_COMPONENTS +- DBus +- OpenGL +- XmlPatterns # For Rajce plugin +-) ++find_package(Qt5DBus ${QT_MIN_VERSION}) ++find_package(Qt5OpenGL ${QT_MIN_VERSION}) ++find_package(Qt5XmlPatterns ${QT_MIN_VERSION}) # For Rajce plugin + + if(ENABLE_DBUS) + if(NOT Qt5DBus_FOUND) +@@ -86,16 +83,11 @@ 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} +- QUIET +- 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} QUIET NO_MODULE) ++ find_package(Qt5WebView ${QT_MIN_VERSION} QUIET NO_MODULE) + endif() + + find_package(KF5 ${KF5_MIN_VERSION} REQUIRED +@@ -113,38 +105,28 @@ find_package(KF5 ${KF5_MIN_VERSION} QUIET + OPTIONAL_COMPONENTS + KIO # For Desktop integration (Widgets only). + IconThemes # For Desktop integration. +- FileMetaData # For KDE file indexer support. + ThreadWeaver # For Panorama tool. + NotifyConfig # KDE desktop application notify configuration. + Notifications # KDE desktop notifications integration. + ) + +-find_package(KF5 ${AKONADI_MIN_VERSION} QUIET +- OPTIONAL_COMPONENTS +- AkonadiContact # For KDE Mail Contacts support. +- Contacts # API for contacts/address book data. +-) ++find_package(KF5Sane ${KSANE_MIN_VERSION} QUIET) # For digital scanner support. + +-find_package(KF5 ${KSANE_MIN_VERSION} QUIET +- OPTIONAL_COMPONENTS +- Sane # For digital scanner support. +-) +- +-find_package(KF5 ${CALENDAR_MIN_VERSION} QUIET +- OPTIONAL_COMPONENTS +- CalendarCore # For Calendar tool. +-) ++find_package(KF5CalendarCore ${CALENDAR_MIN_VERSION} QUIET) # For Calendar tool. + + if ("${KF5CalendarCore_VERSION}" VERSION_GREATER 5.6.40) + set(HAVE_KCALENDAR_QDATETIME TRUE) + endif() + +-if(ENABLE_AKONADICONTACTSUPPORT AND (NOT KF5AkonadiContact_FOUND OR NOT KF5Contacts_FOUND)) +- set(ENABLE_AKONADICONTACTSUPPORT OFF) ++if(ENABLE_AKONADICONTACTSUPPORT) ++ find_package(KF5 ${AKONADI_MIN_VERSION} REQUIRED ++ AkonadiContact # For KDE Mail Contacts support. ++ Contacts # API for contacts/address book data. ++ ) + endif() + +-if(ENABLE_KFILEMETADATASUPPORT AND NOT KF5FileMetaData_FOUND) +- set(ENABLE_KFILEMETADATASUPPORT OFF) ++if(ENABLE_KFILEMETADATASUPPORT) ++ find_package(KF5FileMetaData ${KF5_MIN_VERSION} REQUIRED) # For KDE file indexer support. + endif() + + # Check if KIO have been compiled with KIOWidgets. digiKam only needs this one. +@@ -275,7 +257,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.34.1 + |