Re: Imlib2 license

[Alex Kost <alezost@gmail.com>]

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

Ludovic Courtès (2014-10-26 01:16 +0300) wrote:

> Alex Kost <alezost@gmail.com> skribis:
>
>> I've noticed that there is “imlib2” license:
>>
>> - http://www.gnu.org/licenses/license-list.html#imlib
>> - http://directory.fsf.org/wiki/License:Imlib2
>>
>> Is it worth to add it to (guix licenses) module and to use it for
>> “imlib2” package?
>
> Yes, sure.

OK for the attached patch?


[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: 0001-licenses-Add-imlib2.patch --]
[-- Type: text/x-diff, Size: 1801 bytes --]

From b7564a7f68fe2d2d74d0d1bc768eb19dbab09a36 Mon Sep 17 00:00:00 2001
From: Alex Kost <alezost@gmail.com>
Date: Sun, 26 Oct 2014 15:27:56 +0300
Subject: [PATCH] licenses: Add 'imlib2'.

* guix/licenses.scm (imlib2): New variable.
* gnu/packages/image.scm (imlib2): Use it.
---
 gnu/packages/image.scm | 4 +---
 guix/licenses.scm      | 6 ++++++
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/gnu/packages/image.scm b/gnu/packages/image.scm
index e4f831e..2515a0c 100644
--- a/gnu/packages/image.scm
+++ b/gnu/packages/image.scm
@@ -313,9 +313,7 @@ without sacrificing speed.
 
 This is a complete rewrite over the Imlib 1.x series.  The architecture is
 more modular, simple, and flexible.")
-    ;; This license adds several sentences to the original X11 license.
-    (license (license:x11-style "file://COPYING"
-                                "See 'COPYING' in the distribution."))))
+    (license license:imlib2)))
 
 (define-public giblib
   (package
diff --git a/guix/licenses.scm b/guix/licenses.scm
index 65ef06c..8b7ea53 100644
--- a/guix/licenses.scm
+++ b/guix/licenses.scm
@@ -37,6 +37,7 @@
             isc
             ijg
             ibmpl1.0
+            imlib2
             lgpl2.0 lgpl2.0+ lgpl2.1 lgpl2.1+ lgpl3 lgpl3+
             mpl2.0
             openldap2.8 openssl
@@ -195,6 +196,11 @@ which may be a file:// URI pointing the package's tree."
            "http://directory.fsf.org/wiki/License:IBMPLv1.0"
            "https://www.gnu.org/licenses/license-list#IBMPL"))
 
+(define imlib2
+  (license "Imlib2"
+           "http://directory.fsf.org/wiki/License:Imlib2"
+           "https://www.gnu.org/licenses/license-list#imlib"))
+
 (define lgpl2.0
   (license "LGPL 2.0"
            "https://www.gnu.org/licenses/old-licenses/lgpl-2.0.html"
-- 
2.1.2