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

kid3, bump version (#11362)

Browse Source
This commit is contained in:
Schrijvers Luc
2024-11-23 11:35:43 +01:00
committed by GitHub
parent fb251fb96a
commit 0826c8ee5a
3 changed files with 24 additions and 53 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
media-sound/kid3/kid3-3.9.5.recipe → media-sound/kid3/kid3-3.9.6.recipe
View File

@@ -17,7 +17,7 @@ COPYRIGHT="2003-2024 Urs Fleisch"
LICENSE="GNU GPL v2"
REVISION="1"
SOURCE_URI="https://download.kde.org/stable/kid3/$portVersion/kid3-$portVersion.tar.xz"
CHECKSUM_SHA256="a424fedde35c176e3b44334422aad43848418772da020751d00d0874e5ce8145"
CHECKSUM_SHA256="cf27ffcc4369c9940da7bfc12fd10dfbda526b8187e5b62662abe8069fc26c27"
PATCHES="kid3-$portVersion.patchset"
ADDITIONAL_FILES="kid3.rdef.in"
@@ -112,7 +112,7 @@ BUILD()
-DECM_DIR=/system/data/cmake/Modules/ECM/cmake \
-DDOCBOOK_XSL_DIR=/system/data/xml/docbook/xsl-stylesheets-1.79.2 \
-DWITH_APPS="CLI;Qt;KDE" \
-DLIB_SUFFIX="$secondaryArchSuffix" \
-DLIB_SUFFIX="$secondaryArchSubDir" \
-DWITH_DBUS=OFF
make -C build $jobArgs
}

51
media-sound/kid3/patches/kid3-3.9.5.patchset
View File

@@ -1,51 +0,0 @@
From 18de459335880bcf3cd5d4c212c94dcba7d04ff4 Mon Sep 17 00:00:00 2001
From: Schrijvers Luc <begasus@gmail.com>
Date: Wed, 22 May 2024 09:12:16 +0200
Subject: Add Haiku specific paths
diff --git a/CMakeLists.txt b/CMakeLists.txt
index ddb7afc..c29405f 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -140,6 +140,14 @@ elseif(ANDROID)
set(WITH_PLUGINSDIR_DEFAULT ".")
set(QT_ANDROID_APP_VERSION ${KID3_VERSION})
set(QT_ANDROID_APP_VERSION_CODE 29)
+elseif(HAIKU)
+ set(WITH_DATAROOTDIR_DEFAULT "data")
+ set(WITH_DOCDIR_DEFAULT "documentation/packages/kid3-qt")
+ set(WITH_TRANSLATIONSDIR_DEFAULT "data/kid3/translations")
+ set(WITH_QMLDIR_DEFAULT "data/Qt6/qml")
+ set(WITH_BINDIR_DEFAULT "bin")
+ set(WITH_LIBDIR_DEFAULT "lib${LIB_SUFFIX}/kid3")
+ set(WITH_PLUGINSDIR_DEFAULT "add-ons/Qt6/kid3")
else()
set(WITH_DATAROOTDIR_DEFAULT "share")
set(WITH_DOCDIR_DEFAULT "share/doc/kid3-qt")
--
2.43.2
From 5c4b75b751bbd2bb1c65d1b4be4ab5e2131cd92e Mon Sep 17 00:00:00 2001
From: Schrijvers Luc <begasus@gmail.com>
Date: Wed, 22 May 2024 10:31:36 +0200
Subject: Fix hardcoded "share" path
diff --git a/CMakeLists.txt b/CMakeLists.txt
index c29405f..c7bea6d 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -165,7 +165,7 @@ endif()
set(WITH_DATAROOTDIR ${WITH_DATAROOTDIR_DEFAULT} CACHE STRING
"data root directory relative to CMAKE_INSTALL_PREFIX")
if(BUILD_KDE_APP)
- set(WITH_DBUSDIR "share/dbus-1/interfaces" CACHE STRING
+ set(WITH_DBUSDIR "${WITH_DATAROOTDIR}/dbus-1/interfaces" CACHE STRING
"dbus directory relative to CMAKE_INSTALL_PREFIX")
endif()
set(WITH_DOCDIR ${WITH_DOCDIR_DEFAULT} CACHE STRING
--
2.43.2

22
media-sound/kid3/patches/kid3-3.9.6.patchset Normal file
View File

@@ -0,0 +1,22 @@
From 4f4d19c0737ee2a9e6cd88aa734794bb1e03ff7e Mon Sep 17 00:00:00 2001
From: Schrijvers Luc <begasus@gmail.com>
Date: Wed, 22 May 2024 10:31:36 +0200
Subject: Fix hardcoded "share" path
diff --git a/CMakeLists.txt b/CMakeLists.txt
index e22c70a..39811aa 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -168,7 +168,7 @@ endif()
set(WITH_DATAROOTDIR ${WITH_DATAROOTDIR_DEFAULT} CACHE STRING
"data root directory relative to CMAKE_INSTALL_PREFIX")
if(BUILD_KDE_APP)
- set(WITH_DBUSDIR "share/dbus-1/interfaces" CACHE STRING
+ set(WITH_DBUSDIR "${WITH_DATAROOTDIR_DEFAULT}/dbus-1/interfaces" CACHE STRING
"dbus directory relative to CMAKE_INSTALL_PREFIX")
endif()
set(WITH_DOCDIR ${WITH_DOCDIR_DEFAULT} CACHE STRING
--
2.45.2