Subject: bug#42426: closed (Re: [bug#42426] [PATCH] gnu: widelands: Update to 21.)

From: [email-masked] (GNU bug Tracking System)
Date: Mon, 20 Jul 2020 10:46:01 +0000

Your bug report

#42426: [PATCH] gnu: widelands: Update to 21.

which was filed against the guix-patches package, has been closed.

The explanation is attached below, along with your original report.
If you require more details, please reply to [email-masked].

-- 
42426: http://debbugs.gnu.org/cgi/bugreport.cgi?bug=42426
GNU Bug Tracking System
Contact [email-masked] with problems

Subject: Re: [bug#42426] [PATCH] gnu: widelands: Update to 21.
From: Efraim Flashner <[email-masked]>
To: Michael Rohleder <[email-masked]>
Cc: [email-masked]
Date: Mon, 20 Jul 2020 13:44:18 +0300
List-Id: <debbugs-submit.debbugs.gnu.org>

Looks good. Patch pushed!

-- 
Efraim Flashner   <[email-masked]>   אפרים פלשנר
GPG key = A28B F40C 3E55 1372 662D  14F7 41AA E7DC CA3D 8351
Confidentiality cannot be guaranteed on emails sent or received unencrypted

Subject: [PATCH] gnu: widelands: Update to 21.
From: Michael Rohleder <[email-masked]>
To: [email-masked]
Date: Sun, 19 Jul 2020 10:55:02 +0200
List-Id: <debbugs-submit.debbugs.gnu.org>

From 59abde49df0248f8b1a770d59f62a7d8b6cf1495 Mon Sep 17 00:00:00 2001
From: Michael Rohleder <[email-masked]>
Date: Sun, 19 Jul 2020 10:49:29 +0200
Subject: [PATCH] gnu: widelands: Update to 21.

* gnu/packages/games.scm (widelands): Update to 21.

[arguments]: remove uneeded 'install-desktop-file-and-icons.
---
 gnu/packages/games.scm | 26 ++++----------------------
 1 file changed, 4 insertions(+), 22 deletions(-)

diff --git a/gnu/packages/games.scm b/gnu/packages/games.scm
index e037ff649c..f4d75eedd4 100644
--- a/gnu/packages/games.scm
+++ b/gnu/packages/games.scm
@@ -51,6 +51,7 @@
 ;;; Copyright © 2020 Vitaliy Shatrov <[email-masked]>
 ;;; Copyright © 2020 Jack Hill <[email-masked]>
 ;;; Copyright © 2020 Vincent Legoll <[email-masked]>
+;;; Copyright © 2020 Michael Rohleder <[email-masked]>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -4651,15 +4652,15 @@ tactics.")
 (define-public widelands
   (package
     (name "widelands")
-    (version "20")
+    (version "21")
     (source
      (origin
        (method url-fetch)
        (uri (string-append "https://launchpad.net/widelands/"
                            "build" version "/build" version "/+download/"
-                           "widelands-build" version ".tar.bz2"))
+                           "widelands-build" version "-source.tar.gz"))
        (sha256
-        (base32 "1cmwfwk7j6yi2pwmm4rm57s23sdzasqf53nx6567sdagqyc4sn9q"))
+        (base32 "0mz3jily0w1zxxqbnkqrp6hl88xhrwzbil9crq7gpcwidx60w7k0"))
        (modules '((guix build utils)))
        (snippet
         '(begin
@@ -4683,25 +4684,6 @@ tactics.")
                "-DCMAKE_BUILD_TYPE=Release"))
        #:phases
        (modify-phases %standard-phases
-         (add-after 'unpack 'install-desktop-file-and-icons
-           (lambda* (#:key inputs outputs #:allow-other-keys)
-             (let* ((share (string-append (assoc-ref outputs "out") "/share"))
-                    (applications (string-append share "/applications"))
-                    (icons (string-append share "/icons/hicolor")))
-               ;; Move desktop entry.
-               (mkdir-p applications)
-               (copy-file "debian/org.widelands.widelands.desktop"
-                          (string-append applications "/widelands.desktop"))
-               ;; Install icons.
-               (for-each (lambda (size)
-                           (let* ((dim (string-append size "x" size))
-                                  (apps (string-append icons "/" dim "/apps")))
-                             (mkdir-p apps)
-                             (copy-file (string-append "data/images/logos"
-                                                       "/wl-ico-" size ".png")
-                                        (string-append apps "/widelands.png"))))
-                         '("16" "32" "48" "64" "128"))
-               #t)))
          (add-after 'unpack 'unbundle-fonts
            ;; Unbundle fonts already packaged in Guix.  XXX: missing fonts are
            ;; amiri, Culmus, mmrCensus, Nakula, and Sinhala.
-- 
2.27.0

-- 
Kunst ist Magie, befreit von der Lüge, Wahrheit zu sein.
    Adorno