commit: 5b29330de98932bbefc40d87c632c817ab29dfc7
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Mon Mar 25 14:41:32 2024 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Mon Mar 25 14:41:54 2024 +0000
URL: https://gitweb.gentoo.org/proj/kde.git/commit/?id=5b29330d
media-gfx/digikam: Rebase cmake.patch on top of HEAD
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
media-gfx/digikam/digikam-9999.ebuild | 18 +++++++--------
...-9999-cmake.patch => digikam-8.3.0-cmake.patch} | 26 ++++++++++++----------
2 files changed, 22 insertions(+), 22 deletions(-)
diff --git a/media-gfx/digikam/digikam-9999.ebuild
b/media-gfx/digikam/digikam-9999.ebuild
index c0a5622d34..5b11866565 100644
--- a/media-gfx/digikam/digikam-9999.ebuild
+++ b/media-gfx/digikam/digikam-9999.ebuild
@@ -8,14 +8,12 @@ QTMIN=5.15.12
inherit ecm kde.org toolchain-funcs
if [[ ${KDE_BUILD_TYPE} != live ]]; then
+ TARNAME="digiKam-${PV/_/-}"
if [[ ${PV} =~ beta[0-9]$ ]]; then
- SRC_URI="mirror://kde/unstable/${PN}/"
+ SRC_URI="mirror://kde/unstable/${PN}/${TARNAME}.tar.xz"
else
- SRC_URI="mirror://kde/stable/${PN}/${PV}/"
+ SRC_URI="mirror://kde/stable/${PN}/${PV}/${TARNAME}.tar.xz"
fi
- SRC_URI+="digiKam-${PV/_/-}.tar.xz"
- KEYWORDS="~amd64 ~arm64 ~x86"
- S="${WORKDIR}/${PN}-${PV/_/-}"
fi
DESCRIPTION="Digital photo management application"
@@ -64,7 +62,7 @@ COMMON_DEPEND="
media-libs/tiff:=
x11-libs/libX11
addressbook? (
- >=kde-apps/akonadi-contacts-19.04.3:5
+ >=kde-apps/akonadi-contacts-23.08.3:5
>=kde-frameworks/kcontacts-${KFMIN}:5
)
calendar? ( >=kde-frameworks/kcalendarcore-${KFMIN}:5 )
@@ -77,7 +75,7 @@ COMMON_DEPEND="
lensfun? ( media-libs/lensfun )
marble? (
>=dev-qt/qtconcurrent-${QTMIN}:5
- >=kde-apps/marble-19.04.3:5
+ >=kde-apps/marble-23.08.3:5
>=kde-frameworks/kbookmarks-${KFMIN}:5
)
opengl? (
@@ -85,14 +83,14 @@ COMMON_DEPEND="
virtual/opengl
)
panorama? ( >=kde-frameworks/threadweaver-${KFMIN}:5 )
- scanner? ( >=kde-apps/libksane-19.04.3:5 )
+ scanner? ( >=kde-apps/libksane-23.08.3:5 )
semantic-desktop? ( >=kde-frameworks/kfilemetadata-${KFMIN}:5 )
spell? ( >=kde-frameworks/sonnet-${KFMIN}:5 )
"
DEPEND="${COMMON_DEPEND}
dev-cpp/eigen:3
dev-libs/boost
- addressbook? ( >=kde-apps/akonadi-19.04.3:5 )
+ addressbook? ( >=kde-apps/akonadi-23.08.3:5 )
"
RDEPEND="${COMMON_DEPEND}
media-libs/exiftool
@@ -107,7 +105,7 @@ BDEPEND="
)
"
-PATCHES=( "${FILESDIR}/${P}-cmake.patch" )
+PATCHES=( "${FILESDIR}/${PN}-8.3.0-cmake.patch" )
pkg_pretend() {
[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
diff --git a/media-gfx/digikam/files/digikam-9999-cmake.patch
b/media-gfx/digikam/files/digikam-8.3.0-cmake.patch
similarity index 88%
rename from media-gfx/digikam/files/digikam-9999-cmake.patch
rename to media-gfx/digikam/files/digikam-8.3.0-cmake.patch
index 7121ede14d..03438e3f22 100644
--- a/media-gfx/digikam/files/digikam-9999-cmake.patch
+++ b/media-gfx/digikam/files/digikam-8.3.0-cmake.patch
@@ -1,20 +1,20 @@
-From 945c59d7dd66ccb89910db7b560206550fe0fe69 Mon Sep 17 00:00:00 2001
+From c6ae81abf56851c818285d555e192c660635247b Mon Sep 17 00:00:00 2001
From: Andreas Sturmlechner <[email protected]>
Date: Sun, 17 Feb 2019 23:51:03 +0100
Subject: [PATCH] Un-break optional Qt/KF detection
And if we enable an option, make the necessary libraries REQUIRED.
---
- core/cmake/rules/RulesKDEFramework.cmake | 41 +++-------------
+ core/cmake/rules/RulesKDEFramework.cmake | 43 +++--------------
core/cmake/rules/RulesQtFramework.cmake | 61 +++++-------------------
core/cmake/rules/RulesX11.cmake | 7 +--
- 3 files changed, 20 insertions(+), 89 deletions(-)
+ 3 files changed, 20 insertions(+), 91 deletions(-)
diff --git a/core/cmake/rules/RulesKDEFramework.cmake
b/core/cmake/rules/RulesKDEFramework.cmake
-index 996de43d6a..34698eb2b8 100644
+index e34e5f4a8d..3cde25928f 100644
--- a/core/cmake/rules/RulesKDEFramework.cmake
+++ b/core/cmake/rules/RulesKDEFramework.cmake
-@@ -26,24 +26,15 @@ find_package(KF${QT_VERSION_MAJOR}
${KF${QT_VERSION_MAJOR}_MIN_VERSION} QUIET
+@@ -26,26 +26,15 @@ find_package(KF${QT_VERSION_MAJOR}
${KF${QT_VERSION_MAJOR}_MIN_VERSION} QUIET
)
if(ENABLE_KFILEMETADATASUPPORT)
@@ -37,6 +37,8 @@ index 996de43d6a..34698eb2b8 100644
- AkonadiContact # For KDE
Mail Contacts support.
- Contacts # API for
contacts/address book data.
- )
+- find_package(KPim${QT_VERSION_MAJOR}Akonadi ${AKONADI_MIN_VERSION} QUIET)
+- find_package(KPim${QT_VERSION_MAJOR}AkonadiContact ${AKONADI_MIN_VERSION}
QUIET)
-
+ find_package(KF${QT_VERSION_MAJOR}Contacts
${KF${QT_VERSION_MAJOR}_MIN_VERSION} REQUIRED) # API for contacts/address book
data.
+ find_package(KPim${QT_VERSION_MAJOR}Akonadi ${AKONADI_MIN_VERSION}
REQUIRED)
@@ -44,7 +46,7 @@ index 996de43d6a..34698eb2b8 100644
endif()
if(Qt6_FOUND)
-@@ -52,17 +43,11 @@ if(Qt6_FOUND)
+@@ -54,17 +43,11 @@ if(Qt6_FOUND)
else()
@@ -64,11 +66,11 @@ index 996de43d6a..34698eb2b8 100644
if ("${KF${QT_VERSION_MAJOR}CalendarCore_VERSION}" VERSION_GREATER 5.6.40)
-@@ -70,18 +55,6 @@ if ("${KF${QT_VERSION_MAJOR}CalendarCore_VERSION}"
VERSION_GREATER 5.6.40)
+@@ -72,18 +55,6 @@ if ("${KF${QT_VERSION_MAJOR}CalendarCore_VERSION}"
VERSION_GREATER 5.6.40)
endif()
--if(ENABLE_AKONADICONTACTSUPPORT AND (NOT
KF${QT_VERSION_MAJOR}AkonadiContact_FOUND OR NOT
KF${QT_VERSION_MAJOR}Contacts_FOUND))
+-if(ENABLE_AKONADICONTACTSUPPORT AND (NOT
KPim${QT_VERSION_MAJOR}AkonadiContact_FOUND OR NOT
KPim${QT_VERSION_MAJOR}Contacts_FOUND))
-
- set(ENABLE_AKONADICONTACTSUPPORT OFF)
-
@@ -82,9 +84,9 @@ index 996de43d6a..34698eb2b8 100644
-
# Check if KIO have been compiled with KIOWidgets. digiKam only needs this
one.
- if(KF${QT_VERSION_MAJOR}KIO_FOUND)
+ if(ENABLE_KIO)
diff --git a/core/cmake/rules/RulesQtFramework.cmake
b/core/cmake/rules/RulesQtFramework.cmake
-index 469ca8f14a..c4b67cfdca 100644
+index 6f233ccfbc..7e29a09a40 100644
--- a/core/cmake/rules/RulesQtFramework.cmake
+++ b/core/cmake/rules/RulesQtFramework.cmake
@@ -19,49 +19,20 @@ find_package(Qt${QT_VERSION_MAJOR} REQUIRED
@@ -168,7 +170,7 @@ index 469ca8f14a..c4b67cfdca 100644
+ 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
+index d7830f3923..4401a57c87 100644
--- a/core/cmake/rules/RulesX11.cmake
+++ b/core/cmake/rules/RulesX11.cmake
@@ -11,12 +11,7 @@ find_package(X11)
@@ -186,5 +188,5 @@ index d7659eed34..9c145970b2 100644
set(HAVE_X11 TRUE)
--
-2.43.0
+2.44.0
