From patchwork Sat Apr 11 18:23:42 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Vincent Legoll X-Patchwork-Id: 21195 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 4A2E927BBE4; Sat, 11 Apr 2020 19:25:09 +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.8 required=5.0 tests=BAYES_00,DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED,FREEMAIL_FROM,MAILING_LIST_MULTI,T_DKIM_INVALID, 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 1689127BBE1 for ; Sat, 11 Apr 2020 19:25:09 +0100 (BST) Received: from localhost ([::1]:54514 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jNKoW-0004lH-M8 for patchwork@mira.cbaines.net; Sat, 11 Apr 2020 14:25:08 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:34251) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jNKoR-0004l4-BG for guix-patches@gnu.org; Sat, 11 Apr 2020 14:25:04 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1jNKoQ-000068-AQ for guix-patches@gnu.org; Sat, 11 Apr 2020 14:25:03 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:45529) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1jNKoQ-00005y-7d for guix-patches@gnu.org; Sat, 11 Apr 2020 14:25:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1jNKoQ-0001tU-4w for guix-patches@gnu.org; Sat, 11 Apr 2020 14:25:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#40560] [PATCH 1/2] gnu: openttd-opengfx: Update to 0.6.0. References: In-Reply-To: Resent-From: Vincent Legoll Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sat, 11 Apr 2020 18:25:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 40560 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: To: 40560@debbugs.gnu.org Cc: Vincent Legoll Received: via spool by 40560-submit@debbugs.gnu.org id=B40560.15866294567214 (code B ref 40560); Sat, 11 Apr 2020 18:25:02 +0000 Received: (at 40560) by debbugs.gnu.org; 11 Apr 2020 18:24:16 +0000 Received: from localhost ([127.0.0.1]:57073 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jNKnf-0001sI-QO for submit@debbugs.gnu.org; Sat, 11 Apr 2020 14:24:15 -0400 Received: from mail-wr1-f46.google.com ([209.85.221.46]:37517) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jNKnd-0001s0-V6 for 40560@debbugs.gnu.org; Sat, 11 Apr 2020 14:24:14 -0400 Received: by mail-wr1-f46.google.com with SMTP id w10so5792927wrm.4 for <40560@debbugs.gnu.org>; Sat, 11 Apr 2020 11:24:13 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=Sx2JRLtGx0qba59mlb7mB8oJRg6xYeE3lMDqti/mcf4=; b=KQ9rx9RkXbp0FF5ktzvSkuh7KNWhjRQX5U5oyJU/IeyD2gErnad5NhzhA/tOy/YK5Z OFH4yT/kgYb2IjHE2HyUjZ3dn2sB2+bLCWkzxf6Z7nTMADW0vDnjz3151fhwXoSPwb8d KPUgHV+sCPT6ekNC+nU/KvCvuG1AWx00RlDnJKgKGOdCLMpaAEHr/LHvSYFUtWhEND4+ 23OJ6QVSwiMmfZc7ZVWQa21JO2kyOnG9GJ0TtDBnK0QLCowoPP4XjE8PiDhl+IIAD0mL +SkuRmL3mpicXrAZkrS/BxUveiFAaZKrmPYWMekfrkImxYXrRGQxdBKPHqkUlaZP0aiY dGcA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=Sx2JRLtGx0qba59mlb7mB8oJRg6xYeE3lMDqti/mcf4=; b=qGVJv+1zB2BgklZI6vd55NF4Dg6pIMmFwVYq07SUwpKPx5ZT4qwkO2isUy+QQPKvao 5dWKehvR0pEtHNCqVxcCGvQeuSbM6/W2U16YbmBXTd0P6ZR6a3h6uj5YcCewScvugKjC QIQkHQjcTnDTwA3QJveDlIW+kvRm+QJZkHSJNc71+fhiZSsY8vIp350mnwz1diDClJxA gE8qRTs+0/cMCQ+RDlN7oWyPLnXgd/EOUCry90zRWuRoW1en5ny6gFeI7A2d6yGBBt08 Q4CuE65VxgOrucGiNBBMiJI/n31M0utB3t3+Wxnyha4aNfbHGj3yjVveXnJil+Sxens/ 15Ug== X-Gm-Message-State: AGi0PuY08O2pIg1gflZq5dBfsXILY4pI3GaygKmAn8Erkrxb2deQWWG0 UAO3KfcDjeXyrOOSt/mqQmG+vrdY X-Google-Smtp-Source: APiQypKQCZZDbWfZEJ2mZ9c4koBRMknRGiQ5DvlM475DcripdkTwsQt2rhZsyKcE+Do1Eg5aUo8P2A== X-Received: by 2002:a5d:4648:: with SMTP id j8mr10808377wrs.202.1586629447654; Sat, 11 Apr 2020 11:24:07 -0700 (PDT) Received: from localhost.localdomain (se167-1-82-242-148-1.fbx.proxad.net. [82.242.148.1]) by smtp.gmail.com with ESMTPSA id w18sm7844362wrn.55.2020.04.11.11.24.06 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 11 Apr 2020 11:24:07 -0700 (PDT) From: Vincent Legoll Date: Sat, 11 Apr 2020 20:23:42 +0200 Message-Id: <20200411182343.4938-1-vincent.legoll@gmail.com> X-Mailer: git-send-email 2.26.0 MIME-Version: 1.0 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 209.51.188.43 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 * gnu/packages/games.scm (openttd-opengfx)[version]: Update to 0.6.0. [source]: Change uri to cdn.openttd.org. [native-inputs]: Add which. --- gnu/packages/games.scm | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/gnu/packages/games.scm b/gnu/packages/games.scm index 31e1936795..5543e46ac8 100644 --- a/gnu/packages/games.scm +++ b/gnu/packages/games.scm @@ -3034,15 +3034,15 @@ engine. When you start it you will be prompted to download a graphics set.") (define openttd-opengfx (package (name "openttd-opengfx") - (version "0.5.5") + (version "0.6.0") (source (origin (method url-fetch) - (uri (string-append "http://binaries.openttd.org/extra/opengfx/" + (uri (string-append "https://cdn.openttd.org/opengfx-releases/" version "/opengfx-" version "-source.tar.xz")) (sha256 (base32 - "009fa1bdin1bk0ynzhzc30hzkmmwzmwkk6j591ax3f6w75l28n49")))) + "0qxc6gl2gxcrn1np88dnjgbaaakkkx96b13rcmy1spryc8c09hyr")))) (build-system gnu-build-system) (arguments '(#:make-flags (list "CC=gcc" @@ -3072,6 +3072,7 @@ engine. When you start it you will be prompted to download a graphics set.") ("gimp" ,gimp) ("grfcodec" ,grfcodec) ("nml" ,nml) + ("which" ,which) ("python" ,python-2))) (home-page "http://dev.openttdcoop.org/projects/opengfx") (synopsis "Base graphics set for OpenTTD") From patchwork Sat Apr 11 18:23:43 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Vincent Legoll X-Patchwork-Id: 21196 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 02DBB27BBE4; Sat, 11 Apr 2020 19:25:14 +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.8 required=5.0 tests=BAYES_00,DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED,FREEMAIL_FROM,MAILING_LIST_MULTI,T_DKIM_INVALID, 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 BB81B27BBE1 for ; Sat, 11 Apr 2020 19:25:13 +0100 (BST) Received: from localhost ([::1]:54518 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jNKob-0004rm-Ar for patchwork@mira.cbaines.net; Sat, 11 Apr 2020 14:25:13 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:34256) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jNKoR-0004l5-Oe for guix-patches@gnu.org; Sat, 11 Apr 2020 14:25:04 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1jNKoQ-00006o-MX for guix-patches@gnu.org; Sat, 11 Apr 2020 14:25:03 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:45530) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1jNKoQ-00006h-Jh for guix-patches@gnu.org; Sat, 11 Apr 2020 14:25:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1jNKoQ-0001tb-HG for guix-patches@gnu.org; Sat, 11 Apr 2020 14:25:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#40560] [PATCH 2/2] gnu: openttd: Update to 1.10.0. Resent-From: Vincent Legoll Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sat, 11 Apr 2020 18:25:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 40560 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: To: 40560@debbugs.gnu.org Cc: Vincent Legoll Received: via spool by 40560-submit@debbugs.gnu.org id=B40560.15866294587223 (code B ref 40560); Sat, 11 Apr 2020 18:25:02 +0000 Received: (at 40560) by debbugs.gnu.org; 11 Apr 2020 18:24:18 +0000 Received: from localhost ([127.0.0.1]:57075 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jNKni-0001sR-1L for submit@debbugs.gnu.org; Sat, 11 Apr 2020 14:24:18 -0400 Received: from mail-wr1-f65.google.com ([209.85.221.65]:44119) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jNKne-0001s1-FZ for 40560@debbugs.gnu.org; Sat, 11 Apr 2020 14:24:14 -0400 Received: by mail-wr1-f65.google.com with SMTP id c15so5746864wro.11 for <40560@debbugs.gnu.org>; Sat, 11 Apr 2020 11:24:14 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=QdPLGsIo0DysjdhV34cJu0U0ZZZN2Kjy4A9yM9WFK1k=; b=U+LNngLvAlGDiESG2kQ9iKqFCE9bcLxyDOB6qkahxY+uvtR5v33pUtYrYLjxOowfBe lm7jQWhImxRNllIZTJWbD4K5g9nGtDkH7UltMu6ZqPBJPiWnApRAvHQgnFiNMzab9Bne AKOqQyQdvgQzzEeTq2AIxLnPmsP2fF70MQyhkr4F9qCHKZcpFuA87c5p9yCPE6E+Gw9s AKawzuXafSX28i8VnM56HZ6MsCEM+0FUQzUdy8PygEHBl2o+mtc3Eva2R8BBlPB4cliY vdq0CW4TqZF3CdEJOZqB578sRE4KLsYOAp13RB8WUbxQ2fDZQbVLqw2Ilv+FKRBjDKiz RlMQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=QdPLGsIo0DysjdhV34cJu0U0ZZZN2Kjy4A9yM9WFK1k=; b=mRGwFOG+T+zCtDG+fLy+3J9KBYDzf0w1suLFOy3E7LtXSlwf59t/FZP4Q+9QtaJaAB uvJLoXfFSGlRg+RA50Fs7SM3jpWX3P8Oj3GeSi6vB5lY9OXIHdwkALJ04L3+Dr8f374+ o6aFBTUWOy7i89SMC8ZJA2DM3kT/s32W+B4KIqD9QnBOSK7U24FTQmDSaM8k+3wUouJs 1RlGOX9r4QX+aLX0hVc+iZzgMHXkVDACJH7/x2gbbEf/pYnUKofkx47zBeFi88XVULDZ AhwR1DsHkyixzHA9IenCLdMfkj+qHcaHKYfnKjP5ZK84nQte+i8GLM8zr70hI3EeNL9V Ftnw== X-Gm-Message-State: AGi0PuaLqD+6A43LIYdvDKBcTHebbStUiIBOf3ONNNil7mSJPg6yOBDx 6AQXy7LfUbnd9BXJ7oDkeD5mWkVD X-Google-Smtp-Source: APiQypInxuMcuMGQndscmNOX4sre5uL+YcUAIWzF8ObLdGKewmnm6t7mn5tUOzIe8DZQdMQt8smONw== X-Received: by 2002:adf:e942:: with SMTP id m2mr10637010wrn.364.1586629448589; Sat, 11 Apr 2020 11:24:08 -0700 (PDT) Received: from localhost.localdomain (se167-1-82-242-148-1.fbx.proxad.net. [82.242.148.1]) by smtp.gmail.com with ESMTPSA id w18sm7844362wrn.55.2020.04.11.11.24.07 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 11 Apr 2020 11:24:08 -0700 (PDT) From: Vincent Legoll Date: Sat, 11 Apr 2020 20:23:43 +0200 Message-Id: <20200411182343.4938-2-vincent.legoll@gmail.com> X-Mailer: git-send-email 2.26.0 In-Reply-To: <20200411182343.4938-1-vincent.legoll@gmail.com> References: <20200411182343.4938-1-vincent.legoll@gmail.com> MIME-Version: 1.0 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 209.51.188.43 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 The os/dos subdirectory has been removed by upstream commit: fdb804d86bcab8d0529bdf6ca925bed04ad2f047 * gnu/packages/games.scm (openttd)[version]: Update to 1.10.0. [source]: Change uri to cdn.openttd.org, remove snippet & modules. --- gnu/packages/games.scm | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) diff --git a/gnu/packages/games.scm b/gnu/packages/games.scm index 5543e46ac8..ba3a199b97 100644 --- a/gnu/packages/games.scm +++ b/gnu/packages/games.scm @@ -2971,20 +2971,14 @@ world}, @uref{http://evolonline.org, Evol Online} and (define openttd-engine (package (name "openttd-engine") - (version "1.9.3") + (version "1.10.0") (source (origin (method url-fetch) - (uri (string-append "https://proxy.binaries.openttd.org/openttd-releases/" + (uri (string-append "https://cdn.openttd.org/openttd-releases/" version "/openttd-" version "-source.tar.xz")) (sha256 (base32 - "0ijq72kgx997ggw40i5f4a3nf7y2g72z37l47i18yjvgbdzy320r")) - (modules '((guix build utils))) - (snippet - ;; The DOS port contains proprietary software. - '(begin - (delete-file-recursively "os/dos") - #t)))) + "0lz2y2rjc23k0d97y65cqhy2splw9cmrbvhgz0iqps8xkan1m8hv")))) (build-system gnu-build-system) (arguments `(#:tests? #f ; no "check" target