From fb253a2f9374a08cc77241967e859ab6f59386d4 Mon Sep 17 00:00:00 2001 From: Andreas Sturmlechner Date: Thu, 3 Aug 2023 17:18:11 +0200 Subject: media-gfx/digikam: drop 7.10.0-r1 Signed-off-by: Andreas Sturmlechner --- media-gfx/digikam/Manifest | 1 - media-gfx/digikam/digikam-7.10.0-r1.ebuild | 150 --------------------- media-gfx/digikam/files/digikam-7.10.0-gcc13.patch | 25 ---- media-gfx/digikam/files/digikam-7.8.0-cmake.patch | 119 ---------------- .../files/digikam-7.9.0-akonadi-23.04.patch | 27 ---- 5 files changed, 322 deletions(-) delete mode 100644 media-gfx/digikam/digikam-7.10.0-r1.ebuild delete mode 100644 media-gfx/digikam/files/digikam-7.10.0-gcc13.patch delete mode 100644 media-gfx/digikam/files/digikam-7.8.0-cmake.patch delete mode 100644 media-gfx/digikam/files/digikam-7.9.0-akonadi-23.04.patch diff --git a/media-gfx/digikam/Manifest b/media-gfx/digikam/Manifest index 95b47c54690a..da935f8858a3 100644 --- a/media-gfx/digikam/Manifest +++ b/media-gfx/digikam/Manifest @@ -1,2 +1 @@ -DIST digiKam-7.10.0.tar.xz 349238192 BLAKE2B 527d0c3ca2e2cc2ac4d3eff11ab4e6556d21f29c78b13f92c7a80ab2775c2ba838b0d94f1fd402533dc249148049be365e7f3798eb9a973ee9d38d682f33df64 SHA512 1a5f045161253d73c4012fa949ec718fcc6c6b292ee0557c8015bea81c95fa39d3034ad46a40fdb64221f59832dc8ecdc724e93929ad2c0e35cc51fc82d28f27 DIST digiKam-8.1.0.tar.xz 35712348 BLAKE2B 0feaa66ec27b0c2a9e776f26c02987554e8653cda29ca1982182ec1a0f70783808cd2e269dcee1f2b65e6e29ba3bc483a2284a6a485c0b7cc46ae80dd2f87069 SHA512 cbf5a776b4138f4f05d074721324b046dfa07ddc01259f569ae46c46a6d5b0b00824ef0962a09041081703348e4defecf15cff800b2c6cf5e04a0e7e963a3ef4 diff --git a/media-gfx/digikam/digikam-7.10.0-r1.ebuild b/media-gfx/digikam/digikam-7.10.0-r1.ebuild deleted file mode 100644 index 5dc278727087..000000000000 --- a/media-gfx/digikam/digikam-7.10.0-r1.ebuild +++ /dev/null @@ -1,150 +0,0 @@ -# Copyright 1999-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -KFMIN=5.88.0 -QTMIN=5.15.5 -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 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/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:=[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 ) - 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}/${PN}-7.8.0-cmake.patch" - "${FILESDIR}/${PN}-7.9.0-akonadi-23.04.patch" # bug 904976 - "${FILESDIR}/${P}-gcc13.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_TESTING=OFF # bug 698192 - -DENABLE_APPSTYLES=ON - -DCMAKE_DISABLE_FIND_PACKAGE_Jasper=ON - -DENABLE_MEDIAPLAYER=OFF # bug 758641, last-rited - -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) - -DENABLE_KFILEMETADATASUPPORT=$(usex semantic-desktop) - $(cmake_use_find_package X X11) - ) - - ecm_src_configure -} diff --git a/media-gfx/digikam/files/digikam-7.10.0-gcc13.patch b/media-gfx/digikam/files/digikam-7.10.0-gcc13.patch deleted file mode 100644 index 98e78df74d8c..000000000000 --- a/media-gfx/digikam/files/digikam-7.10.0-gcc13.patch +++ /dev/null @@ -1,25 +0,0 @@ -From 9c4fed4b5562c777fc6639ead9bcc95faacdb992 Mon Sep 17 00:00:00 2001 -From: Maik Qualmann -Date: Sun, 26 Mar 2023 13:19:40 +0200 -Subject: [PATCH] fix compile DNG-SDK with GCC13 - ---- - core/libs/dngwriter/extra/dng_sdk/dng_string.cpp | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/core/libs/dngwriter/extra/dng_sdk/dng_string.cpp b/core/libs/dngwriter/extra/dng_sdk/dng_string.cpp -index 4e76fc4c86a..7814aff145d 100644 ---- a/core/libs/dngwriter/extra/dng_sdk/dng_string.cpp -+++ b/core/libs/dngwriter/extra/dng_sdk/dng_string.cpp -@@ -27,7 +27,7 @@ - # endif - #endif - --#if qiPhone || qAndroid -+#if qLinux || qiPhone || qAndroid - #include // for isdigit - #endif - --- -GitLab - 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 d698626e8c7e..000000000000 --- 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 -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-7.9.0-akonadi-23.04.patch b/media-gfx/digikam/files/digikam-7.9.0-akonadi-23.04.patch deleted file mode 100644 index d9b46a7966f0..000000000000 --- a/media-gfx/digikam/files/digikam-7.9.0-akonadi-23.04.patch +++ /dev/null @@ -1,27 +0,0 @@ -From 5b4ba173f6a84a8be1131b1523dc42df95171ec7 Mon Sep 17 00:00:00 2001 -From: Antonio Rojas -Date: Thu, 20 Apr 2023 17:49:44 +0200 -Subject: [PATCH] Fix build with akonadi 23.04 - -In KDE PIM 23.04 the KF5:: targets have been renamed to KPim5:: -While the KF5:: targets are kept for backwards compatibility, they no longer recursively include other KF5:: targets. -We need to search for Akonadi explicitly so that the KF5::AkonadiCore target is defined. ---- - core/CMakeLists.txt | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/core/CMakeLists.txt b/core/CMakeLists.txt -index 4cb33d2f9e6..610033425cd 100644 ---- a/core/CMakeLists.txt -+++ b/core/CMakeLists.txt -@@ -124,6 +124,7 @@ if(ENABLE_AKONADICONTACTSUPPORT) - - find_package(KF5 ${AKONADI_MIN_VERSION} QUIET REQUIRED - OPTIONAL_COMPONENTS -+ Akonadi - AkonadiContact # For KDE Mail Contacts support. - Contacts # API for contacts/address book data. - ) --- -GitLab - -- cgit v1.2.3-65-gdbad