* [bug#63682] [PATCH 1/2] gnu: warzone2100: Update to 4.3.5.
@ 2023-05-24 13:36 iyzsong--- via Guix-patches via
2023-05-24 13:38 ` [bug#63682] [PATCH 2/2] gnu: warzone2100: Rewrite package arguments to G-expressions iyzsong--- via Guix-patches via
0 siblings, 1 reply; 4+ messages in thread
From: iyzsong--- via Guix-patches via @ 2023-05-24 13:36 UTC (permalink / raw)
To: 63682
Cc: 宋文武, Liliana Marie Prikler,
宋文武
From: 宋文武 <iyzsong@member.fsf.org>
* gnu/packages/games.scm (warzone2100): Update to 4.3.5.
---
gnu/packages/games.scm | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/gnu/packages/games.scm b/gnu/packages/games.scm
index d1e2248588..eb3e0eb842 100644
--- a/gnu/packages/games.scm
+++ b/gnu/packages/games.scm
@@ -5393,7 +5393,7 @@ (define-public tennix
(define-public warzone2100
(package
(name "warzone2100")
- (version "4.3.3")
+ (version "4.3.5")
(source
(origin
(method url-fetch)
@@ -5401,7 +5401,7 @@ (define-public warzone2100
version
"/warzone2100_src.tar.xz"))
(sha256
- (base32 "17p58wxwva0qp267hm1alas52jd9h74494wh01ahz880hscbjg1w"))
+ (base32 "1hq56hm6bn3s2pksznh5g8hgq6ww6fnl1pspr3bi93k3z7v0imh1"))
(modules '((guix build utils)))
(snippet
'(begin
base-commit: 514644c10271c50de1d03702bc6df971dc72feb6
--
2.40.1
^ permalink raw reply related [flat|nested] 4+ messages in thread* [bug#63682] [PATCH 2/2] gnu: warzone2100: Rewrite package arguments to G-expressions.
2023-05-24 13:36 [bug#63682] [PATCH 1/2] gnu: warzone2100: Update to 4.3.5 iyzsong--- via Guix-patches via
@ 2023-05-24 13:38 ` iyzsong--- via Guix-patches via
2023-05-24 16:47 ` Liliana Marie Prikler
0 siblings, 1 reply; 4+ messages in thread
From: iyzsong--- via Guix-patches via @ 2023-05-24 13:38 UTC (permalink / raw)
To: 63682
Cc: 宋文武, Liliana Marie Prikler,
宋文武
From: 宋文武 <iyzsong@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
^ permalink raw reply related [flat|nested] 4+ messages in thread* [bug#63682] [PATCH 2/2] gnu: warzone2100: Rewrite package arguments to G-expressions.
2023-05-24 13:38 ` [bug#63682] [PATCH 2/2] gnu: warzone2100: Rewrite package arguments to G-expressions iyzsong--- via Guix-patches via
@ 2023-05-24 16:47 ` Liliana Marie Prikler
2023-05-30 10:46 ` bug#63682: [PATCH 1/2] gnu: warzone2100: Update to 4.3.5 宋文武 via Guix-patches via
0 siblings, 1 reply; 4+ messages in thread
From: Liliana Marie Prikler @ 2023-05-24 16:47 UTC (permalink / raw)
To: iyzsong, 63682; +Cc: 宋文武
Am Mittwoch, dem 24.05.2023 um 21:38 +0800 schrieb iyzsong@envs.net:
> From: 宋文武 <iyzsong@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
Maybe add a newline after #:phases for horizontal real estate.
Otherwise LGTM but untested.
Cheers
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2023-05-30 10:47 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2023-05-24 13:36 [bug#63682] [PATCH 1/2] gnu: warzone2100: Update to 4.3.5 iyzsong--- via Guix-patches via
2023-05-24 13:38 ` [bug#63682] [PATCH 2/2] gnu: warzone2100: Rewrite package arguments to G-expressions iyzsong--- via Guix-patches via
2023-05-24 16:47 ` Liliana Marie Prikler
2023-05-30 10:46 ` bug#63682: [PATCH 1/2] gnu: warzone2100: Update to 4.3.5 宋文武 via Guix-patches via
Code repositories for project(s) associated with this external index
https://git.savannah.gnu.org/cgit/guix.git
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.