mirror of
https://github.com/yann64/haikuports.git
synced 2026-05-06 06:58:57 +02:00
KMahjongg: bump version
This commit is contained in:
@@ -1,13 +1,12 @@
|
|||||||
SUMMARY="A tile matching game for one or two players"
|
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 麻將)."
|
DESCRIPTION="KMahjongg is a fun board game created after the famous oriental game of Mahjong (from Chinese 麻將)."
|
||||||
HOMEPAGE="https://apps.kde.org/kmahjongg"
|
HOMEPAGE="https://apps.kde.org/kmahjongg"
|
||||||
COPYRIGHT="2010-2020 KDE Organisation"
|
COPYRIGHT="2010-2021 KDE Organisation"
|
||||||
LICENSE="GNU GPL v2"
|
LICENSE="GNU GPL v2"
|
||||||
REVISION="1"
|
REVISION="1"
|
||||||
SOURCE_URI="https://download.kde.org/stable/release-service/$portVersion/src/kmahjongg-$portVersion.tar.xz"
|
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"
|
SOURCE_DIR="kmahjongg-$portVersion"
|
||||||
PATCHES="kmahjongg-$portVersion.patchset"
|
|
||||||
ADDITIONAL_FILES="kmahjongg.rdef.in"
|
ADDITIONAL_FILES="kmahjongg.rdef.in"
|
||||||
|
|
||||||
ARCHITECTURES="all !x86_gcc2"
|
ARCHITECTURES="all !x86_gcc2"
|
||||||
@@ -57,7 +56,7 @@ REQUIRES="
|
|||||||
|
|
||||||
BUILD_REQUIRES="
|
BUILD_REQUIRES="
|
||||||
haiku${secondaryArchSuffix}_devel
|
haiku${secondaryArchSuffix}_devel
|
||||||
extra_cmake_modules$secondaryArchSuffix >= 5.77
|
extra_cmake_modules$secondaryArchSuffix >= 5.86
|
||||||
devel:libKF5Archive$secondaryArchSuffix
|
devel:libKF5Archive$secondaryArchSuffix
|
||||||
devel:libKF5Auth$secondaryArchSuffix
|
devel:libKF5Auth$secondaryArchSuffix
|
||||||
devel:libKF5Bookmarks$secondaryArchSuffix
|
devel:libKF5Bookmarks$secondaryArchSuffix
|
||||||
@@ -103,11 +102,14 @@ BUILD()
|
|||||||
# disable docs generation
|
# disable docs generation
|
||||||
sed -e '/add_subdirectory(doc)/ s/^#*/#/' -i CMakeLists.txt
|
sed -e '/add_subdirectory(doc)/ s/^#*/#/' -i CMakeLists.txt
|
||||||
sed -e '/kdoctools_install(po)/ 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
|
mkdir -p build
|
||||||
cd build
|
cd build
|
||||||
|
|
||||||
cmake .. \
|
cmake .. \
|
||||||
|
-DCMAKE_BUILD_TYPE=Release \
|
||||||
-DCMAKE_INSTALL_PREFIX=$appsDir \
|
-DCMAKE_INSTALL_PREFIX=$appsDir \
|
||||||
-DCMAKE_INSTALL_DATADIR=$dataDir \
|
-DCMAKE_INSTALL_DATADIR=$dataDir \
|
||||||
-DCMAKE_INSTALL_DATAROOTDIR=$dataDir \
|
-DCMAKE_INSTALL_DATAROOTDIR=$dataDir \
|
||||||
@@ -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
|
|
||||||
|
|
||||||
Reference in New Issue
Block a user