[PATCH 1/4] gnu: Add potrace.

[PATCH 1/4] gnu: Add potrace.

[Eric Bavier]

[-- Attachment #1: 0001-gnu-Add-potrace.patch --]
[-- Type: text/x-diff, Size: 6286 bytes --]

From f178a122f3805cbc23119b20c2144cf2a59bed3f Mon Sep 17 00:00:00 2001
From: Eric Bavier <bavier@member.fsf.org>
Date: Tue, 7 Oct 2014 11:13:35 -0500
Subject: [PATCH 1/4] gnu: Add potrace.

* gnu/packages/fontutils.scm (potrace): New variable.
---
 gnu/packages/fontutils.scm |   28 ++++++++++++++
 gnu/packages/giflib.scm    |   90 ++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 118 insertions(+)
 create mode 100644 gnu/packages/giflib.scm

diff --git a/gnu/packages/fontutils.scm b/gnu/packages/fontutils.scm
index 5310f3c..321c6dc 100644
--- a/gnu/packages/fontutils.scm
+++ b/gnu/packages/fontutils.scm
@@ -1,5 +1,6 @@
 ;;; GNU Guix --- Functional package management for GNU
 ;;; Copyright © 2013, 2014 Andreas Enge <andreas@enge.fr>
+;;; Copyright © 2014 Eric Bavier <bavier@member.fsf.org>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -197,3 +198,30 @@ process known as shaping.  This process takes an input Unicode text string
 and returns a sequence of positioned glyphids from the font.")
    (license license:lgpl2.1+)
    (home-page "http://projects.palaso.org/projects/graphitedev")))
+
+(define-public potrace
+  (package
+    (name "potrace")
+    (version "1.11")
+    (source
+     (origin
+      (method url-fetch)
+      (uri (string-append "mirror://sourceforge/potrace/potrace-"
+                          version ".tar.gz"))
+      (sha256
+       (base32
+        "1bbyl7jgigawmwc8r14znv8lb6lrcxh8zpvynrl6s800dr4yp9as"))))
+    (build-system gnu-build-system)
+    (native-inputs `(("ghostscript" ,ghostscript))) ;for tests
+    (inputs `(("zlib" ,zlib)))
+    (synopsis "Transform bitmaps into vector graphics")
+    (description
+     "Potrace is a tool for tracing a bitmap, which means, transforming a
+bitmap into a smooth, scalable image.  The input is a bitmap (PBM, PGM, PPM,
+or BMP format), and the default output is an encapsulated PostScript
+file (EPS).  A typical use is to create EPS files from scanned data, such as
+company or university logos, handwritten notes, etc.  The resulting image is
+not \"jaggy\" like a bitmap, but smooth.  It can then be rendered at any
+resolution.")
+    (license license:gpl2+)
+    (home-page "http://potrace.sourceforge.net/")))
diff --git a/gnu/packages/giflib.scm b/gnu/packages/giflib.scm
new file mode 100644
index 0000000..d6e0c89
--- /dev/null
+++ b/gnu/packages/giflib.scm
@@ -0,0 +1,90 @@
+;;; GNU Guix --- Functional package management for GNU
+;;; Copyright © 2014 Mark H Weaver <mhw@netris.org>
+;;;
+;;; 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 giflib)
+  #:use-module (guix licenses)
+  #:use-module (guix packages)
+  #:use-module (guix download)
+  #:use-module (guix build-system gnu)
+  #:use-module (srfi srfi-1)
+  #:use-module (gnu packages xorg)
+  #:use-module (gnu packages perl))
+
+(define-public giflib-4
+  (package
+    (name "giflib")
+    (version "4.2.3")
+    (source (origin
+              (method url-fetch)
+              (uri (string-append "mirror://sourceforge/giflib/giflib-"
+                                  (first (string-split version #\.))
+                                  ".x/giflib-" version ".tar.bz2"))
+              (sha256
+               (base32 "0rmp7ipzk42r841bggd7bfqk4p8qsssbp4wcck4qnz7p4rkxbj0a"))))
+    (build-system gnu-build-system)
+    (outputs '("bin"                    ; utility programs
+               "out"))                  ; library
+    (inputs `(("libx11" ,libx11)
+              ("libice" ,libice)
+              ("libsm" ,libsm)
+              ("perl" ,perl)))
+    (arguments
+     `(#:phases (alist-cons-after
+                 'unpack 'disable-html-doc-gen
+                 (lambda _
+                   (substitute* "doc/Makefile.in"
+                     (("^all: allhtml manpages") "")))
+                 (alist-cons-after
+                  'install 'install-manpages
+                  (lambda* (#:key outputs #:allow-other-keys)
+                    (let* ((bin (assoc-ref outputs "bin"))
+                           (man1dir (string-append bin "/share/man/man1")))
+                      (mkdir-p man1dir)
+                      (for-each (lambda (file)
+                                  (let ((base (basename file)))
+                                    (format #t "installing `~a' to `~a'~%"
+                                            base man1dir)
+                                    (copy-file file
+                                               (string-append
+                                                man1dir "/" base))))
+                                (find-files "doc" "\\.1"))))
+                  %standard-phases))))
+    (synopsis "Tools and library for working with GIF images")
+    (description
+     "giflib is a library for reading and writing GIF images.  It is API and
+ABI compatible with libungif which was in wide use while the LZW compression
+algorithm was patented.  Tools are also included to convert, manipulate,
+compose, and analyze GIF images.")
+    (home-page "http://giflib.sourceforge.net/")
+    (license x11)))
+
+(define-public giflib
+  (package (inherit giflib-4)
+    (name "giflib")
+    (version "5.1.0")
+    (source (origin
+              (method url-fetch)
+              (uri (string-append "mirror://sourceforge/giflib/giflib-"
+                                  (first (string-split version #\.))
+                                  ".x/giflib-" version ".tar.bz2"))
+              (sha256
+               (base32
+                "06wd32akyawppar9mqdvyhcw47ssdfcj39lryim2w4v83i7nkv2s"))))
+    (inputs '())))
+
+;;; giflib.scm ends here
-- 
1.7.9.5


[-- Attachment #2: Type: text/plain, Size: 17 bytes --]


-- 
Eric Bavier

Re: [PATCH 1/4] gnu: Add potrace.

[Ludovic Courtès]

Eric Bavier <ericbavier@gmail.com> skribis:

> From f178a122f3805cbc23119b20c2144cf2a59bed3f Mon Sep 17 00:00:00 2001
> From: Eric Bavier <bavier@member.fsf.org>
> Date: Tue, 7 Oct 2014 11:13:35 -0500
> Subject: [PATCH 1/4] gnu: Add potrace.
>
> * gnu/packages/fontutils.scm (potrace): New variable.

This part looks good to me, but...

>  gnu/packages/fontutils.scm |   28 ++++++++++++++
>  gnu/packages/giflib.scm    |   90 ++++++++++++++++++++++++++++++++++++++++++++

What about the giflib.scm changes?  Were they intended?  Perhaps giflib
5.x can be added in image.scm?

Thanks,
Ludo’.

Re: [PATCH 1/4] gnu: Add potrace.

[Eric Bavier]

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


Ludovic Courtès writes:

> Eric Bavier <ericbavier@gmail.com> skribis:
>
>> From f178a122f3805cbc23119b20c2144cf2a59bed3f Mon Sep 17 00:00:00 2001
>> From: Eric Bavier <bavier@member.fsf.org>
>> Date: Tue, 7 Oct 2014 11:13:35 -0500
>> Subject: [PATCH 1/4] gnu: Add potrace.
>>
>> * gnu/packages/fontutils.scm (potrace): New variable.
>
> This part looks good to me, but...

Ok.

>
>>  gnu/packages/fontutils.scm |   28 ++++++++++++++
>>  gnu/packages/giflib.scm    |   90 ++++++++++++++++++++++++++++++++++++++++++++
>
> What about the giflib.scm changes?  Were they intended?

No, those changes were not intended.

> Perhaps giflib 5.x can be added in image.scm?

I was experimenting with the latest version of fontforge, which can use
giflib 5.x.  For the time being it can be left out.

An updated patch is attached.


[-- Attachment #2: 0001-gnu-Add-potrace.patch --]
[-- Type: text/x-diff, Size: 2123 bytes --]

From 6721d6e9e31af8aff5e781d813e55347dea378c9 Mon Sep 17 00:00:00 2001
From: Eric Bavier <bavier@member.fsf.org>
Date: Tue, 7 Oct 2014 12:27:37 -0500
Subject: [PATCH] gnu: Add potrace.

* gnu/packages/fontutils.scm (potrace): New variable.
---
 gnu/packages/fontutils.scm |   28 ++++++++++++++++++++++++++++
 1 file changed, 28 insertions(+)

diff --git a/gnu/packages/fontutils.scm b/gnu/packages/fontutils.scm
index 5310f3c..321c6dc 100644
--- a/gnu/packages/fontutils.scm
+++ b/gnu/packages/fontutils.scm
@@ -1,5 +1,6 @@
 ;;; GNU Guix --- Functional package management for GNU
 ;;; Copyright © 2013, 2014 Andreas Enge <andreas@enge.fr>
+;;; Copyright © 2014 Eric Bavier <bavier@member.fsf.org>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -197,3 +198,30 @@ process known as shaping.  This process takes an input Unicode text string
 and returns a sequence of positioned glyphids from the font.")
    (license license:lgpl2.1+)
    (home-page "http://projects.palaso.org/projects/graphitedev")))
+
+(define-public potrace
+  (package
+    (name "potrace")
+    (version "1.11")
+    (source
+     (origin
+      (method url-fetch)
+      (uri (string-append "mirror://sourceforge/potrace/potrace-"
+                          version ".tar.gz"))
+      (sha256
+       (base32
+        "1bbyl7jgigawmwc8r14znv8lb6lrcxh8zpvynrl6s800dr4yp9as"))))
+    (build-system gnu-build-system)
+    (native-inputs `(("ghostscript" ,ghostscript))) ;for tests
+    (inputs `(("zlib" ,zlib)))
+    (synopsis "Transform bitmaps into vector graphics")
+    (description
+     "Potrace is a tool for tracing a bitmap, which means, transforming a
+bitmap into a smooth, scalable image.  The input is a bitmap (PBM, PGM, PPM,
+or BMP format), and the default output is an encapsulated PostScript
+file (EPS).  A typical use is to create EPS files from scanned data, such as
+company or university logos, handwritten notes, etc.  The resulting image is
+not \"jaggy\" like a bitmap, but smooth.  It can then be rendered at any
+resolution.")
+    (license license:gpl2+)
+    (home-page "http://potrace.sourceforge.net/")))
-- 
1.7.9.5


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


-- 
Eric Bavier

Re: [PATCH 1/4] gnu: Add potrace.

[Alex Kost]

Ludovic Courtès (2014-10-07 20:59 +0400) wrote:

> Eric Bavier <ericbavier@gmail.com> skribis:
>
>> From f178a122f3805cbc23119b20c2144cf2a59bed3f Mon Sep 17 00:00:00 2001
>> From: Eric Bavier <bavier@member.fsf.org>
>> Date: Tue, 7 Oct 2014 11:13:35 -0500
>> Subject: [PATCH 1/4] gnu: Add potrace.
>>
>> * gnu/packages/fontutils.scm (potrace): New variable.
>
> This part looks good to me, but...
>
>>  gnu/packages/fontutils.scm |   28 ++++++++++++++
>>  gnu/packages/giflib.scm    |   90 ++++++++++++++++++++++++++++++++++++++++++++
>
> What about the giflib.scm changes?  Were they intended?  Perhaps giflib
> 5.x can be added in image.scm?

Also "giflib 5.x" will break imlib2.  So after updating giflib package,
imlib2 should either be switched to "giflib-4" or should use a special
patch.

A patch used by "Arch Linux" for making imlib2 work with "giflib 5" may
be found here:

https://projects.archlinux.org/svntogit/packages.git/tree/trunk/imlib2-giflib51.patch?h=packages/imlib2

-- 
Alex

Re: [PATCH 1/4] gnu: Add potrace.

[Ludovic Courtès]

Eric Bavier <ericbavier@gmail.com> skribis:

> Ludovic Courtès writes:
>
>> Eric Bavier <ericbavier@gmail.com> skribis:
>>
>>> From f178a122f3805cbc23119b20c2144cf2a59bed3f Mon Sep 17 00:00:00 2001
>>> From: Eric Bavier <bavier@member.fsf.org>
>>> Date: Tue, 7 Oct 2014 11:13:35 -0500
>>> Subject: [PATCH 1/4] gnu: Add potrace.
>>>
>>> * gnu/packages/fontutils.scm (potrace): New variable.
>>
>> This part looks good to me, but...
>
> Ok.
>
>>
>>>  gnu/packages/fontutils.scm |   28 ++++++++++++++
>>>  gnu/packages/giflib.scm    |   90 ++++++++++++++++++++++++++++++++++++++++++++
>>
>> What about the giflib.scm changes?  Were they intended?
>
> No, those changes were not intended.

OK.

>> Perhaps giflib 5.x can be added in image.scm?
>
> I was experimenting with the latest version of fontforge, which can use
> giflib 5.x.  For the time being it can be left out.
>
> An updated patch is attached.
>
>
> From 6721d6e9e31af8aff5e781d813e55347dea378c9 Mon Sep 17 00:00:00 2001
> From: Eric Bavier <bavier@member.fsf.org>
> Date: Tue, 7 Oct 2014 12:27:37 -0500
> Subject: [PATCH] gnu: Add potrace.
>
> * gnu/packages/fontutils.scm (potrace): New variable.

LGTM!

Ludo'.