From 5ab7438c898049148f0957b1f5ffe9e13cc91104 Mon Sep 17 00:00:00 2001 From: Gerasim Troeglazov <3dEyes@gmail.com> Date: Mon, 1 Nov 2021 21:36:35 +1000 Subject: [PATCH] Kreversi: bump version --- ...20.12.0.recipe => kreversi-21.08.2.recipe} | 12 +++++----- .../patches/kreversi-20.12.0.patchset | 24 ------------------- 2 files changed, 6 insertions(+), 30 deletions(-) rename kde-apps/kreversi/{kreversi-20.12.0.recipe => kreversi-21.08.2.recipe} (94%) delete mode 100644 kde-apps/kreversi/patches/kreversi-20.12.0.patchset diff --git a/kde-apps/kreversi/kreversi-20.12.0.recipe b/kde-apps/kreversi/kreversi-21.08.2.recipe similarity index 94% rename from kde-apps/kreversi/kreversi-20.12.0.recipe rename to kde-apps/kreversi/kreversi-21.08.2.recipe index d3baa4214..ea3a42252 100644 --- a/kde-apps/kreversi/kreversi-20.12.0.recipe +++ b/kde-apps/kreversi/kreversi-21.08.2.recipe @@ -4,13 +4,12 @@ If a player's piece is captured by an opposing player, that piece is turned over the color of that player. A winner is declared when one player has more pieces of his own \ color on the board and there are no more possible moves." HOMEPAGE="https://apps.kde.org/kreversi" -COPYRIGHT="2010-2020 KDE Organisation" +COPYRIGHT="2010-2021 KDE Organisation" LICENSE="GNU GPL v2" -REVISION="2" +REVISION="1" SOURCE_URI="https://download.kde.org/stable/release-service/$portVersion/src/kreversi-$portVersion.tar.xz" -CHECKSUM_SHA256="9c6ab533fca996ef12b5c49578113daef5b416059a9ada238837f1c778e86afe" +CHECKSUM_SHA256="987b75131dc29e67ca2f6dbb469bb9d10b59ec084f0a426cb0b483762953e2a3" SOURCE_DIR="kreversi-$portVersion" -PATCHES="kreversi-$portVersion.patchset" ADDITIONAL_FILES="kreversi.rdef.in" ARCHITECTURES="all !x86_gcc2" @@ -61,7 +60,7 @@ REQUIRES=" BUILD_REQUIRES=" haiku${secondaryArchSuffix}_devel - extra_cmake_modules$secondaryArchSuffix >= 5.77 + extra_cmake_modules$secondaryArchSuffix >= 5.86 devel:libKF5Archive$secondaryArchSuffix devel:libKF5Attica$secondaryArchSuffix devel:libKF5Auth$secondaryArchSuffix @@ -109,12 +108,13 @@ BUILD() 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 + 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/kreversi/patches/kreversi-20.12.0.patchset b/kde-apps/kreversi/patches/kreversi-20.12.0.patchset deleted file mode 100644 index 2b4b4e011..000000000 --- a/kde-apps/kreversi/patches/kreversi-20.12.0.patchset +++ /dev/null @@ -1,24 +0,0 @@ -From d7d67452c96de77604f3306e93f94580ee65d1de Mon Sep 17 00:00:00 2001 -From: Gerasim Troeglazov <3dEyes@gmail.com> -Date: Sat, 2 Jan 2021 14:48:05 +1000 -Subject: Disable dbus - - -diff --git a/main.cpp b/main.cpp -index 02fe695..ca8ed97 100644 ---- a/main.cpp -+++ b/main.cpp -@@ -72,8 +72,9 @@ int main(int argc, char **argv) - aboutData.setupCommandLine(&parser); - parser.process(application); - aboutData.processCommandLine(&parser); -- -+#ifndef __HAIKU__ - KDBusService service; -+#endif - if (application.isSessionRestored()) { - kRestoreMainWindows(); - } else { --- -2.28.0 -