From a3232e5f5ed48878480de6f79e70a2ed3e4263b6 Mon Sep 17 00:00:00 2001
From: Gerasim Troeglazov <3dEyes@gmail.com>
Date: Mon, 1 Nov 2021 21:57:57 +1000
Subject: [PATCH] KTuberling: bump version

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

diff --git a/kde-apps/ktuberling/ktuberling-20.12.0.recipe b/kde-apps/ktuberling/ktuberling-21.08.2.recipe
similarity index 94%
rename from kde-apps/ktuberling/ktuberling-20.12.0.recipe
rename to kde-apps/ktuberling/ktuberling-21.08.2.recipe
index 9f1c93002..2c154a465 100644
--- a/kde-apps/ktuberling/ktuberling-20.12.0.recipe
+++ b/kde-apps/ktuberling/ktuberling-21.08.2.recipe
@@ -3,13 +3,12 @@ DESCRIPTION="KTuberling a simple constructor game suitable for children and \
 adults alike. The idea of the game is based around a once popular doll making \
 concept."
 HOMEPAGE="https://apps.kde.org/ktuberling"
-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/ktuberling-$portVersion.tar.xz"
-CHECKSUM_SHA256="215a1158bd0dcac7cd0fec2a88d08aa381c3804059b3bc9a11179c47294e9b56"
+CHECKSUM_SHA256="ce74c06fd7c328c46782e0fc0d15a70efd2d6459b5f57f426e21f001e086fb40"
 SOURCE_DIR="ktuberling-$portVersion"
-PATCHES="ktuberling-$portVersion.patchset"
 ADDITIONAL_FILES="ktuberling.rdef.in"
 
 ARCHITECTURES="all !x86_gcc2"
@@ -55,7 +54,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 service
+	sed -e '/KDBusService service;/d' -i 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/ktuberling/patches/ktuberling-20.12.0.patchset b/kde-apps/ktuberling/patches/ktuberling-20.12.0.patchset
deleted file mode 100644
index 098f208df..000000000
--- a/kde-apps/ktuberling/patches/ktuberling-20.12.0.patchset
+++ /dev/null
@@ -1,24 +0,0 @@
-From 11bc61f57b9a67d7dc91efc94147f1787ac9df08 Mon Sep 17 00:00:00 2001
-From: Gerasim Troeglazov <3dEyes@gmail.com>
-Date: Sat, 2 Jan 2021 00:56:36 +1000
-Subject: Disable dbus
-
-
-diff --git a/main.cpp b/main.cpp
-index b39fcc9..a2c09bd 100644
---- a/main.cpp
-+++ b/main.cpp
-@@ -50,8 +50,9 @@ int main(int argc, char *argv[])
-   aboutData.setupCommandLine(&parser);
-   parser.process(app);
-   aboutData.processCommandLine(&parser);
--
-+#ifndef __HAIKU__
-   KDBusService service;
-+#endif
-   TopLevel *toplevel=0;
- 
-   if (app.isSessionRestored())
--- 
-2.28.0
-