From 58f449973de11acf49fc8f16fb70867079c052b3 Mon Sep 17 00:00:00 2001
From: Gerasim Troeglazov <3dEyes@gmail.com>
Date: Mon, 1 Nov 2021 21:04:30 +1000
Subject: [PATCH] KLines: bump version

---
 ...s-20.12.0.recipe => klines-21.08.2.recipe} | 10 +++---
 .../klines/patches/klines-20.12.0.patchset    | 32 -------------------
 2 files changed, 6 insertions(+), 36 deletions(-)
 rename kde-apps/klines/{klines-20.12.0.recipe => klines-21.08.2.recipe} (93%)
 delete mode 100644 kde-apps/klines/patches/klines-20.12.0.patchset

diff --git a/kde-apps/klines/klines-20.12.0.recipe b/kde-apps/klines/klines-21.08.2.recipe
similarity index 93%
rename from kde-apps/klines/klines-20.12.0.recipe
rename to kde-apps/klines/klines-21.08.2.recipe
index 58a0638aa..cef69fd16 100644
--- a/kde-apps/klines/klines-20.12.0.recipe
+++ b/kde-apps/klines/klines-21.08.2.recipe
@@ -4,13 +4,12 @@ gathering them into the lines of the same color by five. Once the line is comple
 it is removed from the board, therefore freeing precious space. In the same time \
 the new balls keep arriving by three after each move, filling up the game board."
 HOMEPAGE="https://github.com/KDE/klines"
-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/klines-$portVersion.tar.xz"
-CHECKSUM_SHA256="306ed70f9cb789455223bb9d9de74020df2f2622af917d6c8f84cecc15b71479"
+CHECKSUM_SHA256="2735803c67ead90f7ed94fa232ef7dada8162e64de64bb78a46ad9876853aabf"
 SOURCE_DIR="klines-$portVersion"
-PATCHES="klines-$portVersion.patchset"
 ADDITIONAL_FILES="klines.rdef.in"
 
 ARCHITECTURES="all !x86_gcc2"
@@ -52,7 +51,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
@@ -90,11 +89,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/klines/patches/klines-20.12.0.patchset b/kde-apps/klines/patches/klines-20.12.0.patchset
deleted file mode 100644
index 50322a668..000000000
--- a/kde-apps/klines/patches/klines-20.12.0.patchset
+++ /dev/null
@@ -1,32 +0,0 @@
-From f5ac07e0700428c95f609f59d7c8a9aae8a2026e Mon Sep 17 00:00:00 2001
-From: Gerasim Troeglazov <3dEyes@gmail.com>
-Date: Fri, 1 Jan 2021 02:41:32 +1000
-Subject: Disable dbus
-
-
-diff --git a/main.cpp b/main.cpp
-index be0a0be..d4f2e9d 100644
---- a/main.cpp
-+++ b/main.cpp
-@@ -58,7 +58,10 @@ int main( int argc, char **argv )
-     aboutData.setupCommandLine(&parser);
-     parser.process(app);
-     aboutData.processCommandLine(&parser);
--     
-+#ifdef __HAIKU__
-+    KLinesMainWindow *window = new KLinesMainWindow;
-+    window->show();
-+#else
-     KDBusService service;    
-     if (app.isSessionRestored())
-         kRestoreMainWindows<KLinesMainWindow>();
-@@ -66,5 +69,6 @@ int main( int argc, char **argv )
-         KLinesMainWindow *window = new KLinesMainWindow;
-         window->show();
-     }
-+#endif
-     return app.exec();
- }
--- 
-2.28.0
-