GNU bug report logs -
#63682
[PATCH 1/2] gnu: warzone2100: Update to 4.3.5.
Previous Next
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.
To add a comment to this bug, you must first unarchive it, by sending
a message to control AT debbugs.gnu.org, with unarchive 63682 in the body.
You can then email your comments to 63682 AT debbugs.gnu.org in the normal way.
Toggle the display of automated, internal messages from the tracker.
Report forwarded
to
liliana.prikler <at> gmail.com, iyzsong <at> envs.net, guix-patches <at> gnu.org:
bug#63682; Package
guix-patches.
(Wed, 24 May 2023 13:37:02 GMT)
Full text and
rfc822 format available.
Acknowledgement sent
to
iyzsong <at> envs.net:
New bug report received and forwarded. Copy sent to
liliana.prikler <at> gmail.com, iyzsong <at> envs.net, guix-patches <at> gnu.org.
(Wed, 24 May 2023 13:37:02 GMT)
Full text and
rfc822 format available.
Message #5 received at submit <at> debbugs.gnu.org (full text, mbox):
From: 宋文武 <iyzsong <at> 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
Information forwarded
to
liliana.prikler <at> gmail.com, iyzsong <at> envs.net, guix-patches <at> gnu.org:
bug#63682; Package
guix-patches.
(Wed, 24 May 2023 13:39:02 GMT)
Full text and
rfc822 format available.
Message #8 received at 63682 <at> debbugs.gnu.org (full text, mbox):
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
Information forwarded
to
guix-patches <at> gnu.org:
bug#63682; Package
guix-patches.
(Wed, 24 May 2023 16:48:01 GMT)
Full text and
rfc822 format available.
Message #11 received at 63682 <at> debbugs.gnu.org (full text, mbox):
Am Mittwoch, dem 24.05.2023 um 21:38 +0800 schrieb iyzsong <at> envs.net:
> 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
Maybe add a newline after #:phases for horizontal real estate.
Otherwise LGTM but untested.
Cheers
Reply sent
to
宋文武 <iyzsong <at> envs.net>:
You have taken responsibility.
(Tue, 30 May 2023 10:47:02 GMT)
Full text and
rfc822 format available.
Notification sent
to
iyzsong <at> envs.net:
bug acknowledged by developer.
(Tue, 30 May 2023 10:47:02 GMT)
Full text and
rfc822 format available.
Message #16 received at 63682-done <at> debbugs.gnu.org (full text, mbox):
> Maybe add a newline after #:phases for horizontal real estate.
> Otherwise LGTM but untested.
Done, thank you for review!
bug archived.
Request was from
Debbugs Internal Request <help-debbugs <at> gnu.org>
to
internal_control <at> debbugs.gnu.org.
(Tue, 27 Jun 2023 11:24:14 GMT)
Full text and
rfc822 format available.
This bug report was last modified 1 year and 319 days ago.
Previous Next
GNU bug tracking system
Copyright (C) 1999 Darren O. Benham,
1997,2003 nCipher Corporation Ltd,
1994-97 Ian Jackson.