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

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

diff --git a/kde-apps/knavalbattle/knavalbattle-20.12.0.recipe b/kde-apps/knavalbattle/knavalbattle-21.08.2.recipe
similarity index 94%
rename from kde-apps/knavalbattle/knavalbattle-20.12.0.recipe
rename to kde-apps/knavalbattle/knavalbattle-21.08.2.recipe
index cbd367bef..3af53eb49 100644
--- a/kde-apps/knavalbattle/knavalbattle-20.12.0.recipe
+++ b/kde-apps/knavalbattle/knavalbattle-21.08.2.recipe
@@ -4,13 +4,12 @@ board which represents the sea. Players try to hit each others ships in \
 turns without knowing where they are placed. The first player to destroy \
 all ships wins the game."
 HOMEPAGE="https://apps.kde.org/knavalbattle"
-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/knavalbattle-$portVersion.tar.xz"
-CHECKSUM_SHA256="9892c53e387d61a5caa536e0fee4f35d017deefbb57a40c6062b18bb1571380f"
+CHECKSUM_SHA256="b3c33b26e988e5430e5a94850425e2055cb17b541c25466d54614b6deb47177e"
 SOURCE_DIR="knavalbattle-$portVersion"
-PATCHES="knavalbattle-$portVersion.patchset"
 ADDITIONAL_FILES="knavalbattle.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
@@ -96,11 +95,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 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/knavalbattle/patches/knavalbattle-20.12.0.patchset b/kde-apps/knavalbattle/patches/knavalbattle-20.12.0.patchset
deleted file mode 100644
index 0c0d8c841..000000000
--- a/kde-apps/knavalbattle/patches/knavalbattle-20.12.0.patchset
+++ /dev/null
@@ -1,24 +0,0 @@
-From 181f4a55a664ea2d0be17784966800b42e8a82cf Mon Sep 17 00:00:00 2001
-From: Gerasim Troeglazov <3dEyes@gmail.com>
-Date: Sat, 2 Jan 2021 11:53:00 +1000
-Subject: Disable dbus
-
-
-diff --git a/src/main.cpp b/src/main.cpp
-index 3da82d5..d9d1ff5 100644
---- a/src/main.cpp
-+++ b/src/main.cpp
-@@ -80,8 +80,9 @@ int main(int argc, char** argv)
-     
-     KAboutData::setApplicationData(aboutData);
-     KCrash::initialize();
-+#ifndef __HAIKU__
-     KDBusService service; 
--    
-+#endif
-     qRegisterMetaType<Coord>("Coord");
- 
-     QUrl url;
--- 
-2.28.0
-