From mboxrd@z Thu Jan 1 00:00:00 1970 From: David Thompson Subject: [PATCH 1/2] gnu: tiled: Move to game-development module. Date: Mon, 19 Jan 2015 08:13:43 -0500 Message-ID: <87sif6j4l4.fsf@izanagi.i-did-not-set--mail-host-address--so-tickle-me> References: <87vbk2j4pm.fsf@izanagi.i-did-not-set--mail-host-address--so-tickle-me> Mime-Version: 1.0 Content-Type: text/x-diff Return-path: Received: from eggs.gnu.org ([2001:4830:134:3::10]:47060) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YDC9O-0006xq-0l for guix-devel@gnu.org; Mon, 19 Jan 2015 08:13:51 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1YDC9J-0002RL-Nw for guix-devel@gnu.org; Mon, 19 Jan 2015 08:13:49 -0500 Received: from mail.fsf.org ([208.118.235.13]:43261) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YDC9J-0002RG-Kw for guix-devel@gnu.org; Mon, 19 Jan 2015 08:13:45 -0500 Received: from 209-6-40-86.c3-0.smr-ubr1.sbo-smr.ma.cable.rcn.com ([209.6.40.86]:45185 helo=izanagi) by mail.fsf.org with esmtpsa (TLS-1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.69) (envelope-from ) id 1YDC9I-0007uh-BE for guix-devel@gnu.org; Mon, 19 Jan 2015 08:13:45 -0500 In-Reply-To: <87vbk2j4pm.fsf@izanagi.i-did-not-set--mail-host-address--so-tickle-me> Content-Disposition: inline; filename=0001-gnu-tiled-Move-to-game-development-module.patch List-Id: "Development of GNU Guix and the GNU System distribution." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-devel-bounces+gcggd-guix-devel=m.gmane.org@gnu.org Sender: guix-devel-bounces+gcggd-guix-devel=m.gmane.org@gnu.org To: guix-devel@gnu.org >From 6f9007591ac1111c972fb03b68d61d43ccbbf67e Mon Sep 17 00:00:00 2001 From: David Thompson Date: Mon, 19 Jan 2015 07:35:08 -0500 Subject: [PATCH 1/2] gnu: tiled: Move to game-development module. * gnu/packages/games.scm (tiled): Move from here... * gnu/packages/game-development (tiled): ...to here. --- gnu/packages/game-development.scm | 43 ++++++++++++++++++++++++++++++++++++--- gnu/packages/games.scm | 35 ------------------------------- 2 files changed, 40 insertions(+), 38 deletions(-) diff --git a/gnu/packages/game-development.scm b/gnu/packages/game-development.scm index 056b368..338979e 100644 --- a/gnu/packages/game-development.scm +++ b/gnu/packages/game-development.scm @@ -17,11 +17,14 @@ ;;; along with GNU Guix. If not, see . (define-module (gnu packages game-development) - #:use-module (guix licenses) + #:use-module ((guix licenses) #:prefix license:) #:use-module (guix packages) #:use-module (guix download) #:use-module (guix build-system cmake) - #:use-module (gnu packages)) + #:use-module (guix build-system gnu) + #:use-module (gnu packages) + #:use-module (gnu packages qt) + #:use-module (gnu packages compression)) (define-public bullet (package @@ -45,4 +48,38 @@ (description "Bullet is a physics engine library usable for collision detection. It is used in some video games and movies.") - (license zlib))) + (license license:zlib))) + +(define-public tiled + (package + (name "tiled") + (version "0.10.2") + (source (origin + (method url-fetch) + (uri (string-append "https://github.com/bjorn/tiled/archive/v" + version ".tar.gz")) + (sha256 + (base32 + "0p4p3lv4nw11fkfvvyjirb93r2x4w2rrc2w650gl2k57k92jpiij")))) + (build-system gnu-build-system) + (inputs `(("qt" ,qt) + ("zlib" ,zlib))) + (arguments + '(#:phases + (alist-replace + 'configure + (lambda* (#:key outputs #:allow-other-keys) + (let ((out (assoc-ref outputs "out"))) + (system* "qmake" + (string-append "PREFIX=" out)))) + %standard-phases))) + (home-page "http://www.mapeditor.org/") + (synopsis "Tile map editor") + (description + "Tiled is a general purpose tile map editor. It is meant to be used for +editing maps of any tile-based game, be it an RPG, a platformer or a Breakout +clone.") + + ;; As noted in 'COPYING', part of it is under GPLv2+, while the rest is + ;; under BSD-2. + (license license:gpl2+))) diff --git a/gnu/packages/games.scm b/gnu/packages/games.scm index f206d3c..312e35e 100644 --- a/gnu/packages/games.scm +++ b/gnu/packages/games.scm @@ -52,7 +52,6 @@ #:use-module (gnu packages fontutils) #:use-module (gnu packages bash) #:use-module (gnu packages perl) - #:use-module (gnu packages qt) #:use-module (gnu packages compression) #:use-module (gnu packages pulseaudio) #:use-module (gnu packages linux) @@ -520,40 +519,6 @@ alternative layouts Dvorak and Colemak, as well as for the numpad. Tutorials are primarily in English, however some in other languages are provided.") (license license:gpl3+))) -(define-public tiled - (package - (name "tiled") - (version "0.10.2") - (source (origin - (method url-fetch) - (uri (string-append "https://github.com/bjorn/tiled/archive/v" - version ".tar.gz")) - (sha256 - (base32 - "0p4p3lv4nw11fkfvvyjirb93r2x4w2rrc2w650gl2k57k92jpiij")))) - (build-system gnu-build-system) - (inputs `(("qt" ,qt) - ("zlib" ,zlib))) - (arguments - '(#:phases - (alist-replace - 'configure - (lambda* (#:key outputs #:allow-other-keys) - (let ((out (assoc-ref outputs "out"))) - (system* "qmake" - (string-append "PREFIX=" out)))) - %standard-phases))) - (home-page "http://www.mapeditor.org/") - (synopsis "Tile map editor") - (description - "Tiled is a general purpose tile map editor. It is meant to be used for -editing maps of any tile-based game, be it an RPG, a platformer or a Breakout -clone.") - - ;; As noted in 'COPYING', part of it is under GPLv2+, while the rest is - ;; under BSD-2. - (license license:gpl2+))) - (define-public openal (package (name "openal") -- 2.1.4