From 99b2c44c1425c7b2925846d4c44b2bf2f78dc786 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sat, 8 Jul 2023 22:23:22 +0100 Subject: gentoo auto-resync : 08:07:2023 - 22:23:22 --- media-gfx/digikam/Manifest | 3 + media-gfx/digikam/digikam-8.1.0.ebuild | 151 ++++++++++++++++++ media-gfx/digikam/files/digikam-8.1.0-cmake.patch | 179 ++++++++++++++++++++++ 3 files changed, 333 insertions(+) create mode 100644 media-gfx/digikam/digikam-8.1.0.ebuild create mode 100644 media-gfx/digikam/files/digikam-8.1.0-cmake.patch (limited to 'media-gfx/digikam') diff --git a/media-gfx/digikam/Manifest b/media-gfx/digikam/Manifest index db5b6fd65870..2d4b2e3b4683 100644 --- a/media-gfx/digikam/Manifest +++ b/media-gfx/digikam/Manifest @@ -1,6 +1,9 @@ AUX digikam-7.10.0-gcc13.patch 728 BLAKE2B bb1322359978ba019689c1874a63a6ae218b34c664c909def58bd509667c9c840ec06f1334c66caff1673052bcbbd73cda2f394fdd2d0f827705df0774297a76 SHA512 a610c682ba2b6aad2580d83e8d5e1d5f6fc9d104f784c80d8938cd7a049b1c85fe336c71ffc46b4772b2febe2b0ab994be3ae7de3e289d6f1236b5310b4f6c8e AUX digikam-7.8.0-cmake.patch 4066 BLAKE2B 3f18ad5c25629cf7f32ced42c55875e3158a68083c28ca70c5b6a32795117339aebf930753f82ad21cc57990d4a0f030f39583a7b318433e3feb47ed1c4a3ddd SHA512 83626bdeacb91afd069ce4b9023f4a62154a53b2de569fb24286153fd5083a1970e3b34d37abae61ed77928d9f22bde84622ad67fd8659fefd105c1c15ed34d0 AUX digikam-7.9.0-akonadi-23.04.patch 1030 BLAKE2B 11996d57bfd2647a604d28f7fa976aeaa9cbe4329f266e813944320b3bdd7b1b8761685b670bbb4499181a77b5b8da49e65d4218014ce5e0124ff3dae346228a SHA512 52fbf63e46f50fde477266bc0b30888ae7bf83f6986294c17307705f536468889d312eba61647e125431dee4331cbd56a458c2999f31d29a0b1c989586732d6e +AUX digikam-8.1.0-cmake.patch 5948 BLAKE2B c1fde60bf77039a4d4a974a9112237e014b27cbbdae0348965dcff97377e5a4929dc04a6c12e71e38534554e0bf55ef5cdd0e4a1c099996ca237f7dc3acb44f3 SHA512 65bbba111168809a6afea5c001b2af6cab8a04f9547abcec8adcd535d4631b28e274e0a93279519f7fef5b92aec1019e09973ec92e27d55a4292b7557ddcd4df DIST digiKam-7.10.0.tar.xz 349238192 BLAKE2B 527d0c3ca2e2cc2ac4d3eff11ab4e6556d21f29c78b13f92c7a80ab2775c2ba838b0d94f1fd402533dc249148049be365e7f3798eb9a973ee9d38d682f33df64 SHA512 1a5f045161253d73c4012fa949ec718fcc6c6b292ee0557c8015bea81c95fa39d3034ad46a40fdb64221f59832dc8ecdc724e93929ad2c0e35cc51fc82d28f27 +DIST digiKam-8.1.0.tar.xz 35712348 BLAKE2B 0feaa66ec27b0c2a9e776f26c02987554e8653cda29ca1982182ec1a0f70783808cd2e269dcee1f2b65e6e29ba3bc483a2284a6a485c0b7cc46ae80dd2f87069 SHA512 cbf5a776b4138f4f05d074721324b046dfa07ddc01259f569ae46c46a6d5b0b00824ef0962a09041081703348e4defecf15cff800b2c6cf5e04a0e7e963a3ef4 EBUILD digikam-7.10.0-r1.ebuild 4085 BLAKE2B 34243cd0aefd7d2468f1d84c825d4f1961862006ceac7bef3af74a6086de9413d12d60c054668084d5262590f723c5c5d6de8f6547b6cb4a031327b175825fdf SHA512 b89f4c518bb0f1db489f1457cd9e09472f01b52097d9cebe7b88bf595f1a02dbd8e0f80979cc1883c7da25cb469917e222e72117edae4890e1c135ede1e5d050 +EBUILD digikam-8.1.0.ebuild 4273 BLAKE2B bdddf67eacc3fb278ae6a60d97cbe47103a866a6a113572a48d0e2f4752f4b0b3a7d869520259f5ab6c7f89a26fc27790476085ec254ab286048f789825c75b0 SHA512 8d914e2e658a791ed0f9900fea5d2bc63eebc5d097cb89d58e7a81a5a242a3a28e2320c201e7b6606cd77dd3edefc7cbb27f8664728619e1f8072998a3fbbc17 MISC metadata.xml 955 BLAKE2B 49eb64d1179383122e4fe65b2edc22929b46dba0fdb44cbd6230b33268143a9c7d4dc56a7414029864bce0a06c60c56476abc0264f151fad356020b5998b79e3 SHA512 dbe088987df5f09a8d166a293423f006eb97ab57fd0415871dc30a1a066e33a7e9e4c13a5608dd69dd96b06082bac5c216c7d9506ca60d326ab10ade96b6af39 diff --git a/media-gfx/digikam/digikam-8.1.0.ebuild b/media-gfx/digikam/digikam-8.1.0.ebuild new file mode 100644 index 000000000000..eeb2f032ad56 --- /dev/null +++ b/media-gfx/digikam/digikam-8.1.0.ebuild @@ -0,0 +1,151 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +KFMIN=5.106.0 +QTMIN=5.15.9 +inherit ecm kde.org toolchain-funcs + +if [[ ${KDE_BUILD_TYPE} != live ]]; then + if [[ ${PV} =~ beta[0-9]$ ]]; then + SRC_URI="mirror://kde/unstable/${PN}/" + else + SRC_URI="mirror://kde/stable/${PN}/${PV}/" + fi + SRC_URI+="digiKam-${PV/_/-}.tar.xz" + KEYWORDS="~amd64 ~x86" + S="${WORKDIR}/${PN}-${PV/_/-}" +fi + +DESCRIPTION="Digital photo management application" +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 spell X" + +# bug 366505 +RESTRICT="test" + +COMMON_DEPEND=" + dev-libs/expat + >=dev-qt/qtconcurrent-${QTMIN}:5 + >=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] + >=dev-qt/qtwidgets-${QTMIN}:5 + >=dev-qt/qtxml-${QTMIN}:5 + >=dev-qt/qtxmlpatterns-${QTMIN}:5 + >=kde-frameworks/kconfig-${KFMIN}:5 + >=kde-frameworks/kconfigwidgets-${KFMIN}:5 + >=kde-frameworks/kcoreaddons-${KFMIN}:5 + >=kde-frameworks/ki18n-${KFMIN}:5 + >=kde-frameworks/kiconthemes-${KFMIN}:5 + >=kde-frameworks/kio-${KFMIN}:5 + >=kde-frameworks/knotifications-${KFMIN}:5 + >=kde-frameworks/knotifyconfig-${KFMIN}:5 + >=kde-frameworks/kservice-${KFMIN}:5 + >=kde-frameworks/kwidgetsaddons-${KFMIN}:5 + >=kde-frameworks/kwindowsystem-${KFMIN}:5 + >=kde-frameworks/kxmlgui-${KFMIN}:5 + >=kde-frameworks/solid-${KFMIN}:5 + >=media-gfx/exiv2-0.27.1:=[xmp] + media-libs/lcms:2 + media-libs/libjpeg-turbo:= + media-libs/liblqr + media-libs/libpng:= + >=media-libs/opencv-3.3.0:=[contrib,contribdnn,features2d] + media-libs/tiff:= + addressbook? ( + >=kde-apps/akonadi-contacts-19.04.3:5 + >=kde-frameworks/kcontacts-${KFMIN}:5 + ) + calendar? ( >=kde-frameworks/kcalendarcore-${KFMIN}:5 ) + gphoto2? ( media-libs/libgphoto2:= ) + heif? ( + media-libs/libheif:= + media-libs/x265:= + ) + imagemagick? ( media-gfx/imagemagick:= ) + lensfun? ( media-libs/lensfun ) + marble? ( + >=dev-qt/qtconcurrent-${QTMIN}:5 + >=kde-apps/marble-19.04.3:5 + >=kde-frameworks/kbookmarks-${KFMIN}:5 + ) + opengl? ( + >=dev-qt/qtopengl-${QTMIN}:5 + virtual/opengl + ) + 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 + ) +" +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(+)] ) + panorama? ( media-gfx/hugin ) +" +BDEPEND=" + sys-devel/gettext + panorama? ( + sys-devel/bison + sys-devel/flex + ) +" + +PATCHES=( "${FILESDIR}/${P}-cmake.patch" ) + +pkg_pretend() { + [[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp + ecm_pkg_pretend +} + +pkg_setup() { + [[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp + ecm_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; 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) + $(cmake_use_find_package gphoto2 Gphoto2) + $(cmake_use_find_package heif Libheif) + $(cmake_use_find_package imagemagick ImageMagick) + $(cmake_use_find_package lensfun LensFun) + $(cmake_use_find_package marble Marble) + -DENABLE_MYSQLSUPPORT=$(usex mysql) + -DENABLE_INTERNALMYSQL=$(usex mysql) + $(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) + ) + + ecm_src_configure +} 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 000000000000..16c1ffa5c37d --- /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 +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 + -- cgit v1.2.3