From e833738e3db01b34b820ce6e606dc995f53b5291 Mon Sep 17 00:00:00 2001 From: Schrijvers Luc Date: Wed, 14 May 2025 09:34:17 +0200 Subject: [PATCH] kdiamond, bump to 25.04.0 (#12375) --- ...iamond-24.12.3.recipe => kdiamond-25.04.0.recipe} | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) rename kde-apps/kdiamond/{kdiamond-24.12.3.recipe => kdiamond-25.04.0.recipe} (92%) diff --git a/kde-apps/kdiamond/kdiamond-24.12.3.recipe b/kde-apps/kdiamond/kdiamond-25.04.0.recipe similarity index 92% rename from kde-apps/kdiamond/kdiamond-24.12.3.recipe rename to kde-apps/kdiamond/kdiamond-25.04.0.recipe index 12c981bdc..64ca0ed0d 100644 --- a/kde-apps/kdiamond/kdiamond-24.12.3.recipe +++ b/kde-apps/kdiamond/kdiamond-25.04.0.recipe @@ -14,7 +14,7 @@ COPYRIGHT="2010-2025 KDE Organisation" LICENSE="GNU GPL v2" REVISION="1" SOURCE_URI="https://download.kde.org/stable/release-service/$portVersion/src/kdiamond-$portVersion.tar.xz" -CHECKSUM_SHA256="b10e8110a1d122c387ff678030fb1f5e527fed8b603170663f23bd90d5955ed2" +CHECKSUM_SHA256="04328eee9500b0285c79ff10fb518714ba2d9a6b2d2e9a991f5fd7c95c7b4ea8" SOURCE_DIR="kdiamond-$portVersion" ADDITIONAL_FILES="kdiamond.rdef.in" @@ -23,7 +23,7 @@ SECONDARY_ARCHITECTURES="x86" PROVIDES=" kdiamond$secondaryArchSuffix = $portVersion - cmd:kdiamond$secondaryArchSuffix = $portVersion + app:KDiamond = $portVersion " REQUIRES=" haiku$secondaryArchSuffix @@ -38,6 +38,7 @@ REQUIRES=" lib:libKF6DBusAddons$secondaryArchSuffix lib:libKF6GuiAddons$secondaryArchSuffix lib:libKF6I18n$secondaryArchSuffix + lib:libKF6IconThemes$secondaryArchSuffix lib:libKF6Notifications$secondaryArchSuffix lib:libKF6NotifyConfig$secondaryArchSuffix lib:libKF6WidgetsAddons$secondaryArchSuffix @@ -65,6 +66,7 @@ BUILD_REQUIRES=" devel:libKF6DBusAddons$secondaryArchSuffix devel:libKF6GuiAddons$secondaryArchSuffix devel:libKF6I18n$secondaryArchSuffix + devel:libKF6IconThemes$secondaryArchSuffix devel:libKF6Notifications$secondaryArchSuffix devel:libKF6NotifyConfig$secondaryArchSuffix devel:libKF6WidgetsAddons$secondaryArchSuffix @@ -88,6 +90,8 @@ PATCH() sed -e '/kdoctools_install(po)/ s/^#*/#/' -i CMakeLists.txt # remove dbus service sed -e '/KDBusService service;/d' -i src/main.cpp + # use Haiku's icon theme + sed -e 's,\ KIconTheme::initTheme();,\// KIconTheme::initTheme();,g' -i src/main.cpp } BUILD() @@ -109,17 +113,17 @@ INSTALL() # cleanup rm -rf $dataDir/{applications,icons,metainfo} - local APP_SIGNATURE="application/x-vnd.kde-kdiamond" 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" + local APP_SIGNATURE="application/x-vnd.kde-kdiamond" 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|" \ + -e "s|@APP_SIGNATURE@|$APP_SIGNATURE|" \ $portDir/additional-files/kdiamond.rdef.in > kdiamond.rdef addResourcesToBinaries kdiamond.rdef $appsDir/KDiamond