diff --git a/kde-apps/kgoldrunner/kgoldrunner-20.12.0.recipe b/kde-apps/kgoldrunner/kgoldrunner-21.08.2.recipe similarity index 94% rename from kde-apps/kgoldrunner/kgoldrunner-20.12.0.recipe rename to kde-apps/kgoldrunner/kgoldrunner-21.08.2.recipe index 7d0f9019e..f25678f4d 100644 --- a/kde-apps/kgoldrunner/kgoldrunner-20.12.0.recipe +++ b/kde-apps/kgoldrunner/kgoldrunner-21.08.2.recipe @@ -4,13 +4,12 @@ a maze, climbs stairs, dig holes and dodges enemies in order to collect \ all the gold nuggets and escape to the next level. Your enemies are also \ after the gold. Worse still, they are after you!." HOMEPAGE="https://github.com/KDE/kgoldrunner" -COPYRIGHT="2010-2020 KDE Organisation" +COPYRIGHT="2010-2021 KDE Organisation" LICENSE="GNU GPL v2" REVISION="1" SOURCE_URI="https://download.kde.org/stable/release-service/$portVersion/src/kgoldrunner-$portVersion.tar.xz" -CHECKSUM_SHA256="d1bdce536ba4eb6aa4e76ddf59fa5f1b7e787b69fc9d206d145eaa94472b2a9f" +CHECKSUM_SHA256="bf7dfaa32f0d6da7f79ea7ff6b065915be127ae32431e1dad22678d77f50c88f" SOURCE_DIR="kgoldrunner-$portVersion" -PATCHES="kgoldrunner-$portVersion.patchset" ADDITIONAL_FILES="kgoldrunner.rdef.in" ARCHITECTURES="all !x86_gcc2" @@ -56,7 +55,7 @@ REQUIRES=" BUILD_REQUIRES=" haiku${secondaryArchSuffix}_devel - extra_cmake_modules$secondaryArchSuffix >= 5.77 + extra_cmake_modules$secondaryArchSuffix >= 5.86 devel:libKF5Archive$secondaryArchSuffix devel:libKF5Auth$secondaryArchSuffix devel:libKF5Bookmarks$secondaryArchSuffix @@ -98,11 +97,14 @@ BUILD() # disable docs generation sed -e '/add_subdirectory(doc)/ s/^#*/#/' -i CMakeLists.txt sed -e '/kdoctools_install(po)/ s/^#*/#/' -i CMakeLists.txt + # remove dbus + sed -e '/KDBusService service;/d' -i src/main.cpp mkdir -p build cd build cmake .. \ + -DCMAKE_BUILD_TYPE=Release \ -DCMAKE_INSTALL_PREFIX=$appsDir \ -DCMAKE_INSTALL_DATADIR=$dataDir \ -DCMAKE_INSTALL_DATAROOTDIR=$dataDir \ diff --git a/kde-apps/kgoldrunner/patches/kgoldrunner-20.12.0.patchset b/kde-apps/kgoldrunner/patches/kgoldrunner-20.12.0.patchset deleted file mode 100644 index 17284c501..000000000 --- a/kde-apps/kgoldrunner/patches/kgoldrunner-20.12.0.patchset +++ /dev/null @@ -1,32 +0,0 @@ -From ee67f4727c39d1a5b70f664e3ed2d02e4a53ee83 Mon Sep 17 00:00:00 2001 -From: Gerasim Troeglazov <3dEyes@gmail.com> -Date: Fri, 1 Jan 2021 19:48:07 +1000 -Subject: Disable dbus - - -diff --git a/src/main.cpp b/src/main.cpp -index 4519e08..13d2ae1 100644 ---- a/src/main.cpp -+++ b/src/main.cpp -@@ -55,6 +55,10 @@ int main (int argc, char **argv) - about.setupCommandLine(&parser); - parser.process(app); - about.processCommandLine(&parser); -+#ifdef __HAIKU__ -+ KGoldrunner * controller = new KGoldrunner(); -+ controller->show(); -+#else - KDBusService service; - - app.setWindowIcon(QIcon::fromTheme(QStringLiteral("kgoldrunner"))); -@@ -72,6 +76,7 @@ int main (int argc, char **argv) - KGoldrunner * controller = new KGoldrunner(); - controller->show(); - } -+#endif - return app.exec(); - } - --- -2.28.0 -