haikuprojects/haikuports
1
0
Fork 0
mirror of https://github.com/yann64/haikuports.git synced 2026-05-06 06:58:57 +02:00
Code Issues Packages Projects Releases Wiki Activity

KAtomic: bump version

Browse Source
This commit is contained in:
Gerasim Troeglazov
2021-11-01 19:18:55 +10:00
parent 874457803f
commit 40279c787a
3 changed files with 28 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
kde-apps/katomic/katomic-20.12.0.recipe → kde-apps/katomic/katomic-21.08.2.recipe
View File

@@ -4,11 +4,11 @@ chemical molecules. Your job is to move single atoms around to form a specific \
molecule. molecule.
The game is a variation of the popular game Sokoban." The game is a variation of the popular game Sokoban."
HOMEPAGE="https://apps.kde.org/katomic" HOMEPAGE="https://apps.kde.org/katomic"
COPYRIGHT="2010-2020 KDE Organisation" COPYRIGHT="2010-2021 KDE Organisation"
LICENSE="GNU GPL v2" LICENSE="GNU GPL v2"
REVISION="2" REVISION="1"
SOURCE_URI="https://download.kde.org/stable/release-service/$portVersion/src/katomic-$portVersion.tar.xz" SOURCE_URI="https://download.kde.org/stable/release-service/$portVersion/src/katomic-$portVersion.tar.xz"
CHECKSUM_SHA256="00bca558a18de42ff896376c1c2665dde19e7e041d18e6ed13ac16c3754189b6" CHECKSUM_SHA256="47765b855b074f51820ef1cf85fa7e359fb32e1d8a7a05912d45acc0ae1bcf52"
SOURCE_DIR="katomic-$portVersion" SOURCE_DIR="katomic-$portVersion"
PATCHES="katomic-$portVersion.patchset" PATCHES="katomic-$portVersion.patchset"
ADDITIONAL_FILES="katomic.rdef.in" ADDITIONAL_FILES="katomic.rdef.in"
@@ -61,7 +61,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:libKF5Attica$secondaryArchSuffix devel:libKF5Attica$secondaryArchSuffix
devel:libKF5Auth$secondaryArchSuffix devel:libKF5Auth$secondaryArchSuffix
@@ -109,12 +109,13 @@ BUILD()
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 # remove dbus service
sed -e '/KDBusService service;/d' -i main.cpp 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 \

24
kde-apps/katomic/patches/katomic-20.12.0.patchset
View File

@@ -1,24 +0,0 @@
From 6e1d32b244e1901cb7c8019f183aaae4d7979838 Mon Sep 17 00:00:00 2001
From: Gerasim Troeglazov <3dEyes@gmail.com>
Date: Sun, 3 Jan 2021 17:36:42 +1000
Subject: Fix newstuff install
diff --git a/CMakeLists.txt b/CMakeLists.txt
index c038f39..8a54fa9 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -82,6 +82,10 @@ install(TARGETS katomic ${KDE_INSTALL_TARGETS_DEFAULT_ARGS})
########### install files ###############
+if(HAIKU)
+set(KDE_INSTALL_KNSRCDIR ${CMAKE_INSTALL_DATADIR}/knsrcfiles)
+endif()
+
install(PROGRAMS org.kde.katomic.desktop DESTINATION ${KDE_INSTALL_APPDIR})
install(FILES org.kde.katomic.appdata.xml DESTINATION ${KDE_INSTALL_METAINFODIR})
install(FILES katomicui.rc DESTINATION ${KDE_INSTALL_KXMLGUI5DIR}/katomic)
--
2.28.0

22
kde-apps/katomic/patches/katomic-21.08.2.patchset Normal file
View File

@@ -0,0 +1,22 @@
From 865be3b6daaee848849130bf8c0c9c4a80ff781a Mon Sep 17 00:00:00 2001
From: Gerasim Troeglazov <3dEyes@gmail.com>
Date: Mon, 1 Nov 2021 19:14:07 +1000
Subject: Fix newstuff install
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index bad2190..bf06d59 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -51,7 +51,7 @@ install(FILES org.kde.katomic.appdata.xml DESTINATION ${KDE_INSTALL_METAINFODIR
# default theme is installed without .desktop file since KgTheme does not need it
# when only one theme is available. See: 30a1cadd20
install(FILES default_theme.svgz DESTINATION ${KDE_INSTALL_DATADIR}/katomic/pics/)
-install(FILES katomic.knsrc DESTINATION ${KDE_INSTALL_KNSRCDIR})
+install(FILES katomic.knsrc DESTINATION ${CMAKE_INSTALL_DATADIR}/knsrcfiles)
if(NOT WIN32)
install(PROGRAMS katomic-levelset-upd.pl DESTINATION ${KDE_INSTALL_KCONFUPDATEDIR})
--
2.30.2