[bug#72569] [PATCH v2 3/4] gnu: openclonk: Fix build.

[Adam Faiz]

>From 499630a22aebe8921f317733143e257b09f08be3 Mon Sep 17 00:00:00 2001
Message-ID: 
<499630a22aebe8921f317733143e257b09f08be3.1724859175.git.adam.faiz@disroot.org>
In-Reply-To: 
<91bf9bff2c3c365d006a0e88024db50f416cd436.1724859175.git.adam.faiz@disroot.org>
References: 
<91bf9bff2c3c365d006a0e88024db50f416cd436.1724859175.git.adam.faiz@disroot.org>
From: AwesomeAdam54321 <adam.faiz@disroot.org>
Date: Sun, 11 Aug 2024 09:25:30 +0800
Subject: [PATCH v2 3/4] gnu: openclonk: Fix build.

* gnu/packages/games.scm (openclonk): Fix build.
[source]<snippet>: Unbundle dependencies and include the <limits> header where
necessary to fix the build.
[arguments]<#:phases>: Remove workarounds for bundled backward-cpp.
[inputs]: Remove dependencies for bundled backward-cpp. Add libb2, pcg-cpp,
and c-template-sort.
---
 gnu/packages/games.scm | 62 ++++++++++++++++++++++--------------------
 1 file changed, 33 insertions(+), 29 deletions(-)

diff --git a/gnu/packages/games.scm b/gnu/packages/games.scm
index 9ad6eabad2..850d40e66f 100644
--- a/gnu/packages/games.scm
+++ b/gnu/packages/games.scm
@@ -123,6 +123,7 @@ (define-module (gnu packages games)
   #:use-module (gnu packages bash)
   #:use-module (gnu packages bison)
   #:use-module (gnu packages boost)
+  #:use-module (gnu packages c)
   #:use-module (gnu packages check)
   #:use-module (gnu packages cmake)
   #:use-module (gnu packages compression)
@@ -9622,7 +9623,32 @@ (define-public openclonk
                     "openclonk-" version "-src.tar.bz2"))
               (sha256
                (base32
-                "0imkqjp8lww5p0cnqf4k4mb2v682mnsas63qmiz17rspakr7fxik"))))
+                "0imkqjp8lww5p0cnqf4k4mb2v682mnsas63qmiz17rspakr7fxik"))
+              (modules '((guix build utils)))
+              (snippet
+               #~(begin
+                   (delete-file-recursively "thirdparty")
+                   (substitute* "CMakeLists.txt"
+                     (("add_subdirectory\\(thirdparty/.*\\)") "")
+                     (("set_property\\(.*Third-party.*\\)") "")
+                     (("blake2") "b2")
+                     (("thirdparty/timsort/sort\\.h") "")
+                     (("thirdparty/pcg/.*\\.hpp") ""))
+                   (substitute* '("src/lib/C4Random.cpp"
+                                  "src/landscape/C4Particles.h")
+                     (("#include <pcg/pcg_random.hpp>")
+                      "#include <pcg_random.hpp>"))
+                   (substitute* "src/script/C4ScriptLibraries.cpp"
+                     (("blake2b.hash_output.get.., raw_output_length, data, 
data_length, nullptr, 0.")
+                      "blake2b(hash_output.get(), (const 
void*)raw_output_length, data, data_length, (size_t)(0), 0)"))
+                   (substitute* '("src/script/C4AulParse.cpp"
+                                  "src/editor/C4EditCursor.cpp"
+                                  "src/gui/C4ScriptGuiWindow.cpp")
+                     (("#include .C4Include\\.h." all)
+                      (string-append "#include <limits>\n" all)))
+                   (substitute* "src/lib/StdMesh.cpp"
+                     (("#include .timsort/sort\\.h.")
+                      "#include <sort.h>"))))))
     (build-system cmake-build-system)
     (arguments
      `(#:configure-flags '("-DAudio_TK=OpenAL")
@@ -9641,30 +9667,7 @@ (define-public openclonk
                (("PATH_SUFFIXES \"src\" \"gtest\"")
                 "PATH_SUFFIXES \"src\""))
              #t))
-         (add-after 'unpack 'adjust-backward-cpp-includes
-           (lambda _
-             ;; XXX: The bundled backward-cpp exports a CMake "interface"
-             ;; that includes external libraries such as libdl from glibc.
-             ;; By default, CMake interface includes are treated as "system
-             ;; headers", and GCC behaves poorly when glibc is passed as a
-             ;; system header (causing #include_next failures).
-
-             ;; Here we prevent targets that consume the Backward::Backward
-             ;; interface from treating it as "system includes".
-             (substitute* "CMakeLists.txt"
-               (("target_link_libraries\\((.+) Backward::Backward\\)" all 
target)
-                (string-append "set_property(TARGET " target " PROPERTY "
-                               "NO_SYSTEM_FROM_IMPORTED true)\n"
-                               all)))
-             #t))
-         (add-after 'unpack 'add-libiberty
-           ;; Build fails upon linking executables without this.
-           (lambda _
-             (substitute* "thirdparty/backward-cpp/BackwardConfig.cmake"
-               (("set\\(LIBBFD_LIBRARIES (.*?)\\)" _ libraries)
-                (string-append "set(LIBBFD_LIBRARIES " libraries " iberty)")))
-             #t))
-         (add-after 'add-libiberty 'lax-freealut-requirement
+         (add-after 'prepare-gmock 'lax-freealut-requirement
            ;; TODO: We provide freealut 1.1.0, but pkg-config somehow detects
            ;; it as 1.0.1.  Force minimal version.
            (lambda _
@@ -9686,10 +9689,11 @@ (define-public openclonk
        ("googletest" ,googletest)
        ("pkg-config" ,pkg-config)))
     (inputs
-     `(("freealut" ,freealut)
+     `(("c-template-sort" ,c-template-sort)
+       ("freealut" ,freealut)
        ("freetype" ,freetype)
        ("glew" ,glew)
-       ("libiberty" ,libiberty)
+       ("libb2" ,libb2)
        ("libjpeg" ,libjpeg-turbo)
        ("libogg" ,libogg)
        ("libpng" ,libpng)
@@ -9698,11 +9702,11 @@ (define-public openclonk
        ("mesa" ,mesa)
        ("miniupnpc" ,miniupnpc)
        ("openal" ,openal)
+       ("pcg-cpp" ,pcg-cpp)
        ("qtbase" ,qtbase-5)
        ("readline" ,readline)
        ("sdl" ,sdl2)
-       ("tinyxml" ,tinyxml)
-       ("zlib" ,zlib)))
+       ("tinyxml" ,tinyxml)))
     (home-page "https://www.openclonk.org/";)
     (synopsis
      "Multiplayer action game where you control small and nimble humanoids")
-- 
2.41.0