From 6c8a8e9e2f1897d420ba2d193acd1acb2cde6b35 Mon Sep 17 00:00:00 2001
From: Gerasim Troeglazov <3dEyes@gmail.com>
Date: Mon, 1 Nov 2021 20:53:39 +1000
Subject: [PATCH] KJumpingCube: bump version

---
 ...2.0.recipe => kjumpingcube-21.08.2.recipe} | 10 ++++----
 .../patches/kjumpingcube-20.12.0.patchset     | 24 -------------------
 2 files changed, 6 insertions(+), 28 deletions(-)
 rename kde-apps/kjumpingcube/{kjumpingcube-20.12.0.recipe => kjumpingcube-21.08.2.recipe} (94%)
 delete mode 100644 kde-apps/kjumpingcube/patches/kjumpingcube-20.12.0.patchset

diff --git a/kde-apps/kjumpingcube/kjumpingcube-20.12.0.recipe b/kde-apps/kjumpingcube/kjumpingcube-21.08.2.recipe
similarity index 94%
rename from kde-apps/kjumpingcube/kjumpingcube-20.12.0.recipe
rename to kde-apps/kjumpingcube/kjumpingcube-21.08.2.recipe
index 70b78dd37..589d6c6d7 100644
--- a/kde-apps/kjumpingcube/kjumpingcube-20.12.0.recipe
+++ b/kde-apps/kjumpingcube/kjumpingcube-21.08.2.recipe
@@ -3,13 +3,12 @@ DESCRIPTION="KJumpingCube is a simple dice driven tactical game. The playing are
 consists of squares containing points. Players move by clicking on either a vacant \
 square, or on own square.."
 HOMEPAGE="https://apps.kde.org/kjumpingcube"
-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/kjumpingcube-$portVersion.tar.xz"
-CHECKSUM_SHA256="f8aa68d71256f8aabc49fcc0c142502fd7ed352ce6ba516ff9254049681c67d6"
+CHECKSUM_SHA256="bfd38007e6020e0cb55af00104d5c574491aa336e50fc27e33dc48f42b186faa"
 SOURCE_DIR="kjumpingcube-$portVersion"
-PATCHES="kjumpingcube-$portVersion.patchset"
 ADDITIONAL_FILES="kjumpingcube.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
@@ -99,11 +98,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/kjumpingcube/patches/kjumpingcube-20.12.0.patchset b/kde-apps/kjumpingcube/patches/kjumpingcube-20.12.0.patchset
deleted file mode 100644
index 30334c251..000000000
--- a/kde-apps/kjumpingcube/patches/kjumpingcube-20.12.0.patchset
+++ /dev/null
@@ -1,24 +0,0 @@
-From efe0f5444f99f1c80bf2a16592978c8f0d47d07c Mon Sep 17 00:00:00 2001
-From: Gerasim Troeglazov <3dEyes@gmail.com>
-Date: Sat, 2 Jan 2021 23:26:45 +1000
-Subject: Disable dbus
-
-
-diff --git a/main.cpp b/main.cpp
-index ebaaddb..3ed009c 100644
---- a/main.cpp
-+++ b/main.cpp
-@@ -67,8 +67,9 @@ int main(int argc, char *argv[])
-     aboutData.setupCommandLine(&parser);
-     parser.process(app);
-     aboutData.processCommandLine(&parser);
-+#ifndef __HAIKU__
-     KDBusService service;
--
-+#endif
-     app.setWindowIcon(QIcon::fromTheme(QStringLiteral("kjumpingcube")));
- 
-     // All session management is handled in the RESTORE macro
--- 
-2.28.0
-