gnu: gemrb: Update to 0.9.4.

* gnu/packages/games.scm (gemrb): Update to 0.9.4.
* gnu/packages/patches/gemrb-add-path-suffixes-for-vlc-headers.patch:
Delete file.
* gnu/packages/patches/gemrb-remove-ifdef-and-externalize-path-setting-to-cmake.patch:
New file.
* gnu/local.mk (dist_patch_DATA): Remove old patch, register new patch.

Change-Id: I7b82593246f425a14f6332a879aaf7ba8c6c5e31

gnu/local.mk

@@ -1413,7 +1413,7 @@ dist_patch_DATA =						\
   %D%/packages/patches/gdm-pass-gdk-pixbuf-loader-env.patch	\
   %D%/packages/patches/gemmi-fix-pegtl-usage.patch		\
   %D%/packages/patches/gemmi-fix-sajson-types.patch		\
-  %D%/packages/patches/gemrb-add-path-suffixes-for-vlc-headers.patch \
+  %D%/packages/patches/gemrb-remove-ifdef-and-externalize-path-setting-to-cmake.patch	\
   %D%/packages/patches/genimage-mke2fs-test.patch		\
   %D%/packages/patches/geoclue-config.patch			\
   %D%/packages/patches/gettext-libunicode-update.patch		\

gnu/packages/games.scm

@@ -12539,7 +12539,7 @@ virtual reality devices.")
 (define-public gemrb
   (package
     (name "gemrb")
-    (version "0.9.3")
+    (version "0.9.4")
     (source
      (origin
        (method git-fetch)
@@ -12548,13 +12548,16 @@ virtual reality devices.")
              (commit (string-append "v" version))))
        (file-name (git-file-name name version))
        (sha256
-        (base32 "1wfmq4z2in18k4znshd7h1i496zlskbci49yp5d54mfxvyp534m5"))
-       ;; Remove the patch in the next version, as commit d339c0d fixes this
+        (base32 "16pp9vw717pk9q8q3asxk4j64rmywbnpw91cr3qanwnmdi5p5gj4"))
+       ;; Remove the patch in the next version, as commit cca8e71 fixes this
        (patches (search-patches
-                 "gemrb-add-path-suffixes-for-vlc-headers.patch"))))
+                 "gemrb-remove-ifdef-and-externalize-path-setting-to-cmake.patch"))))
     (build-system cmake-build-system)
     (arguments
-     `(#:configure-flags `("-DUSE_TESTS=ON" "-DOPENGL_BACKEND=OpenGL")))
+     (list
+      #:cmake cmake-3.30
+      #:configure-flags
+      #~(list "-DUSE_TESTS=ON" "-DOPENGL_BACKEND=OpenGL")))
     (native-inputs (list python-3.10 glibc-locales googletest))
     (inputs (list freetype
                   libiconv

gnu/packages/patches/gemrb-add-path-suffixes-for-vlc-headers.patch

@@ -1,15 +0,0 @@
-Add PATH_SUFFIXES to look inside the sub-directory `vlc` - the original statement
-only check for `vlc.h` inside the directory `include`, `bin`, etc.
-In Guix, however, `vlc.h` lies inside `/gnu/store/<hash>-vlc-x.y.z/include/vlc/vlc.h`
-
---- a/cmake/modules/FindLIBVLC.cmake
-+++ b/cmake/modules/FindLIBVLC.cmake
-@@ -29,7 +29,7 @@ FIND_PATH(LIBVLC_INCLUDE_DIR vlc/vlc.h
-   c:/msys/local/include
-   NO_DEFAULT_PATH
-   )
--FIND_PATH(LIBVLC_INCLUDE_DIR vlc.h)
-+FIND_PATH(LIBVLC_INCLUDE_DIR vlc.h PATH_SUFFIXES vlc)
- 
- #Put here path to custom location
- #example: /home/user/vlc/lib etc..

gnu/packages/patches/gemrb-remove-ifdef-and-externalize-path-setting-to-cmake.patch

@@ -0,0 +1,57 @@
+From cca8e711247ae67921a1c91ef24ea78415cbea78 Mon Sep 17 00:00:00 2001
+From: Jaka Kranjc <lynxlupodian@users.sourceforge.net>
+Date: Mon, 13 Jan 2025 22:21:55 +0100
+Subject: [PATCH] Test_Map: remove ifdef and externalize path setting to cmake
+
+should fix #2267
+---
+ demo/tester.cfg               | 6 +++---
+ gemrb/CMakeLists.txt          | 3 +++
+ gemrb/tests/core/Test_Map.cpp | 6 +-----
+ 3 files changed, 7 insertions(+), 8 deletions(-)
+
+diff --git a/demo/tester.cfg b/demo/tester.cfg
+index 26b8b54993..9bf2903de0 100644
+--- a/demo/tester.cfg
++++ b/demo/tester.cfg
+@@ -1,6 +1,6 @@
+ GameType = demo
+-GamePath = ../../../demo
+-GemRBPath = ../../../gemrb
+-PluginsPath = ../plugins
++GamePath = ${CMAKE_SOURCE_DIR}/demo
++GemRBPath = ${CMAKE_SOURCE_DIR}/gemrb
++PluginsPath = ${CMAKE_CURRENT_BINARY_DIR}/plugins
+ UseAsLibrary = 1
+ AudioDriver = none
+diff --git a/gemrb/CMakeLists.txt b/gemrb/CMakeLists.txt
+index a61050960e..c556c6bbbc 100644
+--- a/gemrb/CMakeLists.txt
++++ b/gemrb/CMakeLists.txt
+@@ -162,6 +162,9 @@ CONFIGURE_FILE(
+   IMMEDIATE @ONLY
+ )
+ 
++# copy config for complex tests to build dir
++CONFIGURE_FILE(../demo/tester.cfg "${CMAKE_BINARY_DIR}")
++
+ INSTALL( TARGETS gemrb DESTINATION ${BIN_DIR} )
+ 
+ # optional script to help deploy dependencies when building with windows.
+diff --git a/gemrb/tests/core/Test_Map.cpp b/gemrb/tests/core/Test_Map.cpp
+index 591475fb3a..fc30a93e94 100644
+--- a/gemrb/tests/core/Test_Map.cpp
++++ b/gemrb/tests/core/Test_Map.cpp
+@@ -41,11 +41,7 @@ class MapTest : public testing::Test {
+ 	static void SetUpTestSuite()
+ 	{
+ 		setlocale(LC_ALL, "");
+-#if defined(WIN32) || defined(__APPLE__)
+-		const char* argv[] = { "tester", "-c", "../demo/tester.cfg" };
+-#else
+-		const char* argv[] = { "tester", "-c", "../../../demo/tester.cfg" };
+-#endif
++		const char* argv[] = { "tester", "-c", "../../tester.cfg" };
+ 		auto cfg = LoadFromArgs(3, const_cast<char**>(argv));
+ 		ToggleLogging(true);
+ 		AddLogWriter(createStdioLogWriter());