[PATCH 0/2] Move tiled and update it

[PATCH 0/2] Move tiled and update it

[David Thompson]

This small patch set moves the 'tiled' package from (gnu packages games)
to (gnu packages game-development) and updates it to the latest release.

-- 
David Thompson
Web Developer - Free Software Foundation - http://fsf.org
GPG Key: 0FF1D807
Support the FSF: https://fsf.org/donate

[PATCH 1/2] gnu: tiled: Move to game-development module.

[David Thompson]

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #1: 0001-gnu-tiled-Move-to-game-development-module.patch --]
[-- Type: text/x-diff, Size: 4549 bytes --]

From 6f9007591ac1111c972fb03b68d61d43ccbbf67e Mon Sep 17 00:00:00 2001
From: David Thompson <dthompson2@worcester.edu>
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 <http://www.gnu.org/licenses/>.
 
 (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

Re: [PATCH 1/2] gnu: tiled: Move to game-development module.

[Ludovic Courtès]

David Thompson <dthompson2@worcester.edu> skribis:

> From 6f9007591ac1111c972fb03b68d61d43ccbbf67e Mon Sep 17 00:00:00 2001
> From: David Thompson <dthompson2@worcester.edu>
> 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.

LGTM, thanks!

Ludo’.

[PATCH 2/2] gnu: tiled: Update to 0.11.0.

[David Thompson]

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #1: 0002-gnu-tiled-Update-to-0.11.0.patch --]
[-- Type: text/x-diff, Size: 1209 bytes --]

From 5c0c08625e4de13f0924af9e5cca95727881e829 Mon Sep 17 00:00:00 2001
From: David Thompson <dthompson2@worcester.edu>
Date: Mon, 19 Jan 2015 07:37:16 -0500
Subject: [PATCH 2/2] gnu: tiled: Update to 0.11.0.

* gnu/packages/game-development.scm (tiled): Update.
---
 gnu/packages/game-development.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/game-development.scm b/gnu/packages/game-development.scm
index 338979e..fefdf67 100644
--- a/gnu/packages/game-development.scm
+++ b/gnu/packages/game-development.scm
@@ -53,14 +53,14 @@ is used in some video games and movies.")
 (define-public tiled
   (package
     (name "tiled")
-    (version "0.10.2")
+    (version "0.11.0")
     (source (origin
               (method url-fetch)
               (uri (string-append "https://github.com/bjorn/tiled/archive/v"
                                   version ".tar.gz"))
               (sha256
                (base32
-                "0p4p3lv4nw11fkfvvyjirb93r2x4w2rrc2w650gl2k57k92jpiij"))))
+                "03a15vbzjfwc8dpifbjvd0gnr208mzmdkgs2nlc8zq6z0a4h4jqd"))))
     (build-system gnu-build-system)
     (inputs `(("qt" ,qt)
               ("zlib" ,zlib)))
-- 
2.1.4

Re: [PATCH 2/2] gnu: tiled: Update to 0.11.0.

[Ludovic Courtès]

David Thompson <dthompson2@worcester.edu> skribis:

> From 5c0c08625e4de13f0924af9e5cca95727881e829 Mon Sep 17 00:00:00 2001
> From: David Thompson <dthompson2@worcester.edu>
> Date: Mon, 19 Jan 2015 07:37:16 -0500
> Subject: [PATCH 2/2] gnu: tiled: Update to 0.11.0.
>
> * gnu/packages/game-development.scm (tiled): Update.

LGTM, thanks.

Ludo'.