From patchwork Sun Jul 19 08:55:02 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Michael Rohleder X-Patchwork-Id: 23254 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id E718227BBE3; Sun, 19 Jul 2020 09:56:08 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.9 required=5.0 tests=BAYES_00,MAILING_LIST_MULTI, RCVD_IN_MSPIKE_H4,RCVD_IN_MSPIKE_WL,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.2 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTP id 309FB27BBE1 for ; Sun, 19 Jul 2020 09:56:08 +0100 (BST) Received: from localhost ([::1]:55840 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jx579-0005BZ-Kl for patchwork@mira.cbaines.net; Sun, 19 Jul 2020 04:56:07 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:43024) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jx574-0005BO-BH for guix-patches@gnu.org; Sun, 19 Jul 2020 04:56:02 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:48399) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1jx574-0002Fz-10 for guix-patches@gnu.org; Sun, 19 Jul 2020 04:56:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1jx574-0005xy-0J for guix-patches@gnu.org; Sun, 19 Jul 2020 04:56:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#42426] [PATCH] gnu: widelands: Update to 21. Resent-From: Michael Rohleder Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 19 Jul 2020 08:56:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 42426 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 42426@debbugs.gnu.org X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.159514893022878 (code B ref -1); Sun, 19 Jul 2020 08:56:01 +0000 Received: (at submit) by debbugs.gnu.org; 19 Jul 2020 08:55:30 +0000 Received: from localhost ([127.0.0.1]:59939 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jx56X-0005ww-M2 for submit@debbugs.gnu.org; Sun, 19 Jul 2020 04:55:30 -0400 Received: from lists.gnu.org ([209.51.188.17]:43160) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jx56S-0005wf-TV for submit@debbugs.gnu.org; Sun, 19 Jul 2020 04:55:28 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:42888) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jx56S-000510-LA for guix-patches@gnu.org; Sun, 19 Jul 2020 04:55:24 -0400 Received: from wp224.webpack.hosteurope.de ([2a01:488:42:1000:50ed:84e7::]:54754) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jx56P-000248-2f for guix-patches@gnu.org; Sun, 19 Jul 2020 04:55:24 -0400 Received: from www.rohleder.de ([37.61.204.227]); authenticated by wp224.webpack.hosteurope.de running ExIM with esmtpsa (TLS1.3:ECDHE_RSA_AES_256_GCM_SHA384:256) id 1jx56J-0002Qv-Tp; Sun, 19 Jul 2020 10:55:15 +0200 Received: from [192.168.1.3] (helo=micha) by www.rohleder.de with esmtps (TLS1.3) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.94) (envelope-from ) id 1jx56I-0004df-Tv for guix-patches@gnu.org; Sun, 19 Jul 2020 10:55:15 +0200 From: Michael Rohleder X-PGP-Fingerprint: 755E 2DE5 D0D5 85C5 2E78 2830 7C7A FFBE FEF2 CB25 X-PGP-Key: https://www.rohleder.de/~mike/pgpkey.asc Date: Sun, 19 Jul 2020 10:55:02 +0200 Message-ID: <87ft9ndgux.fsf@rohleder.de> MIME-Version: 1.0 X-bounce-key: webpack.hosteurope.de;mike@rohleder.de;1595148918;f3d68316; X-HE-SMSGID: 1jx56J-0002Qv-Tp Received-SPF: permerror client-ip=2a01:488:42:1000:50ed:84e7::; envelope-from=mike@rohleder.de; helo=wp224.webpack.hosteurope.de X-detected-operating-system: by eggs.gnu.org: First seen = 2020/07/19 04:55:16 X-ACL-Warn: Detected OS = ??? X-Spam_score_int: -18 X-Spam_score: -1.9 X-Spam_bar: - X-Spam_report: (-1.9 / 5.0 requ) BAYES_00=-1.9, SPF_HELO_NONE=0.001, T_SPF_PERMERROR=0.01 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches From 59abde49df0248f8b1a770d59f62a7d8b6cf1495 Mon Sep 17 00:00:00 2001 From: Michael Rohleder 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 ;;; Copyright © 2020 Jack Hill ;;; Copyright © 2020 Vincent Legoll +;;; Copyright © 2020 Michael Rohleder ;;; ;;; 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