Kigo: bump version

This commit is contained in:
Gerasim Troeglazov
2021-11-01 20:44:31 +10:00
parent 73c3ad5b92
commit be0d5f41e2
2 changed files with 8 additions and 53 deletions

View File

@@ -6,13 +6,12 @@ complexity despite its simple rules. The game is played by two players who alter
place black and white stones (playing pieces, now usually made of glass or plastic) on \
the vacant intersections of a grid of 19x19 lines (9x9 or 13x13 for easier games)."
HOMEPAGE="https://apps.kde.org/kigo"
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/kigo-$portVersion.tar.xz"
CHECKSUM_SHA256="e9bbc622ad41e542890008d4a75ce1fae8d249a310dd23dabd56bbfabd280721"
CHECKSUM_SHA256="6eae5166eea5ad2cf586187f32ab8c1cf17d93db175fa977272ed78bc52c416b"
SOURCE_DIR="kigo-$portVersion"
PATCHES="kigo-$portVersion.patchset"
ADDITIONAL_FILES="kigo.rdef.in"
ARCHITECTURES="all !x86_gcc2"
@@ -62,7 +61,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
@@ -107,11 +106,16 @@ BUILD()
# disable docs generation
sed -e '/add_subdirectory(doc)/ s/^#*/#/' -i CMakeLists.txt
sed -e '/kdoctools_install(po)/ s/^#*/#/' -i CMakeLists.txt
# remove dbus
sed -e '/KDBusService service;/d' -i src/main.cpp
# fix knsrcfiles path
sed -e 's|{KDE_INSTALL_KNSRCDIR}|{CMAKE_INSTALL_DATADIR}/knsrcfiles|g' -i src/CMakeLists.txt
mkdir -p build
cd build
cmake .. \
-DCMAKE_BUILD_TYPE=Release \
-DCMAKE_INSTALL_PREFIX=$appsDir \
-DCMAKE_INSTALL_DATADIR=$dataDir \
-DCMAKE_INSTALL_DATAROOTDIR=$dataDir \

View File

@@ -1,49 +0,0 @@
From dd6de27d3368449b3308384809a240763392596f Mon Sep 17 00:00:00 2001
From: Gerasim Troeglazov <3dEyes@gmail.com>
Date: Sat, 2 Jan 2021 13:30:51 +1000
Subject: Disable dbus
diff --git a/src/main.cpp b/src/main.cpp
index d92774e..9c8df89 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -77,8 +77,9 @@ int main(int argc, char *argv[])
aboutData.setupCommandLine(&parser);
parser.process(app);
aboutData.processCommandLine(&parser);
+#ifndef __HAIKU__
KDBusService service;
-
+#endif
app.setWindowIcon(QIcon::fromTheme(QStringLiteral("kigo")));
if (app.isSessionRestored()) {
--
2.28.0
From 9a54f66f1e61db4b27a2db86a80aef3d2f657a6c Mon Sep 17 00:00:00 2001
From: Gerasim Troeglazov <3dEyes@gmail.com>
Date: Sat, 2 Jan 2021 13:31:08 +1000
Subject: Fix newstuff install
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 620004a..0e891fd 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -42,6 +42,10 @@ target_link_libraries(kigo
Qt5::Svg
)
+if(HAIKU)
+set(KDE_INSTALL_KNSRCDIR ${CMAKE_INSTALL_DATADIR}/knsrcfiles)
+endif()
+
install(TARGETS kigo ${KDE_INSTALL_TARGETS_DEFAULT_ARGS})
install(FILES kigo.kcfg DESTINATION ${KDE_INSTALL_KCFGDIR})
install(FILES kigo.knsrc DESTINATION ${KDE_INSTALL_KNSRCDIR})
--
2.28.0