From patchwork Wed May 19 21:15:53 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Ludovic_Court=C3=A8s?= X-Patchwork-Id: 29417 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 9F43927BC81; Wed, 19 May 2021 22:17: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.9 required=5.0 tests=BAYES_00,MAILING_LIST_MULTI, RCVD_IN_MSPIKE_H4,RCVD_IN_MSPIKE_WL,SPF_HELO_PASS,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 ESMTPS id 62C0627BC78 for ; Wed, 19 May 2021 22:17:09 +0100 (BST) Received: from localhost ([::1]:34978 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ljTYy-00039s-Bk for patchwork@mira.cbaines.net; Wed, 19 May 2021 17:17:08 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:34370) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1ljTYs-00039T-7D for guix-patches@gnu.org; Wed, 19 May 2021 17:17:02 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:49288) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1ljTYr-0002vs-Vk for guix-patches@gnu.org; Wed, 19 May 2021 17:17:01 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1ljTYr-0007nB-RC for guix-patches@gnu.org; Wed, 19 May 2021 17:17:01 -0400 Subject: bug#48441: [PATCH] gnu: Add schiffbruch. Resent-From: Ludovic =?utf-8?q?Court=C3=A8s?= Original-Sender: "Debbugs-submit" Resent-To: guix-patches@gnu.org Resent-Date: Wed, 19 May 2021 21:17:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: cc-closed 48441 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: Felix Gruber Cc: 48441-done@debbugs.gnu.org Mail-Followup-To: 48441@debbugs.gnu.org, ludo@gnu.org, felgru@posteo.net Received: via spool by 48441-done@debbugs.gnu.org id=D48441.162145896829868 (code D ref 48441); Wed, 19 May 2021 21:17:01 +0000 Received: (at 48441-done) by debbugs.gnu.org; 19 May 2021 21:16:08 +0000 Received: from localhost ([127.0.0.1]:60832 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ljTXy-0007la-1G for submit@debbugs.gnu.org; Wed, 19 May 2021 17:16:08 -0400 Received: from eggs.gnu.org ([209.51.188.92]:40612) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ljTXt-0007kj-44 for 48441-done@debbugs.gnu.org; Wed, 19 May 2021 17:16:04 -0400 Received: from fencepost.gnu.org ([2001:470:142:3::e]:36262) by eggs.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ljTXn-0002J4-Ob; Wed, 19 May 2021 17:15:55 -0400 Received: from [2a01:e0a:1d:7270:af76:b9b:ca24:c465] (port=42350 helo=ribbon) by fencepost.gnu.org with esmtpsa (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1ljTXn-0005Nz-E2; Wed, 19 May 2021 17:15:55 -0400 From: Ludovic =?utf-8?q?Court=C3=A8s?= References: <20210515134540.44089-1-felgru@posteo.net> Date: Wed, 19 May 2021 23:15:53 +0200 In-Reply-To: <20210515134540.44089-1-felgru@posteo.net> (Felix Gruber's message of "Sat, 15 May 2021 13:45:40 +0000") Message-ID: <87zgwq4e7q.fsf@gnu.org> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/27.2 (gnu/linux) MIME-Version: 1.0 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 Hi, Felix Gruber skribis: > * gnu/packages/games.scm (schiffbruch): New variable. Pushed with the cosmetic changes below: using ‘git-version’ to compute the version string, avoiding (list …) for the license, and using two semicolons for block comments. Thanks! Ludo’. diff --git a/gnu/packages/games.scm b/gnu/packages/games.scm index 37065dec09..6908d115f2 100644 --- a/gnu/packages/games.scm +++ b/gnu/packages/games.scm @@ -12475,36 +12475,36 @@ available.") (license license:gpl3+))) (define-public schiffbruch - (package - (name "schiffbruch") - (version "1.2.1-git-e41916d") - (source - (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/sandsmark/Schiffbruch") - ; There haven't been any releases for several years, so - ; I've taken the most recent commit from the master branch - ; that didn't fail to build (the last commit gave me a compile - ; error). - (commit "e41916d15d87749c82c5005cbb42d1bb079b43d9"))) - (file-name (git-file-name name version)) - (sha256 - (base32 "0lg3rqacrapf6c4sxi12cm9bmg43mlbclway1zxcm848pi1xkzwv")))) - (build-system cmake-build-system) - (arguments - `(#:tests? #f ; no tests - #:build-type "Release")) - (native-inputs - `(("gcc" ,gcc-11))) ; need C++20-compatible compiler - (inputs - `(("sfml" ,sfml))) - (home-page "https://github.com/sandsmark/Schiffbruch/") - (synopsis "Pixelart survival game") - (description - "Schiffbruch is a mix of building, strategy and adventure and gets played + ;; There haven't been any releases for several years, so I've taken the most + ;; recent commit from the master branch that didn't fail to build (the last + ;; commit gave me a compile error). + (let ((commit "e41916d15d87749c82c5005cbb42d1bb079b43d9")) + (package + (name "schiffbruch") + (version (git-version "1.2.1" "0" commit)) + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/sandsmark/Schiffbruch") + (commit commit))) + (file-name (git-file-name name version)) + (sha256 + (base32 "0lg3rqacrapf6c4sxi12cm9bmg43mlbclway1zxcm848pi1xkzwv")))) + (build-system cmake-build-system) + (arguments + `(#:tests? #f ; no tests + #:build-type "Release")) + (native-inputs + `(("gcc" ,gcc-11))) ; need C++20-compatible compiler + (inputs + `(("sfml" ,sfml))) + (home-page "https://github.com/sandsmark/Schiffbruch/") + (synopsis "Pixelart survival game") + (description + "Schiffbruch is a mix of building, strategy and adventure and gets played with a two-dimensional view. The game deals with the consequences of a ship wreckage. You're stranded on a desert island and have to survive. In order to do so you need to explore the island, find food, build a shelter and try to get attention, so you get found.") - (license (list license:cc-by4.0)))) + (license license:cc-by4.0))))