kompare, bump to 25.04.0 (#12254)

2026-04-22 11:40:06 +02:00 · 2025-04-27 06:07:35 +00:00
parent 758deb5099
commit 84b51e56ef
2 changed files with 137 additions and 162 deletions
--- a/kde-apps/kompare/kompare-24.05.0.recipe
+++ b/kde-apps/kompare/kompare-24.05.0.recipe
@@ -1,162 +0,0 @@
-SUMMARY="A program to view the differences between files"
-DESCRIPTION="Kompare is a program to view the differences between files.
-
-Features include:
-  * comparison of files or directories via a graphical interface
-  * bezier-based connection widget lets you see both source and destination \
-as they really appear
-  * graphical viewing of patch files in normal, context, unified and \
-diff formats
-  * interactive application of differences
-  * full network transparency
-  * ability to view plain-text diff output in embedded viewer
-  * easy navigation of multiple-file diffs with dockable navigation tree
-  * graphical interface to commonly used diff command line options
-  * switch source and destination with one command
-  * diff statistics"
-HOMEPAGE="https://apps.kde.org/kompare/"
-COPYRIGHT="2010-2024 KDE Organisation"
-LICENSE="GNU LGPL v2"
-REVISION="1"
-SOURCE_URI="https://download.kde.org/stable/release-service/$portVersion/src/kompare-$portVersion.tar.xz"
-CHECKSUM_SHA256="f6fe60e6b3ad9e10deb53718148481ce1a83bbfff32a1edbe1e98217998a6770"
-ADDITIONAL_FILES="kompare.rdef.in"
-
-ARCHITECTURES="all !x86_gcc2"
-SECONDARY_ARCHITECTURES="x86"
-
-commandSuffix=$secondaryArchSuffix
-commandBinDir=$binDir
-if [ "$targetArchitecture" = x86_gcc2 ]; then
-	commandSuffix=
-	commandBinDir=$prefix/bin
-fi
-
-PROVIDES="
-	kompare$secondaryArchSuffix = $portVersion
-	lib:libkomparedialogpages$secondaryArchSuffix = $portVersion
-	lib:libkompareinterface$secondaryArchSuffix = $portVersion
-	cmd:kompare$commandSuffix = $portVersion
-	"
-REQUIRES="
-	haiku$secondaryArchSuffix
-	lib:libKF5Archive$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:libKF5GuiAddons$secondaryArchSuffix
-	lib:libKF5I18n$secondaryArchSuffix
-	lib:libKF5IconThemes$secondaryArchSuffix
-	lib:libKF5ItemModels$secondaryArchSuffix
-	lib:libKF5ItemViews$secondaryArchSuffix
-	lib:libKF5JobWidgets$secondaryArchSuffix
-	lib:libKF5KIOCore$secondaryArchSuffix
-	lib:libKF5KIOFileWidgets$secondaryArchSuffix
-	lib:libKF5KIOWidgets$secondaryArchSuffix
-	lib:libKF5Notifications$secondaryArchSuffix
-	lib:libKF5Parts$secondaryArchSuffix
-	lib:libKF5Service$secondaryArchSuffix
-	lib:libKF5Solid$secondaryArchSuffix
-	lib:libKF5SonnetUi$secondaryArchSuffix
-	lib:libKF5SyntaxHighlighting$secondaryArchSuffix
-	lib:libKF5TextEditor$secondaryArchSuffix
-	lib:libKF5TextWidgets$secondaryArchSuffix
-	lib:libKF5WidgetsAddons$secondaryArchSuffix
-	lib:libKF5WindowSystem$secondaryArchSuffix
-	lib:libKF5XmlGui$secondaryArchSuffix
-	lib:libkomparediff2$secondaryArchSuffix
-	lib:libQt5Core$secondaryArchSuffix
-	lib:libQt5Gui$secondaryArchSuffix
-	lib:libQt5Network$secondaryArchSuffix
-	lib:libQt5PrintSupport$secondaryArchSuffix
-	lib:libQt5Widgets$secondaryArchSuffix
-	lib:libQt5Xml$secondaryArchSuffix
-	"
-
-BUILD_REQUIRES="
-	haiku${secondaryArchSuffix}_devel
-	extra_cmake_modules$secondaryArchSuffix
-	devel:libKF5Archive$secondaryArchSuffix
-	devel:libKF5Auth$secondaryArchSuffix
-	devel:libKF5Bookmarks$secondaryArchSuffix
-	devel:libKF5Codecs$secondaryArchSuffix
-	devel:libKF5Completion$secondaryArchSuffix
-	devel:libKF5ConfigCore$secondaryArchSuffix
-	devel:libKF5ConfigGui$secondaryArchSuffix
-	devel:libKF5ConfigWidgets$secondaryArchSuffix
-	devel:libKF5CoreAddons$secondaryArchSuffix
-	devel:libKF5Crash$secondaryArchSuffix
-	devel:libKF5DocTools$secondaryArchSuffix
-	devel:libKF5GuiAddons$secondaryArchSuffix
-	devel:libKF5I18n$secondaryArchSuffix
-	devel:libKF5IconThemes$secondaryArchSuffix
-	devel:libKF5ItemModels$secondaryArchSuffix
-	devel:libKF5ItemViews$secondaryArchSuffix
-	devel:libKF5JobWidgets$secondaryArchSuffix
-	devel:libKF5KIOCore$secondaryArchSuffix
-	devel:libKF5KIOFileWidgets$secondaryArchSuffix
-	devel:libKF5KIOWidgets$secondaryArchSuffix
-	devel:libKF5Notifications$secondaryArchSuffix
-	devel:libKF5Parts$secondaryArchSuffix
-	devel:libKF5Service$secondaryArchSuffix
-	devel:libKF5Solid$secondaryArchSuffix
-	devel:libKF5SonnetUi$secondaryArchSuffix
-	devel:libKF5SyntaxHighlighting$secondaryArchSuffix
-	devel:libKF5TextEditor$secondaryArchSuffix
-	devel:libKF5TextWidgets$secondaryArchSuffix
-	devel:libKF5WidgetsAddons$secondaryArchSuffix
-	devel:libKF5WindowSystem$secondaryArchSuffix
-	devel:libKF5XmlGui$secondaryArchSuffix
-	devel:libkomparediff2$secondaryArchSuffix
-	devel:libQt5Core$secondaryArchSuffix
-	"
-BUILD_PREREQUIRES="
-	cmd:cmake
-	cmd:find
-	cmd:g++$secondaryArchSuffix
-	cmd:lrelease$secondaryArchSuffix >= 5
-	cmd:make
-	cmd:python3
-	"
-
-BUILD()
-{
-	sed -e '/add_subdirectory(doc)/ s/^#*/#/' -i CMakeLists.txt
-	sed -e '/kdoctools_install(po)/ s/^#*/#/' -i CMakeLists.txt
-
-	cmake -Bbuild -S. $cmakeDirArgs \
-		-DCMAKE_BUILD_TYPE=Release \
-		-DCMAKE_INSTALL_BINDIR=$commandBinDir \
-		-DKDE_INSTALL_PLUGINDIR=$addOnsDir/Qt5 \
-		-DECM_DIR=/system/data/cmake/Modules/ECM/cmake
-	make -C build $jobArgs
-}
-
-INSTALL()
-{
-	make -C build install
-
-	rm -rf $dataDir/{applications,icons,metainfo} $developDir
-
-	local APP_SIGNATURE="application/x-vnd.kde-kompare"
-	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/kompare.rdef.in > kompare.rdef
-
-	addResourcesToBinaries kompare.rdef $commandBinDir/kompare
-	addAppDeskbarSymlink $commandBinDir/kompare "Kompare"
-}
--- a/kde-apps/kompare/kompare-25.04.0.recipe
+++ b/kde-apps/kompare/kompare-25.04.0.recipe
@@ -0,0 +1,137 @@
+SUMMARY="A program to view the differences between files"
+DESCRIPTION="Kompare is a program to view the differences between files.
+
+Features include:
+  * comparison of files or directories via a graphical interface
+  * bezier-based connection widget lets you see both source and destination \
+as they really appear
+  * graphical viewing of patch files in normal, context, unified and \
+diff formats
+  * interactive application of differences
+  * full network transparency
+  * ability to view plain-text diff output in embedded viewer
+  * easy navigation of multiple-file diffs with dockable navigation tree
+  * graphical interface to commonly used diff command line options
+  * switch source and destination with one command
+  * diff statistics"
+HOMEPAGE="https://apps.kde.org/kompare/"
+COPYRIGHT="2010-2025 KDE Organisation"
+LICENSE="GNU LGPL v2"
+REVISION="1"
+SOURCE_URI="https://download.kde.org/stable/release-service/$portVersion/src/kompare-$portVersion.tar.xz"
+CHECKSUM_SHA256="6cede0023d7e8ca55690cb302f13050649b57dbbaa5ea5410059ac0cacf8121e"
+ADDITIONAL_FILES="kompare.rdef.in"
+
+ARCHITECTURES="all !x86_gcc2"
+SECONDARY_ARCHITECTURES="x86"
+
+PROVIDES="
+	kompare$secondaryArchSuffix = $portVersion
+	app:Kompare$commandSuffix = $portVersion
+	lib:libkomparedialogpages$secondaryArchSuffix = 6
+	lib:libkompareinterface$secondaryArchSuffix = 6
+	"
+REQUIRES="
+	haiku$secondaryArchSuffix
+	lib:libGL$secondaryArchSuffix
+	lib:libkomparediff2$secondaryArchSuffix
+	# KF6
+	lib:libKF6Codecs$secondaryArchSuffix
+	lib:libKF6ColorScheme$secondaryArchSuffix
+	lib:libKF6Completion$secondaryArchSuffix
+	lib:libKF6ConfigCore$secondaryArchSuffix
+	lib:libKF6ConfigWidgets$secondaryArchSuffix
+	lib:libKF6CoreAddons$secondaryArchSuffix
+	lib:libKF6GuiAddons$secondaryArchSuffix
+	lib:libKF6I18n$secondaryArchSuffix
+	lib:libKF6JobWidgets$secondaryArchSuffix
+	lib:libKF6KIOCore$secondaryArchSuffix
+	lib:libKF6Parts$secondaryArchSuffix
+	lib:libKF6Service$secondaryArchSuffix
+	lib:libKF6Solid$secondaryArchSuffix
+	lib:libKF6SyntaxHighlighting$secondaryArchSuffix
+	lib:libKF6TextEditor$secondaryArchSuffix
+	lib:libKF6WidgetsAddons$secondaryArchSuffix
+	lib:libKF6XmlGui$secondaryArchSuffix
+	# Qt6
+	lib:libQt6Core$secondaryArchSuffix
+	lib:libQt6Gui$secondaryArchSuffix
+	lib:libQt6Network$secondaryArchSuffix
+	lib:libQt6Widgets$secondaryArchSuffix
+	lib:libQt6Xml$secondaryArchSuffix
+	"
+
+BUILD_REQUIRES="
+	haiku${secondaryArchSuffix}_devel
+	devel:libkomparediff2$secondaryArchSuffix >= 6
+	# KF6
+	extra_cmake_modules$secondaryArchSuffix
+	devel:libKF6Codecs$secondaryArchSuffix
+	devel:libKF6ConfigCore$secondaryArchSuffix
+	devel:libKF6CoreAddons$secondaryArchSuffix
+	devel:libKF6DocTools$secondaryArchSuffix
+	devel:libKF6GuiAddons$secondaryArchSuffix
+	devel:libKF6I18n$secondaryArchSuffix
+	devel:libKF6IconThemes$secondaryArchSuffix
+	devel:libKF6JobWidgets$secondaryArchSuffix
+	devel:libKF6Parts$secondaryArchSuffix
+	devel:libKF6TextEditor$secondaryArchSuffix
+	devel:libKF6WidgetsAddons$secondaryArchSuffix
+	devel:libKF6XmlGui$secondaryArchSuffix
+	# Qt6
+	devel:libQt6Core$secondaryArchSuffix
+	"
+BUILD_PREREQUIRES="
+	cmd:cmake
+	cmd:g++$secondaryArchSuffix
+	cmd:make
+	cmd:msgfmt$secondaryArchSuffix
+	cmd:msgmerge$secondaryArchSuffix
+	"
+
+PATCH()
+{
+	# disable docs generation
+	sed -e '/add_subdirectory(doc)/ s/^#*/#/' -i CMakeLists.txt
+	sed -e '/kdoctools_install(po)/ s/^#*/#/' -i CMakeLists.txt
+}
+
+BUILD()
+{
+	sed -e '/add_subdirectory(doc)/ s/^#*/#/' -i CMakeLists.txt
+	sed -e '/kdoctools_install(po)/ s/^#*/#/' -i CMakeLists.txt
+
+	cmake -B build -S . -DCMAKE_BUILD_TYPE=Release \
+		$cmakeDirArgs \
+		-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,kio,metainfo} $developDir
+
+	mv $appsDir/kompare $appsDir/Kompare
+
+	local APP_SIGNATURE="application/x-vnd.kde-kompare"
+	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/kompare.rdef.in > kompare.rdef
+
+	addResourcesToBinaries kompare.rdef $appsDir/Kompare
+	addAppDeskbarSymlink $appsDir/Kompare
+}