[PATCH] gnu: fontforge: Update to 20150824.

[PATCH] gnu: fontforge: Update to 20150824.

[Alírio Eyng]

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



[-- Attachment #2: 0001-gnu-fontforge-Update-to-20150824.patch --]
[-- Type: text/x-patch, Size: 3577 bytes --]

From f4dc7c6318f42613b5f566653c5106710ace920d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?al=C3=ADrio=20eyng?= <alirioeyng@gmail.com>
Date: Fri, 18 Mar 2016 14:52:12 +0000
Subject: [PATCH] gnu: fontforge: Update to 20150824.

* gnu/packages/fontutils.scm (fontforge): Update to 20150824.
[inputs]: Add libltdl, libxft, pkg-config, python.
---
 gnu/packages/fontutils.scm | 45 ++++++++++++++++++++++++---------------------
 1 file changed, 24 insertions(+), 21 deletions(-)

diff --git a/gnu/packages/fontutils.scm b/gnu/packages/fontutils.scm
index 4c3198d..fd8ab59 100644
--- a/gnu/packages/fontutils.scm
+++ b/gnu/packages/fontutils.scm
@@ -353,37 +353,40 @@ definitions.")
 (define-public fontforge
   (package
    (name "fontforge")
-   (version "20120731-b")               ;aka 1.0
+   (version "20150824")
    (source (origin
             (method url-fetch)
-            (uri (string-append "mirror://sourceforge/fontforge/fontforge_full-"
-                                version ".tar.bz2"))
+            (uri (string-append
+                  "https://github.com/fontforge/fontforge/releases/download/"
+                  version "/fontforge-" version ".tar.gz"))
             (sha256 (base32
-                     "1dhg0i2pf76j40cb9g1wzpag21fgarpjaad0hdbk27i1zz588q8v"))))
+                     "0gfcm8yn1d30giqhdwbchnfnspcqypqdzrxlhqhwy1i18wgl0v2v"))))
    (build-system gnu-build-system)
-   ;; TODO: Add python for scripting support.
-   (inputs `(("gettext"         ,gnu-gettext)
-             ("libtiff"         ,libtiff)
-             ("libjpeg"         ,libjpeg)
-             ("libpng"          ,libpng)
+   (inputs `(("cairo"           ,cairo)
+             ("fontconfig"      ,fontconfig) ;dlopen'd
+             ("freetype"        ,freetype)
+             ("gettext"         ,gnu-gettext)
              ("giflib"          ,giflib) ;needs giflib 4.*
-             ("libxml2"         ,libxml2)
-             ("libX11"          ,libx11)
-             ("libXi"           ,libxi)
+             ("glib"            ,glib) ;needed for pango detection
              ("libICE"          ,libice)
              ("libSM"           ,libsm)
-             ("freetype"        ,freetype)
-             ("potrace"         ,potrace)
+             ("libX11"          ,libx11)
+             ("libXi"           ,libxi)
+             ("libjpeg"         ,libjpeg)
+             ("libltdl"         ,libltdl)
+             ("libpng"          ,libpng)
              ("libspiro"        ,libspiro)
-             ("zlib"            ,zlib)
-             ("cairo"           ,cairo)
-             ("fontconfig"      ,fontconfig) ;dlopen'd
+             ("libtiff"         ,libtiff)
              ("libuninameslist" ,libuninameslist)
+             ("libxft"          ,libxft)
+             ("libxml2"         ,libxml2)
              ("pango"           ,pango)
-             ("glib"            ,glib))) ;needed for pango detection
+             ("pkg-config"      ,pkg-config)
+             ("potrace"         ,potrace)
+             ("python"          ,python)
+             ("zlib"            ,zlib)))
    (arguments
-    '(#:configure-flags `("--enable-double")
-      #:tests? #f
+    '(#:tests? #f
       #:phases
       (alist-cons-before
        'configure 'patch-configure
@@ -423,5 +426,5 @@ definitions.")
     "FontForge allows you to create and modify postscript, truetype and
 opentype fonts.  You can save fonts in many different outline formats, and
 generate bitmaps.")
-   (license license:bsd-3)
+   (license license:gpl3+)
    (home-page "http://fontforge.org/")))
-- 
1.9.1

Re: [PATCH] gnu: fontforge: Update to 20150824.

[Ludovic Courtès]

Alírio Eyng <alirioeyng@gmail.com> skribis:

> From f4dc7c6318f42613b5f566653c5106710ace920d Mon Sep 17 00:00:00 2001
> From: =?UTF-8?q?al=C3=ADrio=20eyng?= <alirioeyng@gmail.com>
> Date: Fri, 18 Mar 2016 14:52:12 +0000
> Subject: [PATCH] gnu: fontforge: Update to 20150824.
>
> * gnu/packages/fontutils.scm (fontforge): Update to 20150824.
> [inputs]: Add libltdl, libxft, pkg-config, python.

I made pkg-config a native input (I think ‘guix lint’ suggests that) and
pushed.

While at it, commit 329a702634ec9b12f41676fb7b0680f0797f5907 makes
builds reproducible (the problem was already there before.)  In the
future, make sure to make a --rounds=2 build to check for such problems.

Thank you!

Ludo’.