[PATCH 2/3] gnu: Add giblib.

[PATCH 2/3] gnu: Add giblib.

[Alex Kost]

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

COPYING is also attached.


[-- Attachment #2: 0002-gnu-Add-giblib.patch --]
[-- Type: text/x-diff, Size: 3138 bytes --]

From 0fe34b2e2ab17ad4e74961a3292f7d855d4336c3 Mon Sep 17 00:00:00 2001
From: Alex Kost <alezost@gmail.com>
Date: Thu, 25 Sep 2014 12:29:43 +0400
Subject: [PATCH 2/3] gnu: Add giblib.

* gnu/packages/giblib.scm: New file.
* gnu-system.am (GNU_SYSTEM_MODULES): Add it.
---
 gnu-system.am           |  1 +
 gnu/packages/giblib.scm | 50 +++++++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 51 insertions(+)
 create mode 100644 gnu/packages/giblib.scm

diff --git a/gnu-system.am b/gnu-system.am
index 820f935..5b4ece1 100644
--- a/gnu-system.am
+++ b/gnu-system.am
@@ -99,6 +99,7 @@ GNU_SYSTEM_MODULES =				\
   gnu/packages/geeqie.scm			\
   gnu/packages/gettext.scm			\
   gnu/packages/ghostscript.scm			\
+  gnu/packages/giblib.scm			\
   gnu/packages/giflib.scm			\
   gnu/packages/gimp.scm				\
   gnu/packages/gkrellm.scm			\
diff --git a/gnu/packages/giblib.scm b/gnu/packages/giblib.scm
new file mode 100644
index 0000000..f3d7c31
--- /dev/null
+++ b/gnu/packages/giblib.scm
@@ -0,0 +1,50 @@
+;;; GNU Guix --- Functional package management for GNU
+;;; Copyright © 2014 Alex Kost <alezost@gmail.com>
+;;;
+;;; This file is part of GNU Guix.
+;;;
+;;; GNU Guix is free software; you can redistribute it and/or modify it
+;;; under the terms of the GNU General Public License as published by
+;;; the Free Software Foundation; either version 3 of the License, or (at
+;;; your option) any later version.
+;;;
+;;; GNU Guix is distributed in the hope that it will be useful, but
+;;; WITHOUT ANY WARRANTY; without even the implied warranty of
+;;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+;;; GNU General Public License for more details.
+;;;
+;;; You should have received a copy of the GNU General Public License
+;;; along with GNU Guix.  If not, see <http://www.gnu.org/licenses/>.
+
+(define-module (gnu packages giblib)
+  #:use-module (guix packages)
+  #:use-module (guix download)
+  #:use-module (guix build-system gnu)
+  #:use-module (guix licenses)
+  #:use-module (gnu packages xorg)
+  #:use-module (gnu packages imlib2))
+
+(define-public giblib
+  (package
+    (name "giblib")
+    (version "1.2.4")
+    (source (origin
+              (method url-fetch)
+              (uri (string-append
+                    "http://linuxbrit.co.uk/downloads/giblib-"
+                    version ".tar.gz"))
+              (sha256
+               (base32
+                "1b4bmbmj52glq0s898lppkpzxlprq9aav49r06j2wx4dv3212rhp"))))
+    (build-system gnu-build-system)
+    (inputs
+     `(("libx11" ,libx11)
+       ("imlib2" ,imlib2)))
+    (home-page "http://linuxbrit.co.uk/software/") ; no real home-page
+    (synopsis "Wrapper library for imlib2")
+    (description
+     "giblib is a simple library which wraps imlib2's context API, avoiding
+all the context_get/set calls, adds fontstyles to the truetype renderer and
+supplies a generic doubly-linked list and some string functions.")
+    (license (bsd-style "file://COPYING"
+                        "See COPYING in the distribution."))))
-- 
2.1.0


[-- Attachment #3: COPYING --]
[-- Type: text/plain, Size: 1144 bytes --]

Copyright (C) 1999,2000 Tom Gilbert.

Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to
deal in the Software without restriction, including without limitation the
rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
sell copies of the Software, and to permit persons to whom the Software is
furnished to do so, subject to the following conditions:

The above copyright notice and this permission notice shall be included in
all copies of the Software and its documentation and acknowledgment shall be
given in the documentation and software packages that this Software was
used.

THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
THE AUTHORS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

Re: [PATCH 2/3] gnu: Add giblib.

[Andreas Enge]

On Thu, Sep 25, 2014 at 12:54:09PM +0400, Alex Kost wrote:
> COPYING is also attached.

This is x11 (without the clause that the name of the X Consortium shall not
be used; I think we could still keep x11 and not use x11-style, as it is
clear that the X Consortium clause has no effect when the software is not
written by the X Consortium).

Andreas

Re: [PATCH 2/3] gnu: Add giblib.

[Ludovic Courtès]

Alex Kost <alezost@gmail.com> skribis:

> From 0fe34b2e2ab17ad4e74961a3292f7d855d4336c3 Mon Sep 17 00:00:00 2001
> From: Alex Kost <alezost@gmail.com>
> Date: Thu, 25 Sep 2014 12:29:43 +0400
> Subject: [PATCH 2/3] gnu: Add giblib.
>
> * gnu/packages/giblib.scm: New file.
> * gnu-system.am (GNU_SYSTEM_MODULES): Add it.

OK but moved to (gnu packages image) and with x11-style license.

(Make sure to also try out Cyril’s neat ‘guix lint giblib’ if you
haven’t already.)

Ludo’.

Re: [PATCH 2/3] gnu: Add giblib.

[Alex Kost]

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

Ludovic Courtès (2014-09-25 16:58 +0400) wrote:

> Alex Kost <alezost@gmail.com> skribis:
>
>> From 0fe34b2e2ab17ad4e74961a3292f7d855d4336c3 Mon Sep 17 00:00:00 2001
>> From: Alex Kost <alezost@gmail.com>
>> Date: Thu, 25 Sep 2014 12:29:43 +0400
>> Subject: [PATCH 2/3] gnu: Add giblib.
>>
>> * gnu/packages/giblib.scm: New file.
>> * gnu-system.am (GNU_SYSTEM_MODULES): Add it.
>
> OK but moved to (gnu packages image) and with x11-style license.
>
> (Make sure to also try out Cyril’s neat ‘guix lint giblib’ if you
> haven’t already.)

I know about "guix lint" but it gives me nothing on these packages.  Do
you mean anything particular that I need to fix?

The modified patch is attached.


[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: 0002-gnu-Add-giblib.patch --]
[-- Type: text/x-diff, Size: 1827 bytes --]

From 8e2cdf8a8f451f1151a0a9c80652e06d3a7a2f46 Mon Sep 17 00:00:00 2001
From: Alex Kost <alezost@gmail.com>
Date: Thu, 25 Sep 2014 12:29:43 +0400
Subject: [PATCH 2/3] gnu: Add giblib.

* gnu/packages/image.scm (giblib): New variable.
---
 gnu/packages/image.scm | 27 +++++++++++++++++++++++++++
 1 file changed, 27 insertions(+)

diff --git a/gnu/packages/image.scm b/gnu/packages/image.scm
index a9c3a5d..0e79942 100644
--- a/gnu/packages/image.scm
+++ b/gnu/packages/image.scm
@@ -265,3 +265,30 @@ 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."))))
+
+(define-public giblib
+  (package
+    (name "giblib")
+    (version "1.2.4")
+    (source (origin
+              (method url-fetch)
+              (uri (string-append
+                    "http://linuxbrit.co.uk/downloads/giblib-"
+                    version ".tar.gz"))
+              (sha256
+               (base32
+                "1b4bmbmj52glq0s898lppkpzxlprq9aav49r06j2wx4dv3212rhp"))))
+    (build-system gnu-build-system)
+    (inputs
+     `(("libx11" ,libx11)
+       ("imlib2" ,imlib2)))
+    (home-page "http://linuxbrit.co.uk/software/") ; no real home-page
+    (synopsis "Wrapper library for imlib2")
+    (description
+     "giblib is a simple library which wraps imlib2's context API, avoiding
+all the context_get/set calls, adds fontstyles to the truetype renderer and
+supplies a generic doubly-linked list and some string functions.")
+    ;; This license removes a clause about X Consortium from the original
+    ;; X11 license.
+    (license (license:x11-style "file://COPYING"
+                                "See 'COPYING' in the distribution."))))
-- 
2.1.0

Re: [PATCH 2/3] gnu: Add giblib.

[Ludovic Courtès]

Alex Kost <alezost@gmail.com> skribis:

> I know about "guix lint" but it gives me nothing on these packages.  Do
> you mean anything particular that I need to fix?

Nothing particular, mentioning it just in case.

> From 8e2cdf8a8f451f1151a0a9c80652e06d3a7a2f46 Mon Sep 17 00:00:00 2001
> From: Alex Kost <alezost@gmail.com>
> Date: Thu, 25 Sep 2014 12:29:43 +0400
> Subject: [PATCH 2/3] gnu: Add giblib.
>
> * gnu/packages/image.scm (giblib): New variable.

Perfect, thanks!

Ludo’.