From c7b5a281b2f19df584053abc11abb47ccad9c381 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Tue, 25 Apr 2023 18:13:05 +0100 Subject: gentoo auto-resync : 25:04:2023 - 18:13:05 --- media-gfx/digikam/Manifest | 5 +- media-gfx/digikam/digikam-7.10.0-r1.ebuild | 149 +++++++++++++++++++++ media-gfx/digikam/digikam-7.10.0.ebuild | 145 -------------------- media-gfx/digikam/digikam-7.9.0-r1.ebuild | 6 +- .../files/digikam-7.9.0-akonadi-23.04.patch | 27 ++++ 5 files changed, 184 insertions(+), 148 deletions(-) create mode 100644 media-gfx/digikam/digikam-7.10.0-r1.ebuild delete mode 100644 media-gfx/digikam/digikam-7.10.0.ebuild create mode 100644 media-gfx/digikam/files/digikam-7.9.0-akonadi-23.04.patch (limited to 'media-gfx/digikam') diff --git a/media-gfx/digikam/Manifest b/media-gfx/digikam/Manifest index 794c4d9089b4..566d365e548d 100644 --- a/media-gfx/digikam/Manifest +++ b/media-gfx/digikam/Manifest @@ -1,6 +1,7 @@ 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 DIST digiKam-7.10.0.tar.xz 349238192 BLAKE2B 527d0c3ca2e2cc2ac4d3eff11ab4e6556d21f29c78b13f92c7a80ab2775c2ba838b0d94f1fd402533dc249148049be365e7f3798eb9a973ee9d38d682f33df64 SHA512 1a5f045161253d73c4012fa949ec718fcc6c6b292ee0557c8015bea81c95fa39d3034ad46a40fdb64221f59832dc8ecdc724e93929ad2c0e35cc51fc82d28f27 DIST digiKam-7.9.0.tar.xz 349286920 BLAKE2B 222d614d16bd805f87ea10afd7bed683b80166a115641ccebac75ede7d85b46a1e1c2cdd9fb4a9c5c5395a6703362277b727e6cbefcbfc53323648a0a2fcf863 SHA512 6c5c9dac8a056d4c8c3b4d67f5a607592ee6319b9f372aebf6ef4245d58883897424d4fabae1d04f43ff3561d8e79b4e4bf5c697aa57467f831437b1cf0da1e6 -EBUILD digikam-7.10.0.ebuild 3941 BLAKE2B da145d4ef635029ff5412eb93c4d55f91cc5bf60e52fb389756b217909727bfc6ace99f1671c418ce1b898fc3f935a223828e8f515dd5e1d6c44b4959134e6c7 SHA512 336f2e35b291b870edd96b029f77269b17b598488c26f76af295c250720086c22fde58b729c9a18b1ab86cefcade54e3a2539a25d80869ef304ae6822fc8fe4a -EBUILD digikam-7.9.0-r1.ebuild 4064 BLAKE2B f4fa4de5cdc5dcd6c9e24d4256c30f0cb58edd909d9f0e9591e007ff6be9e6c56559564fa64b3c87657083284be8f97f9f7fc567b5e92720f6fc5f67127ed11e SHA512 1d6a6b59b9a02987c15d93c1fee5da8bdade279e92b619086f0fa3a852a2ab482496a27500a90dc2ae3bd081a139aab259670668589b35e8cd8dba940ff39df1 +EBUILD digikam-7.10.0-r1.ebuild 4054 BLAKE2B f3a2cf98f7e1cb0822b01d81955cdd635440b5194e32e51baaadb75d5ec860cc281f6241ece160f5eac640481035fc9cb5659bc619ab981e155f7b57f045bce1 SHA512 c9f8b43dcac4e37fda6be3f751d4da0781fd55db9091fc01f193c1effc7ea1bbc796806c16aba037a073c4e388fd66eba87ed9acd9c535e34bea858ce0b2616f +EBUILD digikam-7.9.0-r1.ebuild 4165 BLAKE2B 404b7725fb5b40b11b5005d83c24881521990aca9e05fff90536a2f3821c9ec1cad386dd1fe67ce3da6ac5e0138fd7381cc5d5ea85ee03d6082084029d8d9aff SHA512 8b765fc565b8a30e1eb03440425bd1d2108d3cc02e4ac29f4acf33a1040670fa919f6bf69522d5325a8605347207bc8f2932d6821fa70c57af3fcbef763e7b21 MISC metadata.xml 1054 BLAKE2B 7263a191f8935c2a52ad84701366969a39e42412efc26d30c28e8703d545aa49454331dc8da159d08007cd6eed682d647099ca76137acf378eef2ac481b2d8cc SHA512 224c4c6188bb6978d8e2a83bfb8cc4fb7e22937fede593e6227b7afe1c6533f9685814d8721282312015a42d601f85b0a48f587e6b0fce2a69a5e142d8266ce5 diff --git a/media-gfx/digikam/digikam-7.10.0-r1.ebuild b/media-gfx/digikam/digikam-7.10.0-r1.ebuild new file mode 100644 index 000000000000..a87c4c457218 --- /dev/null +++ b/media-gfx/digikam/digikam-7.10.0-r1.ebuild @@ -0,0 +1,149 @@ +# 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 +) + +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/digikam-7.10.0.ebuild b/media-gfx/digikam/digikam-7.10.0.ebuild deleted file mode 100644 index 3e705737e624..000000000000 --- a/media-gfx/digikam/digikam-7.10.0.ebuild +++ /dev/null @@ -1,145 +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-22*: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 -" -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" ) - -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/digikam-7.9.0-r1.ebuild b/media-gfx/digikam/digikam-7.9.0-r1.ebuild index 72affdeb5cb8..8dceca760739 100644 --- a/media-gfx/digikam/digikam-7.9.0-r1.ebuild +++ b/media-gfx/digikam/digikam-7.9.0-r1.ebuild @@ -96,6 +96,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(+)] ) @@ -109,7 +110,10 @@ BDEPEND=" ) " -PATCHES=( "${FILESDIR}/${PN}-7.8.0-cmake.patch" ) +PATCHES=( + "${FILESDIR}/${PN}-7.8.0-cmake.patch" + "${FILESDIR}/${P}-akonadi-23.04.patch" # bug 904976 +) pkg_pretend() { [[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp 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 new file mode 100644 index 000000000000..d9b46a7966f0 --- /dev/null +++ b/media-gfx/digikam/files/digikam-7.9.0-akonadi-23.04.patch @@ -0,0 +1,27 @@ +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