commit: 6ae1ca1ce54aee51e57dc2b373a5ad077c500dd9
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Wed Feb 28 10:08:17 2024 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Wed Feb 28 10:21:03 2024 +0000
URL: https://gitweb.gentoo.org/proj/kde.git/commit/?id=6ae1ca1c
kde-apps/libksane: Relax media-libs/ksanecore dependency to >=23.08.5:5
Fix build system to accept ksanecore-23.08.
Preparation for porting ksanecore-24.02.0 to KF6.
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
.../libksane/files/libksane-24.02.0-ksanecore-23.08.patch | 13 +++++++++++++
kde-apps/libksane/libksane-24.02.0.ebuild | 5 +++--
kde-apps/libksane/libksane-24.02.49.9999.ebuild | 5 +++--
3 files changed, 19 insertions(+), 4 deletions(-)
diff --git a/kde-apps/libksane/files/libksane-24.02.0-ksanecore-23.08.patch
b/kde-apps/libksane/files/libksane-24.02.0-ksanecore-23.08.patch
new file mode 100644
index 0000000000..2bd46f7736
--- /dev/null
+++ b/kde-apps/libksane/files/libksane-24.02.0-ksanecore-23.08.patch
@@ -0,0 +1,13 @@
+We need SLOT 5 here.
+
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -86,7 +86,7 @@
+ )
+
+ # Check if sane API is available.
+- find_package(${KSANECORE_NAME}
"${RELEASE_SERVICE_VERSION_MAJOR}.${RELEASE_SERVICE_VERSION_MINOR}" REQUIRED)
++ find_package(${KSANECORE_NAME} "23.08" REQUIRED)
+ add_subdirectory(src)
+ if (BUILD_TESTING)
+ #DONOTCOMPILE add_subdirectory(autotests)
diff --git a/kde-apps/libksane/libksane-24.02.0.ebuild
b/kde-apps/libksane/libksane-24.02.0.ebuild
index 6ea34fbbff..e908bf0150 100644
--- a/kde-apps/libksane/libksane-24.02.0.ebuild
+++ b/kde-apps/libksane/libksane-24.02.0.ebuild
@@ -4,7 +4,6 @@
EAPI=8
KFMIN=5.113.0
-PVCUT=$(ver_cut 1-3)
QTMIN=5.15.9
inherit ecm gear.kde.org
@@ -21,11 +20,13 @@ DEPEND="
>=kde-frameworks/ki18n-${KFMIN}:5
>=kde-frameworks/ktextwidgets-${KFMIN}:5
>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
- >=media-libs/ksanecore-${PVCUT}:5
+ >=media-libs/ksanecore-23.08.5:5
kwallet? ( >=kde-frameworks/kwallet-${KFMIN}:5 )
"
RDEPEND="${DEPEND}"
+PATCHES=( "${FILESDIR}/${P}-ksanecore-23.08.patch" )
+
src_configure() {
local mycmakeargs=(
$(cmake_use_find_package kwallet KF5Wallet)
diff --git a/kde-apps/libksane/libksane-24.02.49.9999.ebuild
b/kde-apps/libksane/libksane-24.02.49.9999.ebuild
index b81f4e7724..dcaafc49e1 100644
--- a/kde-apps/libksane/libksane-24.02.49.9999.ebuild
+++ b/kde-apps/libksane/libksane-24.02.49.9999.ebuild
@@ -4,7 +4,6 @@
EAPI=8
KFMIN=5.113.0
-PVCUT=$(ver_cut 1-3)
QTMIN=5.15.9
inherit ecm gear.kde.org
@@ -21,11 +20,13 @@ DEPEND="
>=kde-frameworks/ki18n-${KFMIN}:5
>=kde-frameworks/ktextwidgets-${KFMIN}:5
>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
- >=media-libs/ksanecore-${PVCUT}:5
+ >=media-libs/ksanecore-23.08.5:5
kwallet? ( >=kde-frameworks/kwallet-${KFMIN}:5 )
"
RDEPEND="${DEPEND}"
+PATCHES=( "${FILESDIR}/${PN}-24.02.0-ksanecore-23.08.patch" )
+
src_configure() {
local mycmakeargs=(
$(cmake_use_find_package kwallet KF5Wallet)
