From e4b41b6ecf810a349a5091038806aefa7d99d866 Mon Sep 17 00:00:00 2001
From: Schrijvers Luc <begasus@gmail.com>
Date: Tue, 2 Jan 2024 09:35:44 +0000
Subject: [PATCH] cavepacker, bump version (#9933)

---
 ...r-2.5.1.recipe => cavepacker-2.5.2.recipe} | 10 ++--
 ...5.1.patchset => cavepacker-2.5.2.patchset} | 46 +++++++++----------
 2 files changed, 29 insertions(+), 27 deletions(-)
 rename games-arcade/cavepacker/{cavepacker-2.5.1.recipe => cavepacker-2.5.2.recipe} (91%)
 rename games-arcade/cavepacker/patches/{cavepacker-2.5.1.patchset => cavepacker-2.5.2.patchset} (56%)

diff --git a/games-arcade/cavepacker/cavepacker-2.5.1.recipe b/games-arcade/cavepacker/cavepacker-2.5.2.recipe
similarity index 91%
rename from games-arcade/cavepacker/cavepacker-2.5.1.recipe
rename to games-arcade/cavepacker/cavepacker-2.5.2.recipe
index eae697e8a..0bf8a526d 100644
--- a/games-arcade/cavepacker/cavepacker-2.5.1.recipe
+++ b/games-arcade/cavepacker/cavepacker-2.5.2.recipe
@@ -7,9 +7,9 @@ game, the harder the maps will be. The map set is from XSokoban."
 HOMEPAGE="http://www.caveproductions.org/"
 COPYRIGHT="2014-2020 Martin Gerhardy"
 LICENSE="GNU GPL v3"
-REVISION="2"
+REVISION="1"
 SOURCE_URI="https://github.com/mgerhardy/caveexpress/archive/$portVersion.tar.gz"
-CHECKSUM_SHA256="54b8fb68efc837a78a73b2d285412bc75a28d692918aea4312305fff964f9a26"
+CHECKSUM_SHA256="da8bd71bbb39f898acbfa540c84431629e75f0f8c43878e1f41db1e35f4d30e2"
 SOURCE_DIR="caveexpress-$portVersion"
 PATCHES="cavepacker-$portVersion.patchset"
 
@@ -41,7 +41,7 @@ BUILD_REQUIRES="
 	devel:libBox2D$secondaryArchSuffix
 	devel:glm
 #	devel:libgtest$secondaryArchSuffix
-	devel:liblua$secondaryArchSuffix >= 5.2
+	devel:liblua$secondaryArchSuffix >= 5.4
 	devel:libncurses$secondaryArchSuffix
 	devel:libSDL2_2.0$secondaryArchSuffix
 	devel:libSDL2_image_2.0$secondaryArchSuffix
@@ -55,6 +55,7 @@ BUILD_PREREQUIRES="
 	cmd:ccache
 	cmd:cmake
 	cmd:gcc$secondaryArchSuffix
+	cmd:luac
 	cmd:make
 	cmd:pkg_config$secondaryArchSuffix
 	"
@@ -65,7 +66,8 @@ BUILD()
 	export CFLAGS="`pkg-config --cflags lua`"
 	cmake .. -DCMAKE_BUILD_TYPE=Release \
 		-DCAVEEXPRESS=OFF \
-		-DCMAKE_INSTALL_PREFIX=$appsDir
+		-DCMAKE_INSTALL_PREFIX=$appsDir \
+		-DUNITTESTS=OFF
 	make $jobArgs
 }
 
diff --git a/games-arcade/cavepacker/patches/cavepacker-2.5.1.patchset b/games-arcade/cavepacker/patches/cavepacker-2.5.2.patchset
similarity index 56%
rename from games-arcade/cavepacker/patches/cavepacker-2.5.1.patchset
rename to games-arcade/cavepacker/patches/cavepacker-2.5.2.patchset
index e6626e23b..13a3d5d74 100644
--- a/games-arcade/cavepacker/patches/cavepacker-2.5.1.patchset
+++ b/games-arcade/cavepacker/patches/cavepacker-2.5.2.patchset
@@ -1,29 +1,29 @@
-From 5031f52ea1e90744e69cabfeeef8d6d8b198cf2c Mon Sep 17 00:00:00 2001
-From: begasus <begasus@gmail.com>
-Date: Tue, 21 Jul 2020 09:14:39 +0000
-Subject: Fix reference to luac5.2
+From 40c46f6af481612555c0edbbca0034d6fb815160 Mon Sep 17 00:00:00 2001
+From: Begasus <begasus@gmail.com>
+Date: Mon, 1 Jan 2024 17:07:49 +0100
+Subject: build without PIE on Haiku
 
 
 diff --git a/CMakeLists.txt b/CMakeLists.txt
-index f214082..68f6f29 100644
+index 52f7cbd..4959110 100644
 --- a/CMakeLists.txt
 +++ b/CMakeLists.txt
-@@ -55,7 +55,7 @@ foreach(OUTPUTCONFIG ${CMAKE_CONFIGURATION_TYPES})
- 	set(CMAKE_LIBRARY_OUTPUT_DIRECTORY_${OUTPUTCONFIG} ${CMAKE_BINARY_DIR}/${CMAKE_BUILD_TYPE}/lib)
- 	set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY_${OUTPUTCONFIG} ${CMAKE_BINARY_DIR}/${CMAKE_BUILD_TYPE}/lib)
- endforeach()
--set(DEFAULT_LUAC_EXECUTABLE luac)
-+set(DEFAULT_LUAC_EXECUTABLE luac5.2)
- set(CP_CMAKE_DIR ${PROJECT_SOURCE_DIR}/cmake)
- set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${CP_CMAKE_DIR})
- set(CMAKE_VERBOSE_MAKEFILE ${VERBOSE})
+@@ -62,7 +62,7 @@ set(CMAKE_EXPORT_COMPILE_COMMANDS ON)
+ set(CMAKE_CXX_STANDARD 11)
+ set(CMAKE_CXX_STANDARD_REQUIRED on)
+ set(CMAKE_CXX_EXTENSIONS off)
+-set(CMAKE_POSITION_INDEPENDENT_CODE ON)
++set(CMAKE_POSITION_INDEPENDENT_CODE !HAIKU)
+ 
+ if (${CMAKE_EXTRA_GENERATOR} MATCHES "Eclipse CDT4")
+ 	message(STATUS "Generate eclipse projects")
 -- 
-2.27.0
+2.42.1
 
 
-From cef62bc3e9571d33979c929aa64058692be6be68 Mon Sep 17 00:00:00 2001
-From: begasus <begasus@gmail.com>
-Date: Tue, 21 Jul 2020 09:17:19 +0000
+From c8e26a397eff8f7226453555d0ae461d40d8d50d Mon Sep 17 00:00:00 2001
+From: Begasus <begasus@gmail.com>
+Date: Mon, 1 Jan 2024 17:32:20 +0100
 Subject: Don't use fullscreen on launch, set to 800*600
 
 
@@ -45,12 +45,12 @@ index e5e482d..d65d6aa 100644
  defaultfrontend = "sdl"
  defaultsoundengine = "sdl"
 -- 
-2.27.0
+2.42.1
 
 
-From 07c5499fabb47265468426790cc68c2bf47c2d39 Mon Sep 17 00:00:00 2001
-From: begasus <begasus@gmail.com>
-Date: Tue, 21 Jul 2020 09:18:30 +0000
+From 140c914da5627207de53a093d4b484ca7fc62d9c Mon Sep 17 00:00:00 2001
+From: Begasus <begasus@gmail.com>
+Date: Mon, 1 Jan 2024 18:09:32 +0100
 Subject: Fix launch from Tracker and Deskbar
 
 
@@ -80,5 +80,5 @@ index 41cb968..4707873 100644
  	const GamePtr& game = Singleton<GameRegistry>::getInstance().getGame();
  	app.setOrganisation("caveproductions");
 -- 
-2.27.0
+2.42.1