From patchwork Fri Jun 14 00:57:09 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jesse Gibbons X-Patchwork-Id: 14316 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 1BBF9170CD; Fri, 14 Jun 2019 01:58:17 +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=unavailable 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 AD1C6170CB for ; Fri, 14 Jun 2019 01:58:16 +0100 (BST) Received: from localhost ([::1]:46530 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hbaXi-0001mC-PP for patchwork@mira.cbaines.net; Thu, 13 Jun 2019 20:58:10 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:47497) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hbaXe-0001m0-G2 for guix-patches@gnu.org; Thu, 13 Jun 2019 20:58:08 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hbaXb-0006IC-MN for guix-patches@gnu.org; Thu, 13 Jun 2019 20:58:06 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:51029) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1hbaXa-0006Gh-Pg for guix-patches@gnu.org; Thu, 13 Jun 2019 20:58:03 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1hbaXa-0007LX-FJ for guix-patches@gnu.org; Thu, 13 Jun 2019 20:58: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: Fri, 14 Jun 2019 00:58: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.156047384428193 (code B ref 36182); Fri, 14 Jun 2019 00:58:02 +0000 Received: (at 36182) by debbugs.gnu.org; 14 Jun 2019 00:57:24 +0000 Received: from localhost ([127.0.0.1]:36340 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1hbaWy-0007Kd-7h for submit@debbugs.gnu.org; Thu, 13 Jun 2019 20:57:24 -0400 Received: from mail-pl1-f194.google.com ([209.85.214.194]:36644) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1hbaWu-0007KO-L9 for 36182@debbugs.gnu.org; Thu, 13 Jun 2019 20:57:22 -0400 Received: by mail-pl1-f194.google.com with SMTP id w10so58952plz.3 for <36182@debbugs.gnu.org>; Thu, 13 Jun 2019 17:57:20 -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=zhCL8N7auT3LPMt5lMSHom3Rt4DNoIdEOT7YPJoe08o=; b=MCuIcxh+viTWe0drnTjrbRcFWH7dbtLvMWq5SRTZM3VEMVmy7lTTaM+aZIacnxAKhr UbQpNktB6o9rmj/17Dtiq1XopW7ZjLzNcBL/LFQWUjfnAedRPGd/C+m7gfsIpWnb/WHl M8QqqX5q+xIYwPRIpEUwviG0Jg5us0IlLgxE6gWKqjVVEwP9mhQxFSyYsAq2cJtccGwB s3fiBTQSVtbHUQjuWka0Bw2RhyZEP28CVVimUjIJIf9A3zULurtRpRc/XIgUZXAbA2t9 n3szZ9uig3GHj5kLcirlwVHyJM0lQwvl1/yugqyRk6Y2V10il5il8WlozFStbDmbZGa0 5dQQ== 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=zhCL8N7auT3LPMt5lMSHom3Rt4DNoIdEOT7YPJoe08o=; b=iYg9muaWrZdEPNdoU2mQNV5+H7OpkmPSEEZglxl7beXWVsP4zUyyqNEYr/0vp5SRz/ EPx2nOe9dDUu6VKzvhojcu8hWkHRFiDsqLl7JGADlRW6/ihN2T7a4dQf+psz8ccOXDXz fn2jF/2BO3viyJLzU2NBzmiIZm+NV8QzY583qVwvEkxmu5eYY5PvlY86u7fomJ6VYY7T B1BPcjKOClAmdgHwUbwCzI5dX8hmW60liH/+PQIFRVvGwsLX3rMk4HWYNvuzw92105Co qSVW7gRnIuxJC5zjY0jxlFwXECsYKOanmBf3sdiK/iV8l6ShuG2wYAmGLaxkGVo3VhTh PDMQ== X-Gm-Message-State: APjAAAVjkETEN6reRr+j1PklgFHTBQaVx4aTogtsINZm1cEAcTgY2UgO WI6TPRSfPVAlpYX/fvg/tizgVuqV X-Google-Smtp-Source: APXvYqwPDwZ2kWwWce12bWegC5zKl8VhwKIsMTC3+KPbOIhgz9MhVVNPA532bRyMrnfUMz6b7C2cnw== X-Received: by 2002:a17:902:8b8b:: with SMTP id ay11mr90396608plb.63.1560473834485; Thu, 13 Jun 2019 17:57:14 -0700 (PDT) Received: from localhost ([199.68.53.171]) by smtp.gmail.com with ESMTPSA id s5sm920222pji.9.2019.06.13.17.57.11 (version=TLS1_3 cipher=AEAD-AES256-GCM-SHA384 bits=256/256); Thu, 13 Jun 2019 17:57:13 -0700 (PDT) Date: Thu, 13 Jun 2019 18:57:09 -0600 From: Jesse Gibbons Message-ID: <20190613185709.1a97b9ae@gmail.com> In-Reply-To: <87tvctp5km.fsf@nicolasgoaziou.fr> References: <20190612102219.6cc0d25f@gmail.com> <871rzyshy3.fsf@nicolasgoaziou.fr> <20190613125823.5f51ed34@gmail.com> <87tvctp5km.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 Thu, 13 Jun 2019 22:56:41 +0200 Nicolas Goaziou wrote: > Jesse Gibbons writes: > > > On Wed, 12 Jun 2019 21:48:52 +0200 > > Nicolas Goaziou wrote: > > >> If you use Emacs, there is a template to automatically fill this. > > I did not know this. How do I use the template? > > See "The Perfect Setup" section of the Guix manual, in particular the > part about Yasnippet. I will look into this later. > > > 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. > > Fair enough. Thank you for the explanation. > > I think we also need a > > (file-name (git-file-name name version)) > > in the source. Ok. > > >> > + (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. > > You probably overlooked that remark. No, i just forgot. It's fixed now, but 'guix lint' does not like it. > > > 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. > > OK. > > > I added comments to explain these licenses. > > According to > , the > source code is released under gpl2, artwork, music and sounds, and > in-game text are released under cc-by-sa3.0, and the game content > scripts are released under both gpl2 and cc-by-sa3.0. I got my information from github. I'll update. > > So, the comments should include the description above, for > completeness. > > > Updated patch is attached. Is there anything else you want me to > > fix? > > Great. I'm adding some small remarks, but overall the patch LGTM. > > > +;;;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. > > In Scheme, such comments use ";; " as a prefix. Fixed. > > > + (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))) > > Could you re-order inputs alphabetically? Done. > > > + (home-page > > + "https://www.freeorion.org/index.php/Main_Page") > > See above. > > Also, don't forget to add yourself to the Hall of Fame at the top of > the "games.scm" file. I did that when I added gnurobots. > > Can you send an updated patch? Hopefully I should be able to apply it > then. Attached. > > Thank you! From d6230c5286b95e9c8f2acc3662bddb1a20346251 Mon Sep 17 00:00:00 2001 From: Jesse Gibbons Date: Thu, 13 Jun 2019 18:48:43 -0600 Subject: [PATCH] add freeorion * gnu/packages/games.scm (freeorion): New variable. --- gnu/packages/games.scm | 49 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 49 insertions(+) diff --git a/gnu/packages/games.scm b/gnu/packages/games.scm index 86bdf99a32..4d6b06d55c 100644 --- a/gnu/packages/games.scm +++ b/gnu/packages/games.scm @@ -7455,3 +7455,52 @@ steam locomotive across many levels and collect all the coaches to win.") ;; The project is dual-licensed GPL2+ and GPL3+. (license (list license:gpl2+ 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"))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "1wsw632l1cj17px6i88nqjzs0dngp5rsr67n6qkkjlfjfxi69j0f")))) + (arguments + '(#:tests? #f)) ;no test + (build-system cmake-build-system) + (inputs + `(("boost" ,boost) + ("boost_signals" ,boost-signals2) + ("freetype2" ,freetype) + ("glew" ,glew) + ("glu" ,glu) + ("libogg" ,libogg) + ("libpng" ,libpng) + ("libvorbis" ,libvorbis) + ("openal" ,openal) + ("python2" ,python-2.7) + ("sdl2" ,sdl2) + ("zlib" ,zlib))) + (home-page + "https://www.freeorion.org/") + (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, game content, scripts + license:cc-by-sa3.0))));artwork, music, sound, game content, scripts -- 2.22.0