haikuprojects/haikuports
1
0
Fork 0
mirror of https://github.com/yann64/haikuports.git synced 2026-04-09 05:10:05 +02:00
Code Issues Packages Projects Releases Wiki Activity

libkcddb, bump to 24.12.3, add KF6 package (#11946)

Browse Source
This commit is contained in:
Schrijvers Luc
2025-03-13 10:20:12 +00:00
committed by GitHub
parent e2608701fe
commit 5a1094b2a5
3 changed files with 138 additions and 72 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
kde-apps/libkcddb/libkcddb-23.08.5.recipe → kde-apps/libkcddb/libkcddb-24.12.3.recipe
View File

@@ -6,8 +6,7 @@ LICENSE="GNU FDL v1.2
GNU GPL v2"
REVISION="1"
SOURCE_URI="https://download.kde.org/stable/release-service/$portVersion/src/libkcddb-$portVersion.tar.xz"
CHECKSUM_SHA256="43d29b785a7217ac27bc94ce1b1827eaaf0191a13c56162eb23b07bd3fccf9c5"
PATCHES="libkcddb-$portVersion.patchset"
CHECKSUM_SHA256="bf404bb565b50d6ca1a0388116b51489998fb556828a0e334351ac1408fd580e"
ARCHITECTURES="all !x86_gcc2"
SECONDARY_ARCHITECTURES="x86"
@@ -45,7 +44,7 @@ REQUIRES_devel="
BUILD_REQUIRES="
haiku${secondaryArchSuffix}_devel
extra_cmake_modules$secondaryArchSuffix >= 5.115
extra_cmake_modules$secondaryArchSuffix
devel:libKF5Auth$secondaryArchSuffix
devel:libKF5Bookmarks$secondaryArchSuffix
devel:libKF5Codecs$secondaryArchSuffix
@@ -53,6 +52,7 @@ BUILD_REQUIRES="
devel:libKF5ConfigCore$secondaryArchSuffix
devel:libKF5ConfigWidgets$secondaryArchSuffix
devel:libKF5CoreAddons$secondaryArchSuffix
devel:libKF5DocTools$secondaryArchSuffix
devel:libKF5I18n$secondaryArchSuffix
devel:libKF5ItemViews$secondaryArchSuffix
devel:libKF5JobWidgets$secondaryArchSuffix
@@ -70,20 +70,27 @@ BUILD_PREREQUIRES="
cmd:cmake
cmd:g++$secondaryArchSuffix
cmd:make
cmd:msgfmt
cmd:msgmerge
cmd:msgfmt$secondaryArchSuffix
cmd:msgmerge$secondaryArchSuffix
cmd:pkg_config$secondaryArchSuffix
cmd:qdbuscpp2xml$secondaryArchSuffix >= 5
"
PATCH()
{
sed -e '/add_subdirectory(doc)/ s/^#*/#/' -i kcmcddb/CMakeLists.txt
sed -e '/kdoctools_install(po)/ s/^#*/#/' -i CMakeLists.txt
}
BUILD()
{
cmake -Bbuild -S. $cmakeDirArgs \
-DCMAKE_BUILD_TYPE=Release \
cmake -B build -S . -DCMAKE_BUILD_TYPE=Release \
$cmakeDirArgs \
-DKDE_INSTALL_PLUGINDIR=$addOnsDir/Qt5 \
-DKDE_INSTALL_QMLDIR=$dataDir/Qt5/qml \
-DECM_MKSPECS_INSTALL_DIR=$dataDir/Qt5/mkspecs \
-DECM_DIR=/system/data/cmake/Modules/ECM/cmake
-DECM_DIR=/system/data/cmake/Modules/ECM/cmake \
-DBUILD_TESTING=OFF
make -C build $jobArgs
}

123
kde-apps/libkcddb/libkcddb_kf6-24.12.3.recipe Normal file
View File

@@ -0,0 +1,123 @@
SUMMARY="KDE library for CDDB"
DESCRIPTION="Library used to retrieve audio CD metadata from the Internet."
HOMEPAGE="https://invent.kde.org/multimedia/libkcddb"
COPYRIGHT="2010-2025 KDE Organisation"
LICENSE="GNU FDL v1.2
GNU GPL v2"
REVISION="1"
SOURCE_URI="https://download.kde.org/stable/release-service/$portVersion/src/libkcddb-$portVersion.tar.xz"
CHECKSUM_SHA256="bf404bb565b50d6ca1a0388116b51489998fb556828a0e334351ac1408fd580e"
SOURCE_DIR="libkcddb-$portVersion"
ARCHITECTURES="all !x86_gcc2"
SECONDARY_ARCHITECTURES="x86"
libVersion="5.1.0"
libVersionCompat="$libVersion compat >= ${libVersion%%.*}"
PROVIDES="
libkcddb_kf6$secondaryArchSuffix = $portVersion
lib:libKCddb6$secondaryArchSuffix = $libVersionCompat
"
REQUIRES="
haiku$secondaryArchSuffix
lib:libGL$secondaryArchSuffix
lib:libmusicbrainz5$secondaryArchSuffix
# KF6
lib:libKF6ConfigCore$secondaryArchSuffix
lib:libKF6ConfigGui$secondaryArchSuffix
lib:libKF6CoreAddons$secondaryArchSuffix
lib:libKF6I18n$secondaryArchSuffix
lib:libKF6KIOCore$secondaryArchSuffix
lib:libKF6Service$secondaryArchSuffix
# Qt6
lib:libQt6Core$secondaryArchSuffix
lib:libQt6DBus$secondaryArchSuffix
lib:libQt6Gui$secondaryArchSuffix
lib:libQt6Network$secondaryArchSuffix
lib:libQt6Xml$secondaryArchSuffix
"
PROVIDES_devel="
libkcddb_kf6${secondaryArchSuffix}_devel = $portVersion
devel:libKCddb6$secondaryArchSuffix = $libVersionCompat
"
REQUIRES_devel="
libkcddb_kf6$secondaryArchSuffix == $portVersion base
"
BUILD_REQUIRES="
haiku${secondaryArchSuffix}_devel
devel:libmusicbrainz5$secondaryArchSuffix
# KF6
extra_cmake_modules$secondaryArchSuffix
devel:libKF6AuthCore$secondaryArchSuffix
devel:libKF6Bookmarks$secondaryArchSuffix
devel:libKF6Codecs$secondaryArchSuffix
devel:libKF6ColorScheme$secondaryArchSuffix
devel:libKF6Completion$secondaryArchSuffix
devel:libKF6ConfigCore$secondaryArchSuffix
devel:libKF6ConfigWidgets$secondaryArchSuffix
devel:libKF6CoreAddons$secondaryArchSuffix
devel:libKF6DocTools$secondaryArchSuffix
devel:libKF6I18n$secondaryArchSuffix
devel:libKF6ItemViews$secondaryArchSuffix
devel:libKF6JobWidgets$secondaryArchSuffix
devel:libKF6KCMUtils$secondaryArchSuffix
devel:libKF6KIOCore$secondaryArchSuffix
devel:libKF6Service$secondaryArchSuffix
devel:libKF6Solid$secondaryArchSuffix
devel:libKF6WidgetsAddons$secondaryArchSuffix
devel:libKF6WindowSystem$secondaryArchSuffix
devel:libKF6XmlGui$secondaryArchSuffix
# Qt6
devel:libQt6Core$secondaryArchSuffix
devel:libQt6Qml$secondaryArchSuffix
"
BUILD_PREREQUIRES="
cmd:cmake
cmd:g++$secondaryArchSuffix
cmd:make
cmd:msgfmt$secondaryArchSuffix
cmd:msgmerge$secondaryArchSuffix
cmd:pkg_config$secondaryArchSuffix
"
PATCH()
{
sed -e '/add_subdirectory(doc)/ s/^#*/#/' -i kcmcddb/CMakeLists.txt
sed -e '/kdoctools_install(po)/ s/^#*/#/' -i CMakeLists.txt
}
BUILD()
{
cmake -B build -S . -DCMAKE_BUILD_TYPE=Release \
$cmakeDirArgs \
-DBUILD_WITH_QT6=ON \
-DKDE_INSTALL_PLUGINDIR=$addOnsDir/Qt6 \
-DKDE_INSTALL_QMLDIR=$dataDir/Qt6/qml \
-DECM_MKSPECS_INSTALL_DIR=$dataDir/Qt6/mkspecs \
-DECM_DIR=/system/data/cmake/Modules/ECM/cmake
make -C build $jobArgs
}
INSTALL()
{
make -C build install
prepareInstalledDevelLib \
libKCddb6
packageEntries devel \
$developDir \
$dataDir/Qt6 \
$libDir/cmake
}
TEST()
{
# 57% tests passed, 6 tests failed out of 14
export LIBRARY_PATH="$sourceDir/build/bin${LIBRARY_PATH:+:$LIBRARY_PATH}"
ctest --test-dir build --output-on-failure
}

64
kde-apps/libkcddb/patches/libkcddb-23.08.5.patchset
View File

@@ -1,64 +0,0 @@
From 314fab72b0e2488c6450dedaf86c373ab6134e02 Mon Sep 17 00:00:00 2001
From: Begasus <begasus@gmail.com>
Date: Sun, 24 Dec 2023 12:02:34 +0100
Subject: Disable Doctools
diff --git a/CMakeLists.txt b/CMakeLists.txt
index e5aa9a9..30fb5e0 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -37,7 +37,7 @@ set(EXCLUDE_DEPRECATED_BEFORE_AND_AT 0 CACHE STRING "Control the range of deprec
endif()
find_package(Qt${QT_MAJOR_VERSION} ${QT_MIN_VERSION} REQUIRED COMPONENTS Network Widgets)
-find_package(KF${KF_MAJOR_VERSION} ${KF_MIN_VERSION} REQUIRED COMPONENTS Config DocTools I18n KIO WidgetsAddons KCMUtils)
+find_package(KF${KF_MAJOR_VERSION} ${KF_MIN_VERSION} REQUIRED COMPONENTS Config I18n KIO WidgetsAddons KCMUtils)
if (QT_MAJOR_VERSION STREQUAL 6)
find_package(Qt6 REQUIRED COMPONENTS Core5Compat)
endif()
@@ -71,6 +71,5 @@ if(BUILD_TESTING)
endif()
ki18n_install(po)
-kdoctools_install(po)
feature_summary(WHAT ALL FATAL_ON_MISSING_REQUIRED_PACKAGES)
diff --git a/kcmcddb/CMakeLists.txt b/kcmcddb/CMakeLists.txt
index e662c8e..56cc832 100644
--- a/kcmcddb/CMakeLists.txt
+++ b/kcmcddb/CMakeLists.txt
@@ -1,7 +1,5 @@
add_definitions(-DTRANSLATION_DOMAIN="libkcddb")
-add_subdirectory(doc)
-
kcoreaddons_add_plugin(kcm_cddb INSTALL_NAMESPACE "plasma/kcms/systemsettings_qwidgets")
kcmutils_generate_desktop_file(kcm_cddb)
--
2.42.1
From 2c6928ed71eb8e7c097189c22b81ea5713d8006d Mon Sep 17 00:00:00 2001
From: Begasus <begasus@gmail.com>
Date: Sun, 24 Dec 2023 15:28:08 +0100
Subject: Disable "kcmutils_generate_desktop_file", doesn't work for KF5 5.93.0
diff --git a/kcmcddb/CMakeLists.txt b/kcmcddb/CMakeLists.txt
index 56cc832..95c4cc7 100644
--- a/kcmcddb/CMakeLists.txt
+++ b/kcmcddb/CMakeLists.txt
@@ -1,7 +1,7 @@
add_definitions(-DTRANSLATION_DOMAIN="libkcddb")
kcoreaddons_add_plugin(kcm_cddb INSTALL_NAMESPACE "plasma/kcms/systemsettings_qwidgets")
-kcmutils_generate_desktop_file(kcm_cddb)
+# kcmutils_generate_desktop_file(kcm_cddb)
ki18n_wrap_ui(kcm_cddb cddbconfigwidget.ui)
--
2.42.1