From patchwork Thu Jun 13 18:58:23 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jesse Gibbons X-Patchwork-Id: 14311 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 5CB6C170CC; Thu, 13 Jun 2019 19:59:23 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00,FREEMAIL_FROM, T_DKIM_INVALID,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.0 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTP id CDD54170CA for ; Thu, 13 Jun 2019 19:59:22 +0100 (BST) Received: from localhost ([::1]:44016 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hbUwU-0003xM-1p for patchwork@mira.cbaines.net; Thu, 13 Jun 2019 14:59:22 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:40042) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hbUwJ-0003s7-LD for guix-patches@gnu.org; Thu, 13 Jun 2019 14:59:13 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hbUwE-0003ec-Gz for guix-patches@gnu.org; Thu, 13 Jun 2019 14:59:11 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:50809) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1hbUwA-0003bv-5Z for guix-patches@gnu.org; Thu, 13 Jun 2019 14:59:03 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1hbUwA-0004Uv-2m for guix-patches@gnu.org; Thu, 13 Jun 2019 14:59:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#36182] [PATCH] add freeorion Resent-From: Jesse Gibbons Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Thu, 13 Jun 2019 18:59:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 36182 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: Nicolas Goaziou Received: via spool by 36182-submit@debbugs.gnu.org id=B36182.156045231517250 (code B ref 36182); Thu, 13 Jun 2019 18:59:02 +0000 Received: (at 36182) by debbugs.gnu.org; 13 Jun 2019 18:58:35 +0000 Received: from localhost ([127.0.0.1]:36120 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1hbUvi-0004U8-Ka for submit@debbugs.gnu.org; Thu, 13 Jun 2019 14:58:35 -0400 Received: from mail-pf1-f193.google.com ([209.85.210.193]:33806) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1hbUvg-0004Tp-Fw for 36182@debbugs.gnu.org; Thu, 13 Jun 2019 14:58:33 -0400 Received: by mail-pf1-f193.google.com with SMTP id c85so12407420pfc.1 for <36182@debbugs.gnu.org>; Thu, 13 Jun 2019 11:58:32 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=date:from:to:cc:subject:message-id:in-reply-to:references :mime-version; bh=c9zrypKANLjYaaXaWm6kR52Kz5I94567PPFLYfLoBgU=; b=O+SGaIhK8S58ZVvwqvapUUV93kmOrffrsrGDFJ9PIWhESRunpW6qm1/xk6WJJ6kWui 20v/5VU1WXGdZzSAavWC9KXpxvy/BxE9g+0uZGvMzJLkkQJUsmWUFBazu3YYVDU2938F 9XmR9EwdEodJSR9euVGGKaVM1pEwPEyZiX2wi8+vTiuCleyFx3voy60en6mbE9QjNSna L1HEe5bWCmFCOfpKHY6NlJfkGSghxyBS5xIHRIEG01Jfnir+R/HP/LaF5YutVjFgJ+Q6 hUady729rHUgONPrUyW+zzKJDFC5DIYstI2UAeOD6gZcqBb/BTUuLnX4AZxjuKNlqYcx hOsg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:date:from:to:cc:subject:message-id:in-reply-to :references:mime-version; bh=c9zrypKANLjYaaXaWm6kR52Kz5I94567PPFLYfLoBgU=; b=uD6Jcx151aR58+Ul6SzYQ2QYJcmup3cyL1YqFNOo1V/W0AGwcunX3eWn1u28u8xbrM ooar4aqeKJl77NFCt2idIlvdcCgqPHRGZTIekO6o7nhmvxKK5BD7dIMumvZNpSk3pbKt HLRaj8phTxbCCqmd9b04WGgo+W/yRyzyAULL+Zs5j8QVQSEc5SUNL01zDhdRurBLjVYs nX9Tf6H/vIed2Eh/5wcciwRylX+F9YvwsNbaDcmFiN/0bCyqEksNPN1Zp4TC0Kbodooh YV2z5zODtp+eN/mQ2Ft9dAfwx8LC/Fi2y127O/oClMqckIHihKHmZVk8JsKnPqxiEn8k 0Wwg== X-Gm-Message-State: APjAAAVwnfhmZophu2E5NPAGHN3tSoafYQrCmjgsD6Qr19So/Ww9W5Jn tDRHi2DRzk2So2LoD/dqJZOWx0KD X-Google-Smtp-Source: APXvYqymfK95kCssXBN2wLBE0TPdQf4CE0lf5zaFUR+uSZNeOxk/eTLGa/UaE/KNWlv6obnc2q3/ag== X-Received: by 2002:a63:151a:: with SMTP id v26mr8332745pgl.9.1560452306165; Thu, 13 Jun 2019 11:58:26 -0700 (PDT) Received: from localhost ([38.141.50.171]) by smtp.gmail.com with ESMTPSA id g19sm532774pgb.26.2019.06.13.11.58.24 (version=TLS1_3 cipher=AEAD-AES256-GCM-SHA384 bits=256/256); Thu, 13 Jun 2019 11:58:25 -0700 (PDT) Date: Thu, 13 Jun 2019 12:58:23 -0600 From: Jesse Gibbons Message-ID: <20190613125823.5f51ed34@gmail.com> In-Reply-To: <871rzyshy3.fsf@nicolasgoaziou.fr> References: <20190612102219.6cc0d25f@gmail.com> <871rzyshy3.fsf@nicolasgoaziou.fr> X-Mailer: Claws Mail 3.17.3 (GTK+ 2.24.32; x86_64-unknown-linux-gnu) 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: , Cc: 36182@debbugs.gnu.org Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches On Wed, 12 Jun 2019 21:48:52 +0200 Nicolas Goaziou wrote: > Hello, > > Jesse Gibbons writes: > > > Patch is attached. -Jesse > > Thank you! Some comments follow. > > > From cca52f508e84ac34e60a3c5167554d7ad2ad6564 Mon Sep 17 00:00:00 > > 2001 From: Jesse Gibbons > > Date: Wed, 12 Jun 2019 10:07:32 -0600 > > Subject: [PATCH] add freeorion > > The commit message is incomplete. It should also include > > * gnu/packages/games.scm (freeorion): New variable. > > If you use Emacs, there is a template to automatically fill this. I did not know this. How do I use the template? > > > + (origin > > + (method git-fetch) > > + (uri (git-reference > > + (url "https://github.com/freeorion/freeorion.git") > > + (commit > > "470d0711537804df3c2ca25532f674ab4bec58af"))) > > Why do you need to use the latest commit instead of the latest stable > release? Unless there is a good reason, Guix prefers using stable > releases: The most recent release won't build because it expects a dependency that no longer exists. I do not know which of the thousands of commits since then fixed that issue so, I cannot easily generate a patch. It follows that the best choice is to use the most recent commit, which I can confirm does not have that critical issue. I added a comment to explain why I specify the most recent commit. I also added a note that it should be updated when the next stable release is available (the maintainers seem to prefer announcing new releases every September). I will personally update this in mid-September or October if version 0.4.8.1 or 0.4.9 or 0.5 or 1.0 is available and no volunteer beats me to it. If you want I can also request release 0.4.8.1 ASAP so we can specify a release rather than a commit. I personally prefer to keep the commit and wait three or four months for the release. > > (commit version) > > > + (sha256 > > + (base32 > > + "1wsw632l1cj17px6i88nqjzs0dngp5rsr67n6qkkjlfjfxi69j0f")))) > > + (arguments > > + '(#:tests? #f)) > > You should include a comment explaining why tests are removed. It > could be, for example, > > '(#:tests? #f)) ;no test > > > + (home-page > > + "https://www.freeorion.org/index.php/Main_Page") > > I think "https://www.freeorion.org" is enough, since it points to the > page above. > > > + (description > > + "FreeOrion is a free, open source, turn-based space empire > > and galactic +conquest (4X) computer game being designed and built > > by the FreeOrion project. +FreeOrion is inspired by the tradition > > of the Master of Orion games, but is not +a clone or remake of that > > series or any other game.") > > It may be useful to explain what the "4X" means, or do not include it > at all. Note that in the wiki, "4X" is a link, so you can get further > information. The link says that 4X refers to a genre of strategy game centered around conquest. I think the current context is a sufficient explanation, but I did expand the description. I think it is best to keep the 4X in the description in case someone tries a search for that genre. > > > + (license (list license:gpl2 license:cc-by-sa3.0)))) > > Could you explain, in a comment, why there are two licenses? I assume > the former is the project, and the latter is for assets. I added comments to explain these licenses. > > Would you mind sending an updated patch? > > Regards, > Updated patch is attached. Is there anything else you want me to fix? From 698e471a78e0a4d44ff29f2705e61b15555d2035 Mon Sep 17 00:00:00 2001 From: Jesse Gibbons Date: Thu, 13 Jun 2019 12:51:46 -0600 Subject: [PATCH] add freeorion * gnu/packages/games.scm (freeorion): New variable. --- gnu/packages/games.scm | 48 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 48 insertions(+) diff --git a/gnu/packages/games.scm b/gnu/packages/games.scm index 7a433a0bfd..194c6f1db9 100644 --- a/gnu/packages/games.scm +++ b/gnu/packages/games.scm @@ -7385,3 +7385,51 @@ full of enemies that can hurt it, obstacles and food to be eaten. The goal of the game is to stay alive and collect prizes. The robot program conveniently may be written in a plain text file in the Scheme programming language.") (license license:gpl3+))) + +(define-public freeorion + (package + (name "freeorion") + (version "0.4.8") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/freeorion/freeorion.git") +;;;Most recent stable release uses boost_signals (v1) +;;;which was later replaced with boost-signals2 and +;;;no longer exists. This commit builds and runs. +;;;TODO: Update this when the next stable release when +;;;it is available. + (commit "470d0711537804df3c2ca25532f674ab4bec58af"))) + (sha256 + (base32 + "1wsw632l1cj17px6i88nqjzs0dngp5rsr67n6qkkjlfjfxi69j0f")))) + (arguments + '(#:tests? #f)) ;no test + (build-system cmake-build-system) + (inputs `(("boost" ,boost) + ("boost_signals" ,boost-signals2) + ("freetype2" ,freetype) + ("python2" ,python-2.7) + ("openal" ,openal) + ("libogg" ,libogg) + ("libvorbis" ,libvorbis) + ("zlib" ,zlib) + ("libpng" ,libpng) + ("sdl2" ,sdl2) + ("glu" ,glu) + ("glew" ,glew))) + (home-page + "https://www.freeorion.org/index.php/Main_Page") + (synopsis + "Turn-based space empire and galactic conquest computer game") + (description + "FreeOrion is a free, open source, turn-based space empire and galactic +conquest (4X) computer game being designed and built by the FreeOrion project. +Control an empire with the goal of exploring the galaxy, expanding your +territory, exploiting the resources, and exterminating rival alien empires. +FreeOrion is inspired by the tradition of the Master of Orion games, but is not +a clone or remake of that series or any other game.") + (license (list + license:gpl2 ;game code + license:cc-by-sa3.0)))) ;assets -- 2.22.0