From 6b763ffb8d05dca0cf7f67aaab009d3eb27469e8 Mon Sep 17 00:00:00 2001 From: Schrijvers Luc Date: Sat, 21 Dec 2024 14:47:33 +0100 Subject: [PATCH] knetwalk, bump version (#11509) --- ...24.05.0.recipe => knetwalk-24.12.0.recipe} | 46 +++++--- .../patches/knetwalk-24.12.0.patchset | 106 ++++++++++++++++++ 2 files changed, 135 insertions(+), 17 deletions(-) rename kde-apps/knetwalk/{knetwalk24-24.05.0.recipe => knetwalk-24.12.0.recipe} (84%) create mode 100644 kde-apps/knetwalk/patches/knetwalk-24.12.0.patchset diff --git a/kde-apps/knetwalk/knetwalk24-24.05.0.recipe b/kde-apps/knetwalk/knetwalk-24.12.0.recipe similarity index 84% rename from kde-apps/knetwalk/knetwalk24-24.05.0.recipe rename to kde-apps/knetwalk/knetwalk-24.12.0.recipe index 2a9712b2a..b470582e9 100644 --- a/kde-apps/knetwalk/knetwalk24-24.05.0.recipe +++ b/kde-apps/knetwalk/knetwalk-24.12.0.recipe @@ -4,23 +4,24 @@ terminals to the server in the fewest turns possible." HOMEPAGE="https://apps.kde.org/knetwalk" COPYRIGHT="2010-2024 KDE Organisation" LICENSE="GNU GPL v2" -REVISION="2" +REVISION="1" SOURCE_URI="https://download.kde.org/stable/release-service/$portVersion/src/knetwalk-$portVersion.tar.xz" -CHECKSUM_SHA256="100cfe198db85e59710bae48d034e9efd41c7034e119c866a1635c6dfd94a618" -SOURCE_DIR="knetwalk-$portVersion" +CHECKSUM_SHA256="b933cf1f67b917a618e2aad6aaf26aae3d965f0879126b7991b64f124d536014" +PATCHES="knetwalk-$portVersion.patchset" ADDITIONAL_FILES="knetwalk.rdef.in" ARCHITECTURES="all !x86_gcc2" SECONDARY_ARCHITECTURES="x86" PROVIDES=" - knetwalk24$secondaryArchSuffix = $portVersion - cmd:knetwalk$secondaryArchSuffix = $portVersion + knetwalk$secondaryArchSuffix = $portVersion + app:KNetWalk$secondaryArchSuffix = $portVersion " REQUIRES=" haiku$secondaryArchSuffix lib:libGL$secondaryArchSuffix lib:libKDEGames6$secondaryArchSuffix + # KF6 lib:libKF6AuthCore$secondaryArchSuffix lib:libKF6Codecs$secondaryArchSuffix lib:libKF6ColorScheme$secondaryArchSuffix @@ -30,7 +31,6 @@ REQUIRES=" lib:libKF6ConfigWidgets$secondaryArchSuffix lib:libKF6CoreAddons$secondaryArchSuffix lib:libKF6Crash$secondaryArchSuffix - lib:libKF6DBusAddons$secondaryArchSuffix lib:libKF6GuiAddons$secondaryArchSuffix lib:libKF6I18n$secondaryArchSuffix lib:libKF6IconThemes$secondaryArchSuffix @@ -45,6 +45,7 @@ REQUIRES=" lib:libKF6WidgetsAddons$secondaryArchSuffix lib:libKF6WindowSystem$secondaryArchSuffix lib:libKF6XmlGui$secondaryArchSuffix + # Qt6 lib:libQt6Core$secondaryArchSuffix lib:libQt6DBus$secondaryArchSuffix lib:libQt6Gui$secondaryArchSuffix @@ -55,8 +56,9 @@ REQUIRES=" BUILD_REQUIRES=" haiku${secondaryArchSuffix}_devel - extra_cmake_modules$secondaryArchSuffix devel:libKDEGames6$secondaryArchSuffix + # KF6 + extra_cmake_modules$secondaryArchSuffix devel:libKF6AuthCore$secondaryArchSuffix devel:libKF6Codecs$secondaryArchSuffix devel:libKF6ColorScheme$secondaryArchSuffix @@ -65,7 +67,6 @@ BUILD_REQUIRES=" devel:libKF6ConfigWidgets$secondaryArchSuffix devel:libKF6CoreAddons$secondaryArchSuffix devel:libKF6Crash$secondaryArchSuffix - devel:libKF6DBusAddons$secondaryArchSuffix devel:libKF6DocTools$secondaryArchSuffix devel:libKF6GuiAddons$secondaryArchSuffix devel:libKF6I18n$secondaryArchSuffix @@ -81,6 +82,7 @@ BUILD_REQUIRES=" devel:libKF6WidgetsAddons$secondaryArchSuffix devel:libKF6WindowSystem$secondaryArchSuffix devel:libKF6XmlGui$secondaryArchSuffix + # Qt6 devel:libQt6Core$secondaryArchSuffix devel:libQt6Qml$secondaryArchSuffix " @@ -88,6 +90,8 @@ BUILD_PREREQUIRES=" cmd:cmake cmd:g++$secondaryArchSuffix cmd:make + cmd:msgfmt$secondaryArchSuffix + cmd:msgmerge$secondaryArchSuffix cmd:pkg_config$secondaryArchSuffix " @@ -96,21 +100,24 @@ PATCH() # disable docs generation sed -e '/add_subdirectory(doc)/ s/^#*/#/' -i CMakeLists.txt sed -e '/kdoctools_install(po)/ s/^#*/#/' -i CMakeLists.txt - # remove dbus service - sed -e '/KDBusService service;/d' -i src/main.cpp } BUILD() { - cmake -Bbuild -S. $cmakeDirArgs \ - -DCMAKE_BUILD_TYPE=Release \ - -DECM_DIR=/system/data/cmake/Modules/ECM/cmake - make -Cbuild $jobArgs + cmake -B build -S . -DCMAKE_BUILD_TYPE=Release \ + $cmakeDirArgs \ + -DCMAKE_INSTALL_BINDIR=$appsDir \ + -DECM_DIR=/system/data/cmake/Modules/ECM/cmake \ + -DBUILD_TESTING=OFF + + make -C build $jobArgs } INSTALL() { - make -Cbuild install + make -C build install + + mv $appsDir/knetwalk $appsDir/KNetWalk # cleanup rm -rf $dataDir/{applications,metainfo} @@ -128,6 +135,11 @@ INSTALL() -e "s|@LONG_INFO@|$LONG_INFO|" \ $portDir/additional-files/knetwalk.rdef.in > knetwalk.rdef - addResourcesToBinaries knetwalk.rdef $binDir/knetwalk - addAppDeskbarSymlink $binDir/knetwalk KNetWalk + addResourcesToBinaries knetwalk.rdef $appsDir/KNetWalk + addAppDeskbarSymlink $appsDir/KNetWalk +} + +TEST() +{ + ctest --test-dir build --output-on-failure } diff --git a/kde-apps/knetwalk/patches/knetwalk-24.12.0.patchset b/kde-apps/knetwalk/patches/knetwalk-24.12.0.patchset new file mode 100644 index 000000000..35756eeb6 --- /dev/null +++ b/kde-apps/knetwalk/patches/knetwalk-24.12.0.patchset @@ -0,0 +1,106 @@ +From 35d30dbc65a5311be151dc339614b50121c570fe 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 ff56852..d013d1c 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.45.2 +