[PATCH 0/2] Update widelands

  • Done
  • quality assurance status badge
Details
2 participants
  • Christopher Baines
  • Timotej Lazar
Owner
unassigned
Submitted by
Timotej Lazar
Severity
normal
T
T
Timotej Lazar wrote on 6 Apr 10:37 +0200
(address . guix-patches@gnu.org)(name . Timotej Lazar)(address . timotej.lazar@araneo.si)
cover.1712392635.git.timotej.lazar@araneo.si
This updates widelands to the latest version, switches to new package
style and installs the binary and data files in correct locations.

Timotej Lazar (2):
gnu: widelands: Update to 1.2.
gnu: widelands: Improve package style.

gnu/packages/games.scm | 91 ++++++++++++++++++++----------------------
1 file changed, 44 insertions(+), 47 deletions(-)


base-commit: bfc614397b5f146056bda4b5a8e3a67bd1ca7b23
--
2.41.0
T
T
Timotej Lazar wrote on 6 Apr 10:44 +0200
[PATCH 1/2] gnu: widelands: Update to 1.2.
(address . 70235@debbugs.gnu.org)(name . Timotej Lazar)(address . timotej.lazar@araneo.si)
5f83354f3c946d1f21b3e4b9a48169a450649b88.1712392635.git.timotej.lazar@araneo.si
* gnu/packages/games.scm (widelands): Update to 1.2.
[inputs]: Drop boost, curl.
[native-inputs]: Replace python-wrapper with python.

Change-Id: I1a98739a5da801d3686acf152989c8ce15f16a90
---
gnu/packages/games.scm | 8 +++-----
1 file changed, 3 insertions(+), 5 deletions(-)

Toggle diff (37 lines)
diff --git a/gnu/packages/games.scm b/gnu/packages/games.scm
index 6e26a15f56..78aedca434 100644
--- a/gnu/packages/games.scm
+++ b/gnu/packages/games.scm
@@ -5786,7 +5786,7 @@ (define-public warzone2100
(define-public widelands
(package
(name "widelands")
- (version "1.1")
+ (version "1.2")
(source
(origin
(method git-fetch)
@@ -5795,7 +5795,7 @@ (define-public widelands
(commit (string-append "v" version))))
(file-name (git-file-name name version))
(sha256
- (base32 "07wbalwdmml9vdh9nh50svnsw4sdj9nnp32azbss8vzq5mxmzvbx"))
+ (base32 "1m9hn1sh1siggribzsq79k7p0lggdw41ji7zdl6h648cjak9mdsp"))
(modules '((guix build utils)))
(snippet
'(begin
@@ -5830,11 +5830,9 @@ (define-public widelands
(native-inputs
`(("gettext" ,gettext-minimal)
("pkg-config" ,pkg-config)
- ("python" ,python-wrapper)))
+ ("python" ,python)))
(inputs
`(("asio" ,asio)
- ("curl" ,curl)
- ("boost" ,boost)
("glew" ,glew)
("icu4c" ,icu4c)
("libpng" ,libpng)
--
2.41.0
T
T
Timotej Lazar wrote on 6 Apr 10:44 +0200
[PATCH 2/2] gnu: widelands: Improve package style.
(address . 70235@debbugs.gnu.org)(name . Timotej Lazar)(address . timotej.lazar@araneo.si)
ce57cee3cbdf379c178d3475dac259255b0baaab.1712392636.git.timotej.lazar@araneo.si
* gnu/packages/games.scm (widelands): Use new package style.
[snippet]: Simplify and drop trailing #t.
[arguments]: Use gexps. Tweak #:configure-flags to install the binary in bin/
instead of bin/games/ and data under share/ instead of bin/share/. Modify
'unbundle-fonts phase to not depend on input labels.
[inputs, native-inputs]: Drop input labels.
[home-page]: Drop trailing slash.

Change-Id: I75c535005ad1325ad170205b6e80b1039125619a
---
gnu/packages/games.scm | 85 +++++++++++++++++++++---------------------
1 file changed, 42 insertions(+), 43 deletions(-)

Toggle diff (107 lines)
diff --git a/gnu/packages/games.scm b/gnu/packages/games.scm
index 78aedca434..b788c7c774 100644
--- a/gnu/packages/games.scm
+++ b/gnu/packages/games.scm
@@ -5791,58 +5791,57 @@ (define-public widelands
(origin
(method git-fetch)
(uri (git-reference
- (url "https://github.com/widelands/widelands")
- (commit (string-append "v" version))))
+ (url "https://github.com/widelands/widelands")
+ (commit (string-append "v" version))))
(file-name (git-file-name name version))
(sha256
(base32 "1m9hn1sh1siggribzsq79k7p0lggdw41ji7zdl6h648cjak9mdsp"))
(modules '((guix build utils)))
(snippet
- '(begin
- (delete-file-recursively "src/third_party/minizip")
- #t))))
+ #~(delete-file-recursively "src/third_party/minizip"))))
(build-system cmake-build-system)
(arguments
- `(#:configure-flags
- (let* ((out (assoc-ref %outputs "out"))
- (share (string-append out "/share")))
- (list (string-append "-DCMAKE_INSTALL_PREFIX=" out "/bin")
- (string-append "-DWL_INSTALL_BASEDIR=" share "/widelands")
- (string-append "-DWL_INSTALL_DATADIR=" share "/widelands")
- "-DOPTION_BUILD_WEBSITE_TOOLS=OFF"
- ;; CMakeLists.txt does not handle properly RelWithDebInfo build
- ;; type. When used, no game data is installed!
- "-DCMAKE_BUILD_TYPE=Release"))
- #:phases
- (modify-phases %standard-phases
- (add-after 'unpack 'unbundle-fonts
- ;; Unbundle fonts already packaged in Guix. XXX: missing fonts are
- ;; amiri, Culmus, mmrCensus, Nakula, and Sinhala.
- (lambda* (#:key inputs #:allow-other-keys)
- (with-directory-excursion "data/i18n/fonts"
- (for-each (lambda (font)
- (delete-file-recursively font)
- (symlink (string-append (assoc-ref inputs font)
- "/share/fonts/truetype")
- font))
- '("DejaVu" "MicroHei")))
- #t)))))
+ (list
+ #:configure-flags
+ #~(let ((share (string-append #$output "/share/widelands")))
+ (list (string-append "-DCMAKE_INSTALL_PREFIX=" #$output)
+ (string-append "-DWL_INSTALL_BINDIR=" #$output "/bin")
+ (string-append "-DWL_INSTALL_BASEDIR=" share)
+ (string-append "-DWL_INSTALL_DATADIR=" share)
+ "-DOPTION_BUILD_WEBSITE_TOOLS=OFF"
+ ;; CMakeLists.txt does not handle properly RelWithDebInfo build
+ ;; type. When used, no game data is installed!
+ "-DCMAKE_BUILD_TYPE=Release"))
+ #:phases
+ #~(modify-phases %standard-phases
+ (add-after 'unpack 'unbundle-fonts
+ ;; Unbundle fonts already packaged in Guix. XXX: missing fonts are
+ ;; amiri, Culmus, mmrCensus, Nakula, and Sinhala.
+ (lambda* (#:key inputs #:allow-other-keys)
+ (for-each
+ (lambda (font)
+ (let* ((path (string-append "share/fonts/truetype/" (basename font)))
+ (target (false-if-exception (search-input-file inputs path))))
+ (when target
+ (delete-file font)
+ (symlink target font))))
+ (find-files "data/i18n/fonts" "\\.tt[cf]$")))))))
(native-inputs
- `(("gettext" ,gettext-minimal)
- ("pkg-config" ,pkg-config)
- ("python" ,python)))
+ (list gettext-minimal pkg-config python))
(inputs
- `(("asio" ,asio)
- ("glew" ,glew)
- ("icu4c" ,icu4c)
- ("libpng" ,libpng)
- ("minizip" ,minizip)
- ("sdl" ,(sdl-union (list sdl2 sdl2-image sdl2-mixer sdl2-ttf)))
- ("zlib" ,zlib)
- ;; Fonts for the ‘unbundle-fonts’ phase. Case matters in name!
- ("DejaVu" ,font-dejavu)
- ("MicroHei" ,font-wqy-microhei)))
- (home-page "https://www.widelands.org/")
+ (list asio
+ font-dejavu
+ font-wqy-microhei
+ glew
+ icu4c
+ libpng
+ minizip
+ sdl2
+ sdl2-image
+ sdl2-mixer
+ sdl2-ttf
+ zlib))
+ (home-page "https://www.widelands.org")
(synopsis "Fantasy real-time strategy game")
(description
"In Widelands, you are the regent of a small clan. You start out with
--
2.41.0
C
C
Christopher Baines wrote on 15 Apr 11:51 +0200
Re: [bug#70235] [PATCH 0/2] Update widelands
(name . Timotej Lazar)(address . timotej.lazar@araneo.si)
87frvnx8bi.fsf@cbaines.net
Timotej Lazar <timotej.lazar@araneo.si> writes:

Toggle quote (10 lines)
> This updates widelands to the latest version, switches to new package
> style and installs the binary and data files in correct locations.
>
> Timotej Lazar (2):
> gnu: widelands: Update to 1.2.
> gnu: widelands: Improve package style.
>
> gnu/packages/games.scm | 91 ++++++++++++++++++++----------------------
> 1 file changed, 44 insertions(+), 47 deletions(-)

Looks good to me, I've pushed these patches to master as
84a88f5ed96c8ec5781fc0f428d22380df1b1f14.

Chris
-----BEGIN PGP SIGNATURE-----

iQKlBAEBCgCPFiEEPonu50WOcg2XVOCyXiijOwuE9XcFAmYc+KFfFIAAAAAALgAo
aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldDNF
ODlFRUU3NDU4RTcyMEQ5NzU0RTBCMjVFMjhBMzNCMEI4NEY1NzcRHG1haWxAY2Jh
aW5lcy5uZXQACgkQXiijOwuE9XfbQQ/9FlHPprzAz+C3WFxQYYnIXJZxUbI2TQQa
r+kxYxwrBN6rmjZeN38S2nIfGr6brNQVN9VGrgZkgMoVRrh2o27tQUysTZTBYqxm
HxETS9Gf2W7Y8m+ZFlb+AFfGlHY9FLH1ictlR4E5q+O7ESIOctwjELi3YKmundqS
x+AXDtMQ8nRM78yw/ayZ375TsrR5ejQSK/M738pBrD27LAEDERFezyFiDMW0J6dN
0LIp9KNAcMWDq676ooYzBWMwq7S7WOn5pM/fVC6feJ6iXRPwlqC5cL/r5rlI0XxI
A5TR50h9syKV3c8WVNegb+tsEiA3ZSslCI0emqjEfQuYNcwtZI22HkLfWDnYtI1E
lXrkwzVLzVg6c0w0pxlBMzkCNEyvqqfvqZK5yZT9VfPeD67sTiF6T6LN4ppUwAH1
cudK+hRuZd1D7K245E9gh3FI/rlzS98no7tvx5ywjlqUthFRs7wOy60vuiW8LYGS
GTRnRDp22Fn6hRPB7xYt5ER44KcSdhceOL8fNoIOOuTG0zE3vbVTtdNPCSpdPm+K
2SWs1ms2quZVzp/yzKq50pavX1pmr06y+wnddkttJ2bcdR1v0cjOL1YGbdFXqN+V
31BO0A6nPZKVjDFfCK8OnOR1HK+LS3yemNvPxJLf8fU7i1m7RrXJSFo8xje4QE1P
OYeHuo3l698=
=6jDD
-----END PGP SIGNATURE-----

Closed
?
Your comment

This issue is archived.

To comment on this conversation send an email to 70235@debbugs.gnu.org

To respond to this issue using the mumi CLI, first switch to it
mumi current 70235
Then, you may apply the latest patchset in this issue (with sign off)
mumi am -- -s
Or, compose a reply to this issue
mumi compose
Or, send patches to this issue
mumi send-email *.patch