diff --git a/kde-apps/knetwalk/knetwalk-24.12.3.recipe b/kde-apps/knetwalk/knetwalk-25.04.0.recipe similarity index 95% rename from kde-apps/knetwalk/knetwalk-24.12.3.recipe rename to kde-apps/knetwalk/knetwalk-25.04.0.recipe index 42f829ff4..da6adc943 100644 --- a/kde-apps/knetwalk/knetwalk-24.12.3.recipe +++ b/kde-apps/knetwalk/knetwalk-25.04.0.recipe @@ -6,8 +6,7 @@ COPYRIGHT="2010-2025 KDE Organisation" LICENSE="GNU GPL v2" REVISION="1" SOURCE_URI="https://download.kde.org/stable/release-service/$portVersion/src/knetwalk-$portVersion.tar.xz" -CHECKSUM_SHA256="8f6345ad9063d863dae5e52e207fb9aa7cf7d3133479c9f7ca1ffed1738fa3b6" -PATCHES="knetwalk-$portVersion.patchset" +CHECKSUM_SHA256="7d52cb92cf6ec7e67f28b86488562ebd23db6959677995b1d97cea773a333bb5" ADDITIONAL_FILES="knetwalk.rdef.in" ARCHITECTURES="all !x86_gcc2" @@ -15,7 +14,7 @@ SECONDARY_ARCHITECTURES="x86" PROVIDES=" knetwalk$secondaryArchSuffix = $portVersion - app:KNetWalk$secondaryArchSuffix = $portVersion + app:KNetWalk = $portVersion " REQUIRES=" haiku$secondaryArchSuffix @@ -100,6 +99,8 @@ PATCH() # disable docs generation sed -e '/add_subdirectory(doc)/ s/^#*/#/' -i CMakeLists.txt sed -e '/kdoctools_install(po)/ s/^#*/#/' -i CMakeLists.txt + # use Haiku's icon theme + sed -e 's,\ KIconTheme::initTheme();,\// KIconTheme::initTheme();,g' -i src/main.cpp } BUILD() @@ -122,17 +123,17 @@ INSTALL() # cleanup rm -rf $dataDir/{applications,metainfo} - local APP_SIGNATURE="application/x-vnd.kde-knetwalk" 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-knetwalk" 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/knetwalk.rdef.in > knetwalk.rdef addResourcesToBinaries knetwalk.rdef $appsDir/KNetWalk diff --git a/kde-apps/knetwalk/patches/knetwalk-24.12.3.patchset b/kde-apps/knetwalk/patches/knetwalk-24.12.3.patchset deleted file mode 100644 index a95927f69..000000000 --- a/kde-apps/knetwalk/patches/knetwalk-24.12.3.patchset +++ /dev/null @@ -1,106 +0,0 @@ -From 423938d75b061538263870acc14d4192fcc156ee Mon Sep 17 00:00:00 2001 -From: Schrijvers Luc -Date: Sat, 21 Dec 2024 13:56:40 +0100 -Subject: Disable HAVE_KDBUSADDONS on Haiku - - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index e9f7850..b811ad9 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -40,7 +40,6 @@ find_package(KF6 ${KF_MIN_VERSION} REQUIRED COMPONENTS - ConfigWidgets - CoreAddons - Crash -- DBusAddons - DocTools - I18n - TextWidgets -@@ -50,6 +49,13 @@ find_package(KF6 ${KF_MIN_VERSION} REQUIRED COMPONENTS - - find_package(KDEGames6 6.0.0 REQUIRED) - -+if(NOT HAIKU) -+ set(HAVE_KDBUSADDONS ON) -+ find_package(KF6 ${KF_MIN_VERSION} REQUIRED COMPONENTS -+ DBusAddons -+ ) -+endif() -+ - ecm_set_disabled_deprecation_versions( - QT 6.8.0 - KF 6.5 -diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt -index 2f7d316..97a8f39 100644 ---- a/src/CMakeLists.txt -+++ b/src/CMakeLists.txt -@@ -1,3 +1,6 @@ -+configure_file( ${CMAKE_CURRENT_SOURCE_DIR}/config-knetwalk.h.cmake -+ ${CMAKE_CURRENT_BINARY_DIR}/config-knetwalk.h ) -+ - add_subdirectory(pics) - add_subdirectory(sounds) - -@@ -29,13 +32,18 @@ target_link_libraries(knetwalk - KDEGames6 - KF6::CoreAddons - KF6::Crash -- KF6::DBusAddons - KF6::I18n - KF6::TextWidgets - KF6::XmlGui - Qt6::QuickWidgets - ) - -+if(HAVE_KDBUSADDONS) -+ target_link_libraries(knetwalk -+ KF6::DBusAddons -+ ) -+endif() -+ - install(TARGETS knetwalk ${KDE_INSTALL_TARGETS_DEFAULT_ARGS}) - - install(DIRECTORY qml DESTINATION ${KDE_INSTALL_DATADIR}/knetwalk) -diff --git a/src/config-knetwalk.h.cmake b/src/config-knetwalk.h.cmake -new file mode 100644 -index 0000000..07e6c0f ---- /dev/null -+++ b/src/config-knetwalk.h.cmake -@@ -0,0 +1 @@ -+#cmakedefine01 HAVE_KDBUSADDONS -diff --git a/src/main.cpp b/src/main.cpp -index 27b5481..780881c 100644 ---- a/src/main.cpp -+++ b/src/main.cpp -@@ -5,13 +5,17 @@ - SPDX-License-Identifier: GPL-2.0-or-later - */ - -+#include "config-knetwalk.h" -+ - #include "mainwindow.h" - #include "knetwalk_version.h" - - #include - #include - #include --#include -+#if HAVE_KDBUSADDONS -+ #include -+#endif - - #include - #include -@@ -59,7 +63,9 @@ int main(int argc, char ** argv) - about.processCommandLine(&parser); - - KCrash::initialize(); -+#if HAVE_KDBUSADDONS - KDBusService service; -+#endif - - app.setWindowIcon(QIcon::fromTheme(QStringLiteral("knetwalk"))); - --- -2.48.1 -