diff options
Diffstat (limited to 'media-gfx/digikam')
| -rw-r--r-- | media-gfx/digikam/digikam-9999.ebuild | 14 | ||||
| -rw-r--r-- | media-gfx/digikam/files/digikam-7.8.0-cmake.patch | 119 | ||||
| -rw-r--r-- | media-gfx/digikam/files/digikam-8.1.0-cmake.patch | 179 |
3 files changed, 189 insertions, 123 deletions
diff --git a/media-gfx/digikam/digikam-9999.ebuild b/media-gfx/digikam/digikam-9999.ebuild index 01b3292151..ade4353af7 100644 --- a/media-gfx/digikam/digikam-9999.ebuild +++ b/media-gfx/digikam/digikam-9999.ebuild @@ -23,7 +23,7 @@ HOMEPAGE="https://www.digikam.org/" LICENSE="GPL-2" SLOT="5" -IUSE="addressbook calendar gphoto2 heif +imagemagick +lensfun marble mysql opengl openmp +panorama scanner semantic-desktop X" +IUSE="addressbook calendar gphoto2 heif +imagemagick +lensfun marble mysql opengl openmp +panorama scanner semantic-desktop spell X" # bug 366505 RESTRICT="test" @@ -34,6 +34,7 @@ COMMON_DEPEND=" >=dev-qt/qtdbus-${QTMIN}:5 >=dev-qt/qtgui-${QTMIN}:5[-gles2-only] >=dev-qt/qtnetwork-${QTMIN}:5 + >=dev-qt/qtnetworkauth-${QTMIN}:5 >=dev-qt/qtprintsupport-${QTMIN}:5 >=dev-qt/qtsql-${QTMIN}:5[mysql?] >=dev-qt/qtwebengine-${QTMIN}:5[widgets] @@ -53,7 +54,7 @@ COMMON_DEPEND=" >=kde-frameworks/kwindowsystem-${KFMIN}:5 >=kde-frameworks/kxmlgui-${KFMIN}:5 >=kde-frameworks/solid-${KFMIN}:5 - >=media-gfx/exiv2-0.27:=[xmp] + >=media-gfx/exiv2-0.27.1:=[xmp] media-libs/lcms:2 media-libs/libjpeg-turbo:= media-libs/liblqr @@ -84,6 +85,7 @@ COMMON_DEPEND=" panorama? ( >=kde-frameworks/threadweaver-${KFMIN}:5 ) scanner? ( >=kde-apps/libksane-19.04.3:5 ) semantic-desktop? ( >=kde-frameworks/kfilemetadata-${KFMIN}:5 ) + spell? ( >=kde-frameworks/sonnet-${KFMIN}:5 ) X? ( >=dev-qt/qtx11extras-${QTMIN}:5 x11-libs/libX11 @@ -92,6 +94,7 @@ COMMON_DEPEND=" DEPEND="${COMMON_DEPEND} dev-cpp/eigen:3 dev-libs/boost + addressbook? ( >=kde-apps/akonadi-19.04.3:5 ) " RDEPEND="${COMMON_DEPEND} mysql? ( virtual/mysql[server(+)] ) @@ -105,7 +108,7 @@ BDEPEND=" ) " -PATCHES=( "${FILESDIR}/${PN}-7.8.0-cmake.patch" ) +PATCHES=( "${FILESDIR}/${PN}-8.1.0-cmake.patch" ) pkg_pretend() { [[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp @@ -120,10 +123,12 @@ pkg_setup() { # FIXME: Unbundle libraw (libs/rawengine/libraw) src_configure() { local mycmakeargs=( + -DBUILD_WITH_QT6=OFF # KF6 not stable upstream yet -DBUILD_TESTING=OFF # bug 698192 -DENABLE_APPSTYLES=ON -DCMAKE_DISABLE_FIND_PACKAGE_Jasper=ON - -DENABLE_MEDIAPLAYER=OFF # bug 758641, last-rited + -DENABLE_MEDIAPLAYER=OFF # bug 758641; bundled as of 8.0, KDE-bug 448681 + -DENABLE_SHOWFOTO=ON # built unconditionally so far, new option since 8.0 -DENABLE_QWEBENGINE=ON -DENABLE_AKONADICONTACTSUPPORT=$(usex addressbook) $(cmake_use_find_package calendar KF5CalendarCore) @@ -137,6 +142,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 spell KF5Sonnet) -DENABLE_KFILEMETADATASUPPORT=$(usex semantic-desktop) $(cmake_use_find_package X X11) ) diff --git a/media-gfx/digikam/files/digikam-7.8.0-cmake.patch b/media-gfx/digikam/files/digikam-7.8.0-cmake.patch deleted file mode 100644 index d698626e8c..0000000000 --- a/media-gfx/digikam/files/digikam-7.8.0-cmake.patch +++ /dev/null @@ -1,119 +0,0 @@ -From 618e3f3ba195a3b50812d1184ebf90555d659055 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 - -And if we enable an option, make the necessary libraries REQUIRED. ---- - core/CMakeLists.txt | 50 +++++++++++++-------------------------------- - 1 file changed, 14 insertions(+), 36 deletions(-) - -diff --git a/core/CMakeLists.txt b/core/CMakeLists.txt -index de599ee881..8aef35e062 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(Qt5Test ${QT_MIN_VERSION} NO_MODULE) - -- find_package(Qt5 ${QT_MIN_VERSION} -- QUIET -- OPTIONAL_COMPONENTS -- Qml WebView # Optional, for 'sialis' O2 library test tool. -- ) -+ # 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 -@@ -121,7 +113,7 @@ find_package(KF5 ${KF5_MIN_VERSION} QUIET - if(ENABLE_KFILEMETADATASUPPORT) - - find_package(KF5 ${KF5_MIN_VERSION} -- QUIET -+ REQUIRED - OPTIONAL_COMPONENTS - FileMetaData # For Plasma destop file indexer support. - ) -@@ -130,7 +122,7 @@ endif() - - if(ENABLE_AKONADICONTACTSUPPORT) - -- find_package(KF5 ${AKONADI_MIN_VERSION} QUIET -+ find_package(KF5 ${AKONADI_MIN_VERSION} REQUIRED - OPTIONAL_COMPONENTS - AkonadiContact # For KDE Mail Contacts support. - Contacts # API for contacts/address book data. -@@ -138,28 +130,14 @@ if(ENABLE_AKONADICONTACTSUPPORT) - - endif() - --find_package(KF5 ${KSANE_MIN_VERSION} QUIET -- OPTIONAL_COMPONENTS -- Sane # For digital scanner support. --) -+find_package(KF5Sane ${KSANE_MIN_VERSION} QUIET) # 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) --endif() -- --if(ENABLE_KFILEMETADATASUPPORT AND NOT KF5FileMetaData_FOUND) -- set(ENABLE_KFILEMETADATASUPPORT OFF) --endif() -- - # Check if KIO have been compiled with KIOWidgets. digiKam only needs this one. - if(KF5KIO_FOUND) - get_target_property(KIOWidgets_INCLUDE_DIRS KF5::KIOWidgets -@@ -296,7 +274,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.37.3 - diff --git a/media-gfx/digikam/files/digikam-8.1.0-cmake.patch b/media-gfx/digikam/files/digikam-8.1.0-cmake.patch new file mode 100644 index 0000000000..16c1ffa5c3 --- /dev/null +++ b/media-gfx/digikam/files/digikam-8.1.0-cmake.patch @@ -0,0 +1,179 @@ +From 05b6e81bd4ceca8d6166aa0a000919cde2bfde3e 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 Qt/KF5 detection + +And if we enable an option, make the necessary libraries REQUIRED. +--- + core/cmake/rules/RulesKDEFramework.cmake | 34 +++----------- + core/cmake/rules/RulesQtFramework.cmake | 58 +++++------------------- + core/cmake/rules/RulesX11.cmake | 7 +-- + 3 files changed, 18 insertions(+), 81 deletions(-) + +diff --git a/core/cmake/rules/RulesKDEFramework.cmake b/core/cmake/rules/RulesKDEFramework.cmake +index 610033425c..2d8acc7956 100644 +--- a/core/cmake/rules/RulesKDEFramework.cmake ++++ b/core/cmake/rules/RulesKDEFramework.cmake +@@ -26,19 +26,15 @@ find_package(KF5 ${KF5_MIN_VERSION} QUIET + ) + + if(ENABLE_KFILEMETADATASUPPORT) +- +- find_package(KF5 ${KF5_MIN_VERSION} QUIET +- OPTIONAL_COMPONENTS +- FileMetaData # For Plasma destop file indexer support. +- ) +- ++ # For Plasma desktop file indexer support. ++ find_package(KF5FileMetaData ${KF5_MIN_VERSION} REQUIRED) + endif() + + + if(ENABLE_AKONADICONTACTSUPPORT) + +- find_package(KF5 ${AKONADI_MIN_VERSION} QUIET +- OPTIONAL_COMPONENTS ++ find_package(KF5 ${AKONADI_MIN_VERSION} REQUIRED ++ COMPONENTS + Akonadi + AkonadiContact # For KDE Mail Contacts support. + Contacts # API for contacts/address book data. +@@ -46,15 +42,9 @@ if(ENABLE_AKONADICONTACTSUPPORT) + + endif() + +-find_package(KF5 ${KSANE_MIN_VERSION} QUIET +- OPTIONAL_COMPONENTS +- Sane # For digital scanner support. +-) ++find_package(KF5Sane ${KSANE_MIN_VERSION} QUIET) # 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) + +@@ -62,18 +52,6 @@ if ("${KF5CalendarCore_VERSION}" VERSION_GREATER 5.6.40) + + endif() + +-if(ENABLE_AKONADICONTACTSUPPORT AND (NOT KF5AkonadiContact_FOUND OR NOT KF5Contacts_FOUND)) +- +- set(ENABLE_AKONADICONTACTSUPPORT OFF) +- +-endif() +- +-if(ENABLE_KFILEMETADATASUPPORT AND NOT KF5FileMetaData_FOUND) +- +- set(ENABLE_KFILEMETADATASUPPORT OFF) +- +-endif() +- + # Check if KIO have been compiled with KIOWidgets. digiKam only needs this one. + + if(KF5KIO_FOUND) +diff --git a/core/cmake/rules/RulesQtFramework.cmake b/core/cmake/rules/RulesQtFramework.cmake +index e6e1670ed3..1ab57af4d4 100644 +--- a/core/cmake/rules/RulesQtFramework.cmake ++++ b/core/cmake/rules/RulesQtFramework.cmake +@@ -18,47 +18,19 @@ find_package(Qt${QT_VERSION_MAJOR} REQUIRED + ) + + if(ENABLE_QWEBENGINE) +- +- find_package(Qt${QT_VERSION_MAJOR} REQUIRED +- NO_MODULE +- COMPONENTS +- WebEngineWidgets +- ) +- ++ find_package(Qt${QT_VERSION_MAJOR}WebEngineWidgets REQUIRED NO_MODULE) + else() +- +- find_package(Qt${QT_VERSION_MAJOR} REQUIRED +- NO_MODULE +- COMPONENTS +- WebKitWidgets +- ) +- ++ find_package(Qt${QT_VERSION_MAJOR}WebKitWidgets REQUIRED NO_MODULE) + endif() + +-find_package(Qt${QT_VERSION_MAJOR} +- OPTIONAL_COMPONENTS +- DBus +- OpenGL +-) ++find_package(Qt${QT_VERSION_MAJOR}DBus) ++find_package(Qt${QT_VERSION_MAJOR}OpenGL) + + if(Qt6_FOUND) +- +- find_package(Qt${QT_VERSION_MAJOR} REQUIRED +- NO_MODULE COMPONENTS +- StateMachine +- ) +- find_package(Qt${QT_VERSION_MAJOR} +- OPTIONAL_COMPONENTS +- OpenGLWidgets +- ) +- ++ find_package(Qt${QT_VERSION_MAJOR}StateMachine REQUIRED NO_MODULE) ++ find_package(Qt${QT_VERSION_MAJOR}OpenGLWidgets) + else() +- +- find_package(Qt${QT_VERSION_MAJOR} +- OPTIONAL_COMPONENTS +- XmlPatterns # For Rajce plugin +- ) +- ++ find_package(Qt${QT_VERSION_MAJOR}XmlPatterns) # For Rajce plugin + endif() + + if(ENABLE_DBUS) +@@ -74,17 +46,9 @@ endif() + # Qt Dependencies For unit tests and CLI test tools + + if(BUILD_TESTING) ++ find_package(Qt${QT_VERSION_MAJOR}Test REQUIRED NO_MODULE) + +- find_package(Qt${QT_VERSION_MAJOR} REQUIRED +- NO_MODULE +- COMPONENTS +- Test +- ) +- +- find_package(Qt${QT_VERSION_MAJOR} +- QUIET +- OPTIONAL_COMPONENTS +- Qml WebView # Optional, for 'sialis' O2 library test tool. +- ) +- ++ # Optional, for 'sialis' O2 library test tool. ++ find_package(Qt${QT_VERSION_MAJOR}Qml QUIET NO_MODULE) ++ find_package(Qt${QT_VERSION_MAJOR}WebView QUIET NO_MODULE) + endif() +diff --git a/core/cmake/rules/RulesX11.cmake b/core/cmake/rules/RulesX11.cmake +index d7659eed34..9c145970b2 100644 +--- a/core/cmake/rules/RulesX11.cmake ++++ b/core/cmake/rules/RulesX11.cmake +@@ -11,12 +11,7 @@ find_package(X11) + if(X11_FOUND) + + if(NOT Qt6_FOUND) +- +- find_package(Qt5 ${QT_MIN_VERSION} NO_MODULE +- COMPONENTS +- X11Extras +- ) +- ++ find_package(Qt5X11Extras ${QT_MIN_VERSION} NO_MODULE) + endif() + + set(HAVE_X11 TRUE) +-- +2.41.0 + |