[bug#31375] [PATCH 0/2] Update wesnoth to 1.14.0

[bug#31375] [PATCH 0/2] Update wesnoth to 1.14.0

[Arun Isaac]

The following patches update wesnoth to the latest stable version 1.14.0. The
game works fine, but opening the in-game Preferences dialog box crashes the
game with the following error message.

Caught general 'St8bad_cast' exception:
std::bad_cast

Any inputs on this? Based on what I heard from a friend, this issue does not
exist in Arch Linux's wesnoth 1.14.0 package.

Arun Isaac (2):
  gnu: wesnoth: Update to 1.14.0.
  gnu: wesnoth-server: Update to 1.14.0.

 gnu/packages/games.scm | 38 +++++++++++---------------------------
 1 file changed, 11 insertions(+), 27 deletions(-)

-- 
2.15.1

[bug#31375] [PATCH 1/2] gnu: wesnoth: Update to 1.14.0.

[Arun Isaac]

* gnu/packages/games.scm (wesnoth): Update to 1.14.0.
[arguments]: Remove "-DENABLE_STRICT_COMPILATION=OFF" configure flag.
[inputs]: Remove sdl-image, sdl-mixer, sdl-net and sdl-ttf. Add openssl and
sdl-union of sdl2, sdl2-image, sdl2-mixer and sdl2-ttf.
[home-page]: Use HTTPS URI.
---
 gnu/packages/games.scm | 21 ++++++---------------
 1 file changed, 6 insertions(+), 15 deletions(-)

diff --git a/gnu/packages/games.scm b/gnu/packages/games.scm
index e4f87a6c4..27eb57573 100644
--- a/gnu/packages/games.scm
+++ b/gnu/packages/games.scm
@@ -1809,7 +1809,7 @@ falling, themeable graphics and sounds, and replays.")
 (define-public wesnoth
   (package
     (name "wesnoth")
-    (version "1.12.6")
+    (version "1.14.0")
     (source (origin
               (method url-fetch)
               (uri (string-append "mirror://sourceforge/wesnoth/wesnoth-"
@@ -1818,17 +1818,10 @@ falling, themeable graphics and sounds, and replays.")
                                   name "-" version ".tar.bz2"))
               (sha256
                (base32
-                "0kifp6g1dsr16m6ngjq2hx19h851fqg326ps3krnhpyix963h3x5"))))
+                "09niq53y17faizhmd98anx3dha7hvacvj9a0a64lg8wn915cm0bw"))))
     (build-system cmake-build-system)
     (arguments
-     '(#:tests? #f ; no check target
-       #:configure-flags
-       ;; XXX: Failed to compile with '-Werror=old-style-cast'.
-       ;;   boost/mpl/assert.hpp:313:58: error:
-       ;;     use of old-style cast [-Werror=old-style-cast]
-       ;;   [...]
-       ;;   cc1plus: all warnings being treated as errors
-       '("-DENABLE_STRICT_COMPILATION=OFF")))
+     `(#:tests? #f)) ; no check target
     (native-inputs
      `(("gettext" ,gettext-minimal)
        ("pkg-config" ,pkg-config)))
@@ -1837,12 +1830,10 @@ falling, themeable graphics and sounds, and replays.")
        ("dbus" ,dbus)
        ("fribidi" ,fribidi)
        ("libvorbis" ,libvorbis)
+       ("openssl" ,openssl)
        ("pango" ,pango)
-       ("sdl-image" ,sdl-image)
-       ("sdl-mixer" ,sdl-mixer)
-       ("sdl-net" ,sdl-net)
-       ("sdl-ttf" ,sdl-ttf)))
-    (home-page "http://www.wesnoth.org/")
+       ("sdl-union" ,(sdl-union (list sdl2 sdl2-image sdl2-mixer sdl2-ttf)))))
+    (home-page "https://www.wesnoth.org/")
     (synopsis "Turn-based strategy game")
     (description
      "The Battle for Wesnoth is a fantasy, turn based tactical strategy game,
-- 
2.15.1

[bug#31375] [PATCH 2/2] gnu: wesnoth-server: Update to 1.14.0.

[Arun Isaac]

* gnu/packages/games.scm (wesnoth-server): Update to 1.14.0.
[inputs]: Remove sdl-net. Add icu4c, openssl and sdl2.
[arguments]: Remove delete-data phase. Since wesnoth 1.14.0, configure flag
"-DENABLE_GAME=OFF" disables installation of game assets.
---
 gnu/packages/games.scm | 17 +++++------------
 1 file changed, 5 insertions(+), 12 deletions(-)

diff --git a/gnu/packages/games.scm b/gnu/packages/games.scm
index 27eb57573..db0614ee7 100644
--- a/gnu/packages/games.scm
+++ b/gnu/packages/games.scm
@@ -1852,19 +1852,12 @@ next campaign.")
     (name "wesnoth-server")
     (inputs
      `(("boost" ,boost)
-       ("sdl-net" ,sdl-net)))
+       ("icu4c" ,icu4c)
+       ("openssl" ,openssl)
+       ("sdl2" ,sdl2)))
     (arguments
-     (append
-      (substitute-keyword-arguments (package-arguments wesnoth)
-        ((#:configure-flags configure-flags)
-         `(append ,configure-flags (list "-DENABLE_GAME=OFF"))))
-      `(#:phases
-        (modify-phases %standard-phases
-          ;; Delete game assets not required by the server.
-          (add-after 'install 'delete-data
-            (lambda* (#:key outputs #:allow-other-keys)
-              (delete-file-recursively (string-append (assoc-ref outputs "out")
-                                                      "/share/wesnoth"))))))))
+     `(#:configure-flags '("-DENABLE_GAME=OFF")
+       ,@(package-arguments wesnoth)))
     (synopsis "Dedicated @emph{Battle for Wesnoth} server")
     (description "This package contains a dedicated server for @emph{The
 Battle for Wesnoth}.")))
-- 
2.15.1

[bug#31375] [PATCH 0/2] Update wesnoth to 1.14.0

[Ludovic Courtès]

Hello,

Arun Isaac <arunisaac@systemreboot.net> skribis:

> The following patches update wesnoth to the latest stable version 1.14.0. The
> game works fine, but opening the in-game Preferences dialog box crashes the
> game with the following error message.
>
> Caught general 'St8bad_cast' exception:
> std::bad_cast

Did you try getting a backtrace with gdb?  It might give clues.

Apart from that, the patches LGTM, though I think you need to merge them
into a single patch; otherwise applying the first one leaves
‘wesnoth-server’ in broken state since it inherits from ‘wesnoth’.

Thanks,
Ludo’.

[bug#31375] [PATCH 0/2] Update wesnoth to 1.14.0

[Arun Isaac]

Ludovic Courtès <ludo@gnu.org> writes:

>> Caught general 'St8bad_cast' exception:
>> std::bad_cast
>
> Did you try getting a backtrace with gdb?  It might give clues.

This seems to be an upstream issue. I have contacted upstream, and they
have provided a patch. I'll include the patch and push.

https://github.com/wesnoth/wesnoth/issues/3050

I am not entirely sure if this issue was triggered in Guix (and not in
other distributions like Arch Linux), by some bug in our locale
handling.

> I think you need to merge them into a single patch; otherwise applying
> the first one leaves ‘wesnoth-server’ in broken state since it
> inherits from ‘wesnoth’.

Sure, will do.

[bug#31375] [PATCH 0/2] Update wesnoth to 1.14.0

[Ludovic Courtès]

Arun Isaac <arunisaac@systemreboot.net> skribis:

> Ludovic Courtès <ludo@gnu.org> writes:
>
>>> Caught general 'St8bad_cast' exception:
>>> std::bad_cast
>>
>> Did you try getting a backtrace with gdb?  It might give clues.
>
> This seems to be an upstream issue. I have contacted upstream, and they
> have provided a patch. I'll include the patch and push.
>
> https://github.com/wesnoth/wesnoth/issues/3050

It could be that this exception is thrown in environments where
setlocale(LC_ALL, "") fails (i.e., when the program cannot install the
selected locale for some reason.)

Anyway, great that you found out.

Ludo’.

bug#31375: [PATCH 0/2] Update wesnoth to 1.14.0

[Arun Isaac]

Pushed!