commit: 60007a9f817827169916850b290da8ec3686d133 Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> AuthorDate: Tue Apr 25 10:24:41 2023 +0000 Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> CommitDate: Tue Apr 25 15:27:12 2023 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=60007a9f
media-gfx/digikam: Fix build with >=kde-apps/akonadi-contacts-23.04.0 Upstream commit 5b4ba173f6a84a8be1131b1523dc42df95171ec7 Closes: https://bugs.gentoo.org/904976 Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org> ...am-7.9.0-r1.ebuild => digikam-7.10.0-r1.ebuild} | 17 +++++++------- media-gfx/digikam/digikam-7.9.0-r1.ebuild | 6 ++++- .../files/digikam-7.9.0-akonadi-23.04.patch | 27 ++++++++++++++++++++++ 3 files changed, 40 insertions(+), 10 deletions(-) diff --git a/media-gfx/digikam/digikam-7.9.0-r1.ebuild b/media-gfx/digikam/digikam-7.10.0-r1.ebuild similarity index 92% copy from media-gfx/digikam/digikam-7.9.0-r1.ebuild copy to media-gfx/digikam/digikam-7.10.0-r1.ebuild index 72affdeb5cb8..a87c4c457218 100644 --- a/media-gfx/digikam/digikam-7.9.0-r1.ebuild +++ b/media-gfx/digikam/digikam-7.10.0-r1.ebuild @@ -14,7 +14,7 @@ if [[ ${KDE_BUILD_TYPE} != live ]]; then SRC_URI="mirror://kde/stable/${PN}/${PV}/" fi SRC_URI+="digiKam-${PV/_/-}.tar.xz" - KEYWORDS="amd64 ~x86" + KEYWORDS="~amd64 ~x86" S="${WORKDIR}/${PN}-${PV/_/-}" fi @@ -23,7 +23,7 @@ HOMEPAGE="https://www.digikam.org/"; LICENSE="GPL-2" SLOT="5" -IUSE="addressbook calendar gphoto2 heif +imagemagick +lensfun marble mediaplayer mysql opengl openmp +panorama scanner semantic-desktop X" +IUSE="addressbook calendar gphoto2 heif +imagemagick +lensfun marble mysql opengl openmp +panorama scanner semantic-desktop X" # bug 366505 RESTRICT="test" @@ -77,10 +77,6 @@ COMMON_DEPEND=" >=kde-apps/marble-19.04.3:5 >=kde-frameworks/kbookmarks-${KFMIN}:5 ) - mediaplayer? ( - media-libs/qtav[opengl(+)] - media-video/ffmpeg:= - ) opengl? ( >=dev-qt/qtopengl-${QTMIN}:5 virtual/opengl @@ -96,6 +92,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 +106,10 @@ BDEPEND=" ) " -PATCHES=( "${FILESDIR}/${PN}-7.8.0-cmake.patch" ) +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 @@ -127,6 +127,7 @@ src_configure() { -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) @@ -135,8 +136,6 @@ src_configure() { $(cmake_use_find_package imagemagick ImageMagick) $(cmake_use_find_package lensfun LensFun) $(cmake_use_find_package marble Marble) - -DENABLE_MEDIAPLAYER=$(usex mediaplayer) - $(cmake_use_find_package mediaplayer QtAV) -DENABLE_MYSQLSUPPORT=$(usex mysql) -DENABLE_INTERNALMYSQL=$(usex mysql) $(cmake_use_find_package opengl OpenGL) 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 <[email protected]> +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 +
