GNU bug report logs - #63682
[PATCH 1/2] gnu: warzone2100: Update to 4.3.5.

Previous Next

Package: guix-patches;

Reported by: iyzsong <at> envs.net

Date: Wed, 24 May 2023 13:37:02 UTC

Severity: normal

Tags: patch

Done: 宋文武 <iyzsong <at> envs.net>

Bug is archived. No further changes may be made.

Full log


View this message in rfc822 format

From: iyzsong <at> envs.net
To: 63682 <at> debbugs.gnu.org
Cc: 宋文武 <iyzsong <at> member.fsf.org>, Liliana Marie Prikler <liliana.prikler <at> gmail.com>, 宋文武 <iyzsong <at> envs.net>
Subject: [bug#63682] [PATCH 2/2] gnu: warzone2100: Rewrite package arguments to G-expressions.
Date: Wed, 24 May 2023 21:38:35 +0800
From: 宋文武 <iyzsong <at> member.fsf.org>

* gnu/packages/games.scm (warzone2100)[arguments]: Convert to list of
G-expressions.
---
 gnu/packages/games.scm | 47 +++++++++++++++++++++---------------------
 1 file changed, 23 insertions(+), 24 deletions(-)

diff --git a/gnu/packages/games.scm b/gnu/packages/games.scm
index eb3e0eb842..86382f7080 100644
--- a/gnu/packages/games.scm
+++ b/gnu/packages/games.scm
@@ -5414,30 +5414,29 @@ (define-public warzone2100
              #t))))
     (build-system cmake-build-system)
     (arguments
-     `(#:configure-flags '("-DWZ_DISTRIBUTOR=Guix"
-                           "-DWZ_ENABLE_BACKEND_VULKAN=off"
-                           "-DENABLE_DISCORD=off")
-       #:tests? #f ; TODO: Tests seem to be broken, configure.ac is missing.
-       #:phases
-       (modify-phases %standard-phases
-         (add-after 'unpack 'fix-utfcpp-include
-           (lambda _
-             (substitute* "lib/framework/wzstring.cpp"
-               (("<utfcpp/source/utf8.h>") "<utf8.h>"))
-             #t))
-         (add-after 'unpack 'link-tests-with-qt
-           (lambda _
-             (substitute* "tests/Makefile.am"
-               (("(framework_linktest_LDADD|maptest_LDADD) = " prefix)
-                (string-append prefix "$(QT5_LIBS) ")))
-             #t))
-         (add-after 'unpack 'fix-ivis-linktest
-           (lambda _
-             (substitute* "tests/ivis_linktest.cpp"
-               (("iV_DrawTextRotated.*;")
-                (string-append "iV_DrawTextRotated(\"Press ESC to exit.\", "
-                               "100, 100, 0.0f, font_regular);")))
-             #t)))))
+     (list #:configure-flags #~'("-DWZ_DISTRIBUTOR=Guix"
+                                 "-DWZ_ENABLE_BACKEND_VULKAN=off"
+                                 "-DENABLE_DISCORD=off")
+           #:tests? #f ; TODO: Tests seem to be broken, configure.ac is missing.
+           #:phases #~(modify-phases %standard-phases
+                        (add-after 'unpack 'fix-utfcpp-include
+                          (lambda _
+                            (substitute* "lib/framework/wzstring.cpp"
+                              (("<utfcpp/source/utf8.h>")
+                               "<utf8.h>"))))
+                        (add-after 'unpack 'link-tests-with-qt
+                          (lambda _
+                            (substitute* "tests/Makefile.am"
+                              (("(framework_linktest_LDADD|maptest_LDADD) = "
+                                prefix)
+                               (string-append prefix "$(QT5_LIBS) ")))))
+                        (add-after 'unpack 'fix-ivis-linktest
+                          (lambda _
+                            (substitute* "tests/ivis_linktest.cpp"
+                              (("iV_DrawTextRotated.*;")
+                               (string-append
+                                "iV_DrawTextRotated(\"Press ESC to exit.\", "
+                                "100, 100, 0.0f, font_regular);"))))))))
     (native-inputs (list asciidoc
                      ruby-asciidoctor
                      gettext-minimal
-- 
2.40.1





This bug report was last modified 1 year and 359 days ago.

Previous Next


GNU bug tracking system
Copyright (C) 1999 Darren O. Benham, 1997,2003 nCipher Corporation Ltd, 1994-97 Ian Jackson.