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

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

diff --git a/kde-apps/kmahjongg/kmahjongg-20.12.0.recipe b/kde-apps/kmahjongg/kmahjongg-21.08.2.recipe
similarity index 94%
rename from kde-apps/kmahjongg/kmahjongg-20.12.0.recipe
rename to kde-apps/kmahjongg/kmahjongg-21.08.2.recipe
index 39ec3a19c..25c160533 100644
--- a/kde-apps/kmahjongg/kmahjongg-20.12.0.recipe
+++ b/kde-apps/kmahjongg/kmahjongg-21.08.2.recipe
@@ -1,13 +1,12 @@
 SUMMARY="A tile matching game for one or two players"
 DESCRIPTION="KMahjongg is a fun board game created after the famous oriental game of Mahjong (from Chinese 麻將)."
 HOMEPAGE="https://apps.kde.org/kmahjongg"
-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/kmahjongg-$portVersion.tar.xz"
-CHECKSUM_SHA256="8d73117b087476967775c6d8f8fd39901e06bc199c80cbceed6afd2f962492b9"
+CHECKSUM_SHA256="1c90d8559b2d8ce5618be717e25d9eea2c3753f369cbbcfe1d1d7d862b55a4bb"
 SOURCE_DIR="kmahjongg-$portVersion"
-PATCHES="kmahjongg-$portVersion.patchset"
 ADDITIONAL_FILES="kmahjongg.rdef.in"
 
 ARCHITECTURES="all !x86_gcc2"
@@ -57,7 +56,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
@@ -103,11 +102,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/kmahjongg/patches/kmahjongg-20.12.0.patchset b/kde-apps/kmahjongg/patches/kmahjongg-20.12.0.patchset
deleted file mode 100644
index 22f9f4b39..000000000
--- a/kde-apps/kmahjongg/patches/kmahjongg-20.12.0.patchset
+++ /dev/null
@@ -1,34 +0,0 @@
-From ded69e0673a7b780d7e38fcdda674b600f05960f Mon Sep 17 00:00:00 2001
-From: Gerasim Troeglazov <3dEyes@gmail.com>
-Date: Fri, 1 Jan 2021 22:28:22 +1000
-Subject: Disable dbus
-
-
-diff --git a/src/main.cpp b/src/main.cpp
-index 2134f45..4164592 100644
---- a/src/main.cpp
-+++ b/src/main.cpp
-@@ -62,7 +62,10 @@ int main(int argc, char ** argv)
-     migrate.setConfigFiles(QStringList() << QStringLiteral("kmahjonggrc"));
-     migrate.setUiFiles(QStringList() << QStringLiteral("kmahjonggui.rc"));
-     migrate.migrate();
--
-+#ifdef __HAIKU__
-+    KMahjongg * window = new KMahjongg();
-+    window->show();
-+#else
-     KDBusService service;
- 
-     if (app.isSessionRestored()) {
-@@ -71,7 +74,7 @@ int main(int argc, char ** argv)
-         KMahjongg * window = new KMahjongg();
-         window->show();
-     }
--
-+#endif
-     app.setWindowIcon(QIcon::fromTheme(QStringLiteral("kmahjongg")));
- 
-     return app.exec();
--- 
-2.28.0
-