From patchwork Thu Feb 21 13:04:51 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: pkill9 X-Patchwork-Id: 1213 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 DEED316C96; Thu, 21 Feb 2019 13:15:20 +0000 (GMT) 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,UNPARSEABLE_RELAY,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 55C7D16C01 for ; Thu, 21 Feb 2019 13:15:20 +0000 (GMT) Received: from localhost ([127.0.0.1]:60245 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gwoC7-0008G7-KA for patchwork@mira.cbaines.net; Thu, 21 Feb 2019 08:15:19 -0500 Received: from eggs.gnu.org ([209.51.188.92]:59405) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gwoBs-0007FV-Oo for guix-patches@gnu.org; Thu, 21 Feb 2019 08:15:07 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gwo2C-0007Rv-7A for guix-patches@gnu.org; Thu, 21 Feb 2019 08:05:06 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:58255) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1gwo2A-0007RO-Dy for guix-patches@gnu.org; Thu, 21 Feb 2019 08:05:03 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1gwo2A-0000NO-7H for guix-patches@gnu.org; Thu, 21 Feb 2019 08:05:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#34497] Add odamex References: Resent-From: Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Thu, 21 Feb 2019 13:05:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 34497 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: To: "Ricardo Wurmus" Received: via spool by 34497-submit@debbugs.gnu.org id=B34497.15507542961432 (code B ref 34497); Thu, 21 Feb 2019 13:05:02 +0000 Received: (at 34497) by debbugs.gnu.org; 21 Feb 2019 13:04:56 +0000 Received: from localhost ([127.0.0.1]:59021 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1gwo24-0000N1-8m for submit@debbugs.gnu.org; Thu, 21 Feb 2019 08:04:56 -0500 Received: from aibo.runbox.com ([91.220.196.211]:45182) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1gwo21-0000Ms-N9 for 34497@debbugs.gnu.org; Thu, 21 Feb 2019 08:04:54 -0500 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=runbox.com; s=rbselector1; h=Message-Id:Content-Type:In-Reply-To:Date:Subject:CC:To:From :MIME-Version; bh=69hVKrwS5A6z5w4Nv+k+zxkwuT20e4w6a45z++rM5KQ=; b=WTPq4d6yxkK uR2DtWT0+iqKbHkjxQuWQLCxFlukOeDDetXlESLZjaqQVz/gWWCS50yvZZ3vlj/I37FbdTsk/XYou nCUiRmZO8PqrMKcGKW+Cm7218RY+z4cDyA+ru6Vxz0IcbsGJ3GjZ3prQbM4w1eP0FSJQ45poXDXvT yuLLZPnvbsdfiHJTpnK1rI7xgJCEoxc7aqS3NjA4REfUNeV5HvJ6zGB0J6aR/CRw/cLrKtPmbPlBM ApmrCjqHkT1CJtfmrMmU6yNTGQZUKsHJSjug4KHmU19BBNaWHAgGzdSfxZUTEdm8NCacqTts8XioF ZdYTj0s2qSQeCCjcdvEQbJg==; Received: from [10.9.9.127] (helo=rmmprod05.runbox) by mailtransmit03.runbox with esmtp (Exim 4.86_2) (envelope-from ) id 1gwo1z-0003fb-4R; Thu, 21 Feb 2019 14:04:51 +0100 Received: from mail by rmmprod05.runbox with local (Exim 4.86_2) (envelope-from ) id 1gwo1z-0006LE-36; Thu, 21 Feb 2019 14:04:51 +0100 MIME-Version: 1.0 Received: from [Authenticated user (850733)] by runbox.com with http (RMM6); Thu, 21 Feb 2019 13:04:51 GMT From: Date: Thu, 21 Feb 2019 13:04:51 +0000 (GMT) X-Mailer: RMM6 In-Reply-To: <87bm365gsb.fsf@elephly.net> Message-Id: 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: 34497 <34497@debbugs.gnu.org> Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches Here is an updated patch. On Wed, 20 Feb 2019 21:47:00 +0100, Ricardo Wurmus wrote: > > Hi pkill9, > > > * gnu/packages/games.scm (odamex): New variable. > […] > > + (uri (string-append > > + "mirror://sourceforge/odamex/Odamex/" > > + version > > + "/odamex-src-" > > + version > > + ".tar.gz")) > > Please put this on fewer lines. > > > + (sha256 > > + (base32 > > + "1sh6lqj7vsdmnqz17hw0b6vy7xx6dp41k2sdw99ympsfa2xd1d2j")))) > > + (build-system cmake-build-system) > > + (arguments `(#:tests? #f)) ;; No tests > > Please use just one semicolon. > > > + (inputs > > + `(("sdl" ,(@ (gnu packages sdl) sdl)) > > + ("sdl-mixer" ,(@ (gnu packages sdl) sdl-mixer)) > > + ("zlib" ,(@ (gnu packages compression) zlib)) > > + ("libpng" ,(@ (gnu packages image) libpng)) > > + ("alsa-lib" ,(@ (gnu packages linux) alsa-lib)))) > > This is not okay. Please just use the plain variable names. > > > + (home-page "https://odamex.net/") > > + (synopsis "Multiplayer Doom port") > > + (description "Odamex is a free, cross-platform modification of the Doom > > +engine that allows players to easily join servers dedicated to playing Doom > > +online.") > > Please remove “free” — all software in Guix is Free Software. > > > + (license license:gpl2))) > > Looks like this is actually gpl2+ as evidenced by files like this: > > https://github.com/odamex/odamex/blob/master/server/src/d_netinfo.cpp#L12 > > Could you please send an updated patch? > > -- > Ricardo From 353f9444cd71c1e93978cf9b113e3f8743f385a8 Mon Sep 17 00:00:00 2001 From: Pkill -9 Date: Thu, 21 Feb 2019 13:02:07 +0000 Subject: [PATCH] gnu: Add odamex. * gnu/packages/games.scm (odamex): New variable. --- gnu/packages/games.scm | 28 ++++++++++++++++++++++++++++ 1 file changed, 28 insertions(+) diff --git a/gnu/packages/games.scm b/gnu/packages/games.scm index 6d9e63c4e..bec38dd41 100644 --- a/gnu/packages/games.scm +++ b/gnu/packages/games.scm @@ -5378,6 +5378,34 @@ Strife, Chex Quest, and fan-created games like Harmony, Hacx and Freedoom.") "file://dumb/licence.txt" "Dumb license, explicitly GPL compatible."))))) +(define-public odamex + (package + (name "odamex") + (version "0.8.0") + (source + (origin + (method url-fetch) + (uri (string-append + "mirror://sourceforge/odamex/Odamex/" version "/" + "odamex-src-" version ".tar.gz")) + (sha256 + (base32 + "1sh6lqj7vsdmnqz17hw0b6vy7xx6dp41k2sdw99ympsfa2xd1d2j")))) + (build-system cmake-build-system) + (arguments `(#:tests? #f)) ; no tests. + (inputs + `(("sdl" ,sdl) + ("sdl-mixer" ,sdl-mixer) + ("zlib" ,zlib) + ("libpng" ,libpng) + ("alsa-lib" ,alsa-lib))) + (home-page "https://odamex.net/") + (synopsis "Multiplayer Doom port") + (description "Odamex is a modification of the Doom engine that +allows players to easily join servers dedicated to playing Doom +online.") + (license license:gpl2+))) + (define-public fortune-mod (package (name "fortune-mod") -- 2.20.1