gnu: maelstrom: Update to 4.0.2.

* gnu/packages/patches/maelstrom-use-system-physfs.patch: Delete file.
* gnu/local.mk (dist_patch_DATA): Remove it.
* gnu/packages/games.scm (maelstrom): Update to 4.0.2.
[source]<snippet>: Remove unbundling code for physfs and sdl3_net.
Adapt unbundling code for physfs-sdl3 and miniz.
<patches>: Remove “patches/maelstrom-use-system-physfs.patch”.
[arguments]<#:configure-flags>: Add “-DUSE_VENDORED_PHYSFS=OFF”
and “-DUSE_VENDORED_SDL_NET=OFF”.

Change-Id: I280b9ed2a59ee245926938f3bd93d2bd92dab0f1
Signed-off-by: Liliana Marie Prikler <liliana.prikler@gmail.com>
Merges: guix/guix#10477

3 files changed, 24 insertions, 62 deletions

diff --git a/gnu/local.mk b/gnu/local.mk
index 56726849ca8..d99bf29551e 100644
--- a/gnu/local.mk
+++ b/gnu/local.mk
@@ -1911,7 +1911,6 @@ dist_patch_DATA =						\
   %D%/packages/patches/lxsession-potfiles-ignore.patch          \
   %D%/packages/patches/mate-common-honor-aclocal.patch          \
   %D%/packages/patches/mactelnet-remove-init.patch              \
-  %D%/packages/patches/maelstrom-use-system-physfs.patch                \
   %D%/packages/patches/mailutils-variable-lookup.patch          \
   %D%/packages/patches/mandoc-support-zstd-compression.patch    \
   %D%/packages/patches/mantid-openmp-cleanup.patch              \
diff --git a/gnu/packages/games.scm b/gnu/packages/games.scm
index 135bf7afd49..4a8d0b49cdd 100644
--- a/gnu/packages/games.scm
+++ b/gnu/packages/games.scm
@@ -4909,7 +4909,7 @@ match, cannon keep, and grave-itation pit.")
 (define-public maelstrom
   (package
     (name "maelstrom")
-    (version "4.0.1")
+    (version "4.0.2")
     (source
      (origin
        (method git-fetch)
@@ -4917,42 +4917,44 @@ match, cannon keep, and grave-itation pit.")
               (url "https://github.com/libsdl-org/Maelstrom")
               (commit (string-append "release-" version))))
        (sha256
-        (base32 "140qr4hlg63kjy3ns5d2qix0xpaq72z5yisjnmslrkxrq42ch2fk"))
+        (base32 "0a3kpsd3582j0gwdwspfd27in24asjhj48i26im6d9hg1j3n4iww"))
        (file-name (git-file-name name version))
        (snippet
         #~(begin
             (use-modules (guix build utils))
             (substitute* '("game/mods.cpp" "utils/files.c")
-              (("\"[^\"]*/physfssdl3.h\"") "\"physfssdl3.h\""))
+              (("#include.*(physfssdl3.h)\"" all first)
+               (string-append "#include <" first ">")))
+            (substitute* "game/replay.cpp"
+              (("#include \"\\.\\./(miniz/miniz\\.h)\"" all first)
+               (string-append "#include <" first ">")))
             (substitute* "CMakeLists.txt"
-              (("set\\(original_BUILD_SHARED_LIBS.*\n") "")
-              (("set\\(BUILD_SHARED_LIBS OFF\\)\n") "")
-              (("add_subdirectory\\(external/SDL_net.*")
-               (string-append "find_package(SDL3_net REQUIRED)\n"
-                              "include(CheckCSourceCompiles)\n"
-                              "include(CMakeDependentOption)\n"))
-              (((string-append "set\\(BUILD_SHARED_LIBS \"\\$\\{"
-                               "original_BUILD_SHARED_LIBS\\}\"\\)\n")) "")
-              (("add_subdirectory\\(macres\\)\n") "")
-              (("miniz/miniz\\.c\n") "")
-              (("find_package\\(SDL3_net (REQUIRED)\\)\n" all first)
-               (string-append all "pkg_check_modules(MINIZ " first
-                              " IMPORTED_TARGET miniz)\n"))
-              (("(target_link_libraries\\(Maelstrom PRIVATE )SDLmac\\)" all first)
-               (string-append all "\n" first "PkgConfig::MINIZ)")))
+              (("external/physfs/extras/physfssdl3\\.c" all)
+               (string-append "# " all))
+              (("miniz/miniz\\.c" all)
+               (string-append "# " all))
+              (("(pkg_check_modules\\()PhysFS.*physfs\\)\n" all first)
+               (string-append all
+                              first "MINIZ IMPORTED_TARGET miniz)\n"
+                              first "PHYSFSSDL3 IMPORTED_TARGET physfs-sdl3)\n"))
+              (("(target_link_libraries\\(Maelstrom PRIVATE )PkgConfig::PhysFS\\)\n" all first)
+               (string-append all
+                              first "PkgConfig::MINIZ)\n"
+                              first "PkgConfig::PHYSFSSDL3)\n")))
             (for-each delete-file-recursively
                       (list "macres"
                             "miniz"
-                            "Xcode"))))
-       (patches (search-patches "maelstrom-use-system-physfs.patch"))))
+                            "Xcode"))))))
     (build-system cmake-build-system)
     (arguments
      (list
+      #:tests? #f                       ;no tests
       #:configure-flags
       #~(list "-DSTEAM=OFF"
               "-DUSE_VENDORED_SDL=OFF"
-              "-DSTANDALONE_INSTALL=OFF")
-      #:tests? #f)) ;no testes
+              "-DUSE_VENDORED_PHYSFS=OFF"
+              "-DUSE_VENDORED_SDL_NET=OFF"
+              "-DSTANDALONE_INSTALL=OFF")))
     (native-inputs (list pkg-config))
     (inputs (list miniz physfs physfs-sdl3 sdl3 sdl3-net))
     (home-page "https://github.com/libsdl-org/Maelstrom")
diff --git a/gnu/packages/patches/maelstrom-use-system-physfs.patch b/gnu/packages/patches/maelstrom-use-system-physfs.patch
deleted file mode 100644
index 12f02076111..00000000000
--- a/gnu/packages/patches/maelstrom-use-system-physfs.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-Use system physfs and physfs-sdl3 instead of the vendored copy.
-
-This patch switches Maelstrom from using bundled physfs and physfssdl3
-to using the system packages found via pkg-config.
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
---- a/CMakeLists.txt    2026-05-20 09:21:15.747350351 -0300
-+++ b/CMakeLists.txt    2026-05-20 09:25:32.336090395 -0300
-@@ -26,9 +26,9 @@
-     set(SDL_EMSCRIPTEN_PERSISTENT_PATH /storage)
- endif()
- 
--set(PHYSFS_BUILD_SHARED OFF)
--set(PHYSFS_BUILD_TEST OFF)
--add_subdirectory(external/physfs EXCLUDE_FROM_ALL)
-+find_package(PkgConfig REQUIRED)
-+pkg_check_modules(PHYSFS REQUIRED IMPORTED_TARGET physfs)
-+pkg_check_modules(PHYSFSSDL3 REQUIRED IMPORTED_TARGET physfs-sdl3)
- 
- option(USE_VENDORED_SDL "Use the vendored version of SDL" TRUE)
- if (USE_VENDORED_SDL)
-@@ -163,8 +163,6 @@
-        utils/rapidxml.h
-        utils/rapidxml.hpp
- 
--       external/physfs/extras/physfssdl3.c
--
-        miniz/miniz.c
- 
-        Maelstrom.rc
-@@ -224,7 +222,8 @@
- endif()
- 
- target_link_libraries(Maelstrom PRIVATE SDLmac)
--target_link_libraries(Maelstrom PRIVATE physfs-static)
-+target_link_libraries(Maelstrom PRIVATE PkgConfig::PHYSFS)                                                                                                              
-+target_link_libraries(Maelstrom PRIVATE PkgConfig::PHYSFSSDL3)
- target_link_libraries(Maelstrom PRIVATE SDL3_net::SDL3_net)
- target_link_libraries(Maelstrom PRIVATE SDL3::SDL3)
\ No newline at end of file