Re: [PATCH] gnu: Add Tiled

[宋文武 <iyzsong@gmail.com>]

[-- Attachment #1: Type: text/plain, Size: 1381 bytes --]

Ludovic Courtès <ludo@gnu.org> writes:

> 宋文武 <iyzsong@gmail.com> skribis:
>
>> +    (license (list gpl2+ bsd-2))))
>
> Could you add a comment above explaining what is meant here: is it
> dual-licensing?  Or does it mean that some files are GPL’d while others
> are BSD?
>
> In the latter case, the combined work is GPL, so ‘license’ should be
> just gpl2+.  It’s a good idea, though, to add a comment stating that
> some files are under another license.
Yes, it's GPL, while libtiled and tmxviewer are under BSD.
>
>> Eric Bavier <ericbavier@gmail.com> writes:
>>
>>> 宋文武 writes:
>>>
>>>> * gnu/packages/tiled.scm: New file.
>>>> * gnu-system.am (GNU_SYSTEM_MODULES): Add it.
>>>> ---
>>>>  gnu-system.am          |  1 +
>>>>  gnu/packages/tiled.scm | 57 ++++++++++++++++++++++++++++++++++++++++++++++++++
>>>>  2 files changed, 58 insertions(+)
>>>>  create mode 100644 gnu/packages/tiled.scm
>>>
>>> Would it make sense to put this new package in gnu/packages/games.scm
>>> instead?
>> Well, I'll prefer editors.scm or graphics.scm.
>
> I’m of the opinion of Eric here.  “editors” and “graphics” seem like
> very vague categories to me.  Or did you have other packages in mind
> that would fit in there?
Maybe gimp and inkscape? Yeah, games does make sense.
>
> Thanks,
> Ludo’.

Here is my new patch:


[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: 0001-gnu-Add-Tiled.patch --]
[-- Type: text/x-patch, Size: 2492 bytes --]

From b5481951dcba1a34305d9f1ac55ca880415ab731 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=AE=8B=E6=96=87=E6=AD=A6?= <iyzsong@gmail.com>
Date: Thu, 13 Nov 2014 22:50:57 +0800
Subject: [PATCH] gnu: Add Tiled.

* gnu/pacakges/games.scm (tiled): New variable.
---
 gnu/packages/games.scm | 36 +++++++++++++++++++++++++++++++++++-
 1 file changed, 35 insertions(+), 1 deletion(-)

diff --git a/gnu/packages/games.scm b/gnu/packages/games.scm
index dee39dd..4e1335e 100644
--- a/gnu/packages/games.scm
+++ b/gnu/packages/games.scm
@@ -23,7 +23,8 @@
 ;;; along with GNU Guix.  If not, see <http://www.gnu.org/licenses/>.
 
 (define-module (gnu packages games)
-  #:use-module (guix licenses)
+  #:use-module ((guix licenses)
+                #:hide (zlib))
   #:use-module (guix packages)
   #:use-module (guix download)
   #:use-module (gnu packages)
@@ -49,6 +50,8 @@
   #: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 (guix build-system gnu)
   #:use-module (guix build-system trivial))
 
@@ -498,3 +501,34 @@ tutorials for the standard QWERTY layout, there are also tutorials for the
 alternative layouts Dvorak and Colemak, as well as for the numpad.  Tutorials
 are primarily in English, however some in other languages are provided.")
     (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.")
+    (license gpl2+)))
-- 
1.9.2