minuet, bump to version 24.12.3, switch to KF6 (#12074)

2026-04-09 05:10:05 +02:00 · 2025-03-25 07:01:37 +00:00
parent 7e0fc06d74
commit 73c165281f
4 changed files with 181 additions and 177 deletions
--- a/kde-apps/minuet/minuet-23.08.5.recipe
+++ b/kde-apps/minuet/minuet-23.08.5.recipe
@@ -1,153 +0,0 @@
-SUMMARY="Music Education software by KDE"
-DESCRIPTION="Minuet is a free and open source software for music education. \
-It is part of KDE Edu ‒ the suite of educational applications developed by \
-the KDE Community.
-
-* Enhance your musical perception skills
-* Visualize exercises on the piano keyboard
-* Adjust playing settings to your needs
-* Create your own musical exercises"
-HOMEPAGE="https://apps.kde.org/minuet"
-COPYRIGHT="2010-2024 KDE Organisation"
-LICENSE="GNU GPL v2"
-REVISION="2"
-SOURCE_URI="https://download.kde.org/stable/release-service/$portVersion/src/minuet-$portVersion.tar.xz"
-CHECKSUM_SHA256="75346d4a6a7b9533aa1c1319544699d644ecb97b666e449cdf1587f552f265ae"
-PATCHES="minuet-$portVersion.patchset"
-ADDITIONAL_FILES="minuet.rdef.in"
-
-ARCHITECTURES="all !x86_gcc2"
-SECONDARY_ARCHITECTURES="x86"
-
-PROVIDES="
-	minuet$secondaryArchSuffix = $portVersion
-	app:Minuet$secondaryArchSuffix = $portVersion
-	lib:libminuetinterfaces$secondaryArchSuffix = 0.3.0 compat >= 0.3
-	"
-REQUIRES="
-	haiku$secondaryArchSuffix
-	lib:libfluidsynth$secondaryArchSuffix
-	lib:libKF5Archive$secondaryArchSuffix
-	lib:libKF5Attica$secondaryArchSuffix
-	lib:libKF5Auth$secondaryArchSuffix
-	lib:libKF5Bookmarks$secondaryArchSuffix
-	lib:libKF5Codecs$secondaryArchSuffix
-	lib:libKF5Completion$secondaryArchSuffix
-	lib:libKF5ConfigCore$secondaryArchSuffix
-	lib:libKF5ConfigGui$secondaryArchSuffix
-	lib:libKF5ConfigWidgets$secondaryArchSuffix
-	lib:libKF5CoreAddons$secondaryArchSuffix
-	lib:libKF5Crash$secondaryArchSuffix
-	lib:libKF5DBusAddons$secondaryArchSuffix
-	lib:libKF5GuiAddons$secondaryArchSuffix
-	lib:libKF5I18n$secondaryArchSuffix
-	lib:libKF5IconThemes$secondaryArchSuffix
-	lib:libKF5ItemViews$secondaryArchSuffix
-	lib:libKF5JobWidgets$secondaryArchSuffix
-	lib:libKF5KDEGames$secondaryArchSuffix
-	lib:libKF5KIOCore$secondaryArchSuffix
-	lib:libKF5NewStuff$secondaryArchSuffix
-	lib:libKF5Service$secondaryArchSuffix
-	lib:libKF5Solid$secondaryArchSuffix
-	lib:libKF5TextEditor$secondaryArchSuffix
-	lib:libKF5TextWidgets$secondaryArchSuffix
-	lib:libKF5WidgetsAddons$secondaryArchSuffix
-	lib:libKF5WindowSystem$secondaryArchSuffix
-	lib:libKF5XmlGui$secondaryArchSuffix
-	lib:libphonon4qt5$secondaryArchSuffix
-	lib:libQt5Core$secondaryArchSuffix
-	lib:libQt5DBus$secondaryArchSuffix
-	lib:libQt5Gui$secondaryArchSuffix
-	lib:libQt5Widgets$secondaryArchSuffix
-	lib:libQt5Xml$secondaryArchSuffix
-	"
-
-BUILD_REQUIRES="
-	haiku${secondaryArchSuffix}_devel
-	extra_cmake_modules$secondaryArchSuffix
-	devel:libfluidsynth$secondaryArchSuffix >= 2
-	devel:libKF5Archive$secondaryArchSuffix
-	devel:libKF5Attica$secondaryArchSuffix
-	devel:libKF5Auth$secondaryArchSuffix
-	devel:libKF5Bookmarks$secondaryArchSuffix
-	devel:libKF5Codecs$secondaryArchSuffix
-	devel:libKF5Completion$secondaryArchSuffix
-	devel:libKF5ConfigCore$secondaryArchSuffix
-	devel:libKF5ConfigWidgets$secondaryArchSuffix
-	devel:libKF5CoreAddons$secondaryArchSuffix
-	devel:libKF5Crash$secondaryArchSuffix
-	devel:libKF5DBusAddons$secondaryArchSuffix
-	devel:libKF5DocTools$secondaryArchSuffix
-	devel:libKF5GuiAddons$secondaryArchSuffix
-	devel:libKF5I18n$secondaryArchSuffix
-	devel:libKF5IconThemes$secondaryArchSuffix
-	devel:libKF5ItemModels$secondaryArchSuffix
-	devel:libKF5ItemViews$secondaryArchSuffix
-	devel:libKF5JobWidgets$secondaryArchSuffix
-	devel:libKF5KDEGames$secondaryArchSuffix
-	devel:libKF5KIOCore$secondaryArchSuffix
-	devel:libKF5NewStuff$secondaryArchSuffix
-	devel:libKF5Service$secondaryArchSuffix
-	devel:libKF5Solid$secondaryArchSuffix
-	devel:libKF5TextEditor$secondaryArchSuffix
-	devel:libKF5TextWidgets$secondaryArchSuffix
-	devel:libKF5WidgetsAddons$secondaryArchSuffix
-	devel:libKF5WindowSystem$secondaryArchSuffix
-	devel:libKF5XmlGui$secondaryArchSuffix
-	devel:libphonon4qt5$secondaryArchSuffix
-	devel:libQt5Core$secondaryArchSuffix
-	"
-BUILD_PREREQUIRES="
-	cmd:cmake
-	cmd:g++$secondaryArchSuffix
-	cmd:lrelease$secondaryArchSuffix >= 5
-	cmd:make
-	cmd:pkg_config$secondaryArchSuffix
-	"
-
-BUILD()
-{
-	# disable docs generation
-	sed -e '/add_subdirectory(doc)/ s/^#*/#/' -i CMakeLists.txt
-	sed -e '/kdoctools_install(po)/ s/^#*/#/' -i CMakeLists.txt
-
-	mkdir -p build
-	cd build
-
-	cmake .. \
-		-DCMAKE_BUILD_TYPE=Release \
-		-DCMAKE_INSTALL_PREFIX=$appsDir \
-		-DCMAKE_INSTALL_LIBDIR=$libDir \
-		-DCMAKE_INSTALL_DATADIR=$dataDir \
-		-DCMAKE_INSTALL_DATAROOTDIR=$dataDir \
-		-DSHARE_INSTALL_PREFIX=$dataDir \
-		-DKDE_INSTALL_PLUGINDIR=$addOnsDir/Qt5 \
-		-DECM_DIR=/system/data/cmake/Modules/ECM/cmake
-
-	make $jobArgs
-}
-
-INSTALL()
-{
-	cd build
-	make install
-
-	mv $appsDir/bin/minuet $appsDir/Minuet
-	rm -rf $appsDir/{bin,include}
-
-	local APP_SIGNATURE="application/x-vnd.kde-minuet"
-	local MAJOR="`echo "$portVersion" | cut -d. -f1`"
-	local MIDDLE="`echo "$portVersion" | cut -d. -f2`"
-	local MINOR="`echo "$portVersion" | cut -d. -f3`"
-	local LONG_INFO="$SUMMARY"
-	sed \
-		-e "s|@APP_SIGNATURE@|$APP_SIGNATURE|" \
-		-e "s|@MAJOR@|$MAJOR|" \
-		-e "s|@MIDDLE@|$MIDDLE|" \
-		-e "s|@MINOR@|$MINOR|" \
-		-e "s|@LONG_INFO@|$LONG_INFO|" \
-		$portDir/additional-files/minuet.rdef.in > minuet.rdef
-
-	addResourcesToBinaries minuet.rdef $appsDir/Minuet
-	addAppDeskbarSymlink $appsDir/Minuet
-}
--- a/kde-apps/minuet/minuet-24.12.3.recipe
+++ b/kde-apps/minuet/minuet-24.12.3.recipe
@@ -0,0 +1,179 @@
+SUMMARY="Music Education software by KDE"
+DESCRIPTION="Minuet is a free and open source software for music education. \
+It is part of KDE Edu ‒ the suite of educational applications developed by \
+the KDE Community.
+
+* Enhance your musical perception skills
+* Visualize exercises on the piano keyboard
+* Adjust playing settings to your needs
+* Create your own musical exercises"
+HOMEPAGE="https://apps.kde.org/minuet"
+COPYRIGHT="2010-2025 KDE Organisation"
+LICENSE="GNU GPL v2"
+REVISION="1"
+SOURCE_URI="https://download.kde.org/stable/release-service/$portVersion/src/minuet-$portVersion.tar.xz"
+CHECKSUM_SHA256="cdc73e908282e4d087cc9f6932c134835bbff784cd1bf6b56e3d3dc9749a2f77"
+SOURCE_DIR="minuet-$portVersion"
+PATCHES="minuet-$portVersion.patchset"
+ADDITIONAL_FILES="minuet.rdef.in"
+
+ARCHITECTURES="all !x86_gcc2"
+SECONDARY_ARCHITECTURES="x86"
+
+libVersion="0.3.0"
+libVersionCompat="$libVersion compat >= ${libVersion%.*}"
+
+PROVIDES="
+	minuet$secondaryArchSuffix = $portVersion
+	app:Minuet$secondaryArchSuffix = $portVersion
+	lib:libminuetinterfaces$secondaryArchSuffix = $libVersionCompat
+	"
+REQUIRES="
+	haiku$secondaryArchSuffix
+	lib:libfluidsynth$secondaryArchSuffix
+	lib:libGL$secondaryArchSuffix
+	lib:libKDEGames6$secondaryArchSuffix
+	lib:libphonon4qt6$secondaryArchSuffix
+	# KF6
+	lib:libKF6Archive$secondaryArchSuffix
+	lib:libKF6Attica$secondaryArchSuffix
+	lib:libKF6AuthCore$secondaryArchSuffix
+	lib:libKF6Bookmarks$secondaryArchSuffix
+	lib:libKF6Codecs$secondaryArchSuffix
+	lib:libKF6Completion$secondaryArchSuffix
+	lib:libKF6ConfigCore$secondaryArchSuffix
+	lib:libKF6ConfigGui$secondaryArchSuffix
+	lib:libKF6ConfigWidgets$secondaryArchSuffix
+	lib:libKF6CoreAddons$secondaryArchSuffix
+	lib:libKF6Crash$secondaryArchSuffix
+	lib:libKF6DBusAddons$secondaryArchSuffix
+	lib:libKF6GuiAddons$secondaryArchSuffix
+	lib:libKF6I18n$secondaryArchSuffix
+	lib:libKF6IconThemes$secondaryArchSuffix
+	lib:libKF6ItemViews$secondaryArchSuffix
+	lib:libKF6JobWidgets$secondaryArchSuffix
+	lib:libKF6KIOCore$secondaryArchSuffix
+	lib:libKF6NewStuffCore$secondaryArchSuffix
+	lib:libKF6Service$secondaryArchSuffix
+	lib:libKF6Solid$secondaryArchSuffix
+	lib:libKF6TextEditor$secondaryArchSuffix
+	lib:libKF6TextWidgets$secondaryArchSuffix
+	lib:libKF6WidgetsAddons$secondaryArchSuffix
+	lib:libKF6WindowSystem$secondaryArchSuffix
+	lib:libKF6XmlGui$secondaryArchSuffix
+	# Qt6
+	lib:libQt6Core$secondaryArchSuffix
+	lib:libQt6DBus$secondaryArchSuffix
+	lib:libQt6Gui$secondaryArchSuffix
+	lib:libQt6Qml$secondaryArchSuffix
+	lib:libQt6Quick$secondaryArchSuffix
+	lib:libQt6Svg$secondaryArchSuffix
+	lib:libQt6Widgets$secondaryArchSuffix
+	lib:libQt6Xml$secondaryArchSuffix
+	"
+
+PROVIDES_devel="
+	minuet${secondaryArchSuffix}_devel = $portVersion
+	devel:libminuetinterfaces$secondaryArchSuffix = $libVersionCompat
+	"
+REQUIRES_devel="
+	minuet$secondaryArchSuffix == $portVersion base
+	"
+
+BUILD_REQUIRES="
+	haiku${secondaryArchSuffix}_devel
+	devel:libfluidsynth$secondaryArchSuffix >= 2
+	devel:libphonon4qt6$secondaryArchSuffix
+	# KF6
+	extra_cmake_modules$secondaryArchSuffix
+	devel:libKDEGames6$secondaryArchSuffix
+	devel:libKF6Archive$secondaryArchSuffix
+	devel:libKF6Attica$secondaryArchSuffix
+	devel:libKF6AuthCore$secondaryArchSuffix
+	devel:libKF6Bookmarks$secondaryArchSuffix
+	devel:libKF6Codecs$secondaryArchSuffix
+	devel:libKF6Completion$secondaryArchSuffix
+	devel:libKF6ConfigCore$secondaryArchSuffix
+	devel:libKF6ConfigWidgets$secondaryArchSuffix
+	devel:libKF6CoreAddons$secondaryArchSuffix
+	devel:libKF6Crash$secondaryArchSuffix
+	devel:libKF6DBusAddons$secondaryArchSuffix
+	devel:libKF6DocTools$secondaryArchSuffix
+	devel:libKF6GuiAddons$secondaryArchSuffix
+	devel:libKF6I18n$secondaryArchSuffix
+	devel:libKF6IconThemes$secondaryArchSuffix
+	devel:libKF6ItemModels$secondaryArchSuffix
+	devel:libKF6ItemViews$secondaryArchSuffix
+	devel:libKF6JobWidgets$secondaryArchSuffix
+	devel:libKF6KIOCore$secondaryArchSuffix
+	devel:libKF6NewStuffCore$secondaryArchSuffix
+	devel:libKF6Service$secondaryArchSuffix
+	devel:libKF6Solid$secondaryArchSuffix
+	devel:libKF6TextEditor$secondaryArchSuffix
+	devel:libKF6TextWidgets$secondaryArchSuffix
+	devel:libKF6WidgetsAddons$secondaryArchSuffix
+	devel:libKF6WindowSystem$secondaryArchSuffix
+	devel:libKF6XmlGui$secondaryArchSuffix
+	# Qt6
+	devel:libQt6Core$secondaryArchSuffix
+	devel:libQt6Qml$secondaryArchSuffix
+	devel:libQt6Svg$secondaryArchSuffix
+	"
+BUILD_PREREQUIRES="
+	cmd:cmake
+	cmd:g++$secondaryArchSuffix
+	cmd:make
+	cmd:msgfmt$secondaryArchSuffix
+	cmd:msgmerge$secondaryArchSuffix
+	cmd:pkg_config$secondaryArchSuffix
+	"
+
+PATCH()
+{
+	# disable docs generation
+	sed -e '/add_subdirectory(doc)/ s/^#*/#/' -i 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 \
+		-DCMAKE_INSTALL_BINDIR=$appsDir \
+		-DKDE_INSTALL_PLUGINDIR=$addOnsDir/Qt6 \
+		-DECM_DIR=/system/data/cmake/Modules/ECM/cmake
+
+	make -C build $jobArgs
+}
+
+INSTALL()
+{
+	make -C build install
+
+	# cleanup
+	rm -rf $dataDir/{applications,icons,metainfo}
+
+	mv $appsDir/minuet $appsDir/Minuet
+
+	local APP_SIGNATURE="application/x-vnd.kde-minuet"
+	local MAJOR="`echo "$portVersion" | cut -d. -f1`"
+	local MIDDLE="`echo "$portVersion" | cut -d. -f2`"
+	local MINOR="`echo "$portVersion" | cut -d. -f3`"
+	local LONG_INFO="$SUMMARY"
+	sed \
+		-e "s|@APP_SIGNATURE@|$APP_SIGNATURE|" \
+		-e "s|@MAJOR@|$MAJOR|" \
+		-e "s|@MIDDLE@|$MIDDLE|" \
+		-e "s|@MINOR@|$MINOR|" \
+		-e "s|@LONG_INFO@|$LONG_INFO|" \
+		$portDir/additional-files/minuet.rdef.in > minuet.rdef
+
+	addResourcesToBinaries minuet.rdef $appsDir/Minuet
+	addAppDeskbarSymlink $appsDir/Minuet
+
+	prepareInstalledDevelLib libminuetinterfaces
+
+	packageEntries devel \
+		$developDir
+}
--- a/kde-apps/minuet/patches/minuet-22.04.0.patchset
+++ b/kde-apps/minuet/patches/minuet-22.04.0.patchset
@@ -1,22 +0,0 @@
-From 5b9c30c7774cf762c0c98bea6d29b04c06dbdf7e Mon Sep 17 00:00:00 2001
-From: Gerasim Troeglazov <3dEyes@gmail.com>
-Date: Wed, 11 May 2022 21:00:31 +1000
-Subject: Adjust main window size
-
-
-diff --git a/src/app/qml/Main.qml b/src/app/qml/Main.qml
-index 591ee6a..2d9780c 100644
--- a/src/app/qml/Main.qml
-+++ b/src/app/qml/Main.qml
-@@ -29,7 +29,7 @@ import QtQuick.Controls.Material 2.0
- ApplicationWindow {
-     id: applicationWindow
-     visible: true
-    width: Screen.desktopAvailableWidth; height: Screen.desktopAvailableHeight
-+    width: Screen.desktopAvailableWidth * 0.75; height: Screen.desktopAvailableHeight * 0.75
- 
-     property string titleText: "Minuet"
- 
-- 
-2.30.2
-
--- a/kde-apps/minuet/patches/minuet-24.12.3.patchset
+++ b/kde-apps/minuet/patches/minuet-24.12.3.patchset
@@ -1,4 +1,4 @@
-From bcf62939063540f5ea8b9f354aad62c63c00bff9 Mon Sep 17 00:00:00 2001
+From d6a5041db8612ddc5abffb2ad5ed79603dfbc9bd Mon Sep 17 00:00:00 2001
 From: Gerasim Troeglazov <3dEyes@gmail.com>
 Date: Mon, 4 Mar 2024 21:28:23 +1000
 Subject: Fix for Haiku
@@ -34,5 +34,5 @@ index cbe6127..d28a0ea 100644
     m_audioDriver = new_fluid_audio_driver(m_settings, m_synth);
     if (!m_audioDriver) {
 -- 
-2.43.2
+2.48.1