01/01: gnu: Perl GD: Add real patch.

[Eric Bavier]

bavier pushed a commit to branch master
in repository guix.

commit d507b277ebe69d218d2f2106bdeef8c082c04dbe
Author: Eric Bavier <address@hidden>
Date:   Mon Apr 6 10:20:23 2015 -0500

    gnu: Perl GD: Add real patch.
    
    Replaces the stub patch added in 43754738e030a4083b0881b2264b905bc563e78b.
    
    * gnu/packages/patches/perl-gd-options-passthrough-and-fontconfig.patch:
      Update patch.
    
    43754738e030a4083b0881b2264b905bc563e78b
---
 ...erl-gd-options-passthrough-and-fontconfig.patch |   54 +++++++++++++++++++-
 1 files changed, 53 insertions(+), 1 deletions(-)

diff --git 
a/gnu/packages/patches/perl-gd-options-passthrough-and-fontconfig.patch 
b/gnu/packages/patches/perl-gd-options-passthrough-and-fontconfig.patch
index 0ce86a6..b2ff43c 100644
--- a/gnu/packages/patches/perl-gd-options-passthrough-and-fontconfig.patch
+++ b/gnu/packages/patches/perl-gd-options-passthrough-and-fontconfig.patch
@@ -1 +1,53 @@
-This is a stub, awaiting the actual patch.
+This patch (adapted from nixpkgs for Build.PL) configures Getopt::Long to pass
+options so they will be available at the second GetOptions call.
+
+Also an option to specify the search path for libfontconfig is added.
+
+--- GD-2.56/Build.PL   2014-10-27 20:34:54.000000000 -0500
++++ GD-2.56/Build.PL   2015-02-22 10:08:12.569973657 -0600
+@@ -2,14 +2,14 @@
+ 
+ use strict;
+ use Module::Build;
+-use Getopt::Long;
++use Getopt::Long qw(:config pass_through);
+ use Config;
+ 
+ # =====> PATHS: CHECK AND ADJUST <=====
+ my (@INC,@LIBPATH,@LIBS);
+ my $AUTOCONFIG = 0;      # global set by try_to_autoconfigure() below
+ 
+-my 
($options,$lib_gd_path,$lib_ft_path,$lib_png_path,$lib_jpeg_path,$lib_xpm_path,$lib_zlib_path);
++my 
($options,$lib_gd_path,$lib_ft_path,$lib_png_path,$lib_jpeg_path,$lib_xpm_path,$lib_zlib_path,$lib_fontconfig_path);
+ 
+ unless 
(try_to_autoconfigure(\$options,\$lib_gd_path,address@hidden,address@hidden,address@hidden))
 {
+     die <<END;
+@@ -38,6 +38,7 @@
+                       "lib_jpeg_path=s" => \$lib_jpeg_path,
+                       "lib_xpm_path=s"  => \$lib_xpm_path,
+                       "lib_zlib_path=s" => \$lib_zlib_path,
++                      "lib_fontconfig_path=s" => \$lib_fontconfig_path,
+                      );
+ unless ($result) {
+   die <<END;
+@@ -53,6 +54,7 @@
+      -lib_jpeg_path path            path to libjpeg
+      -lib_xpm_path  path            path to libxpm
+      -lib_zlib_path path            path to libpng
++     -lib_fontconfig_path path      path to fontconfig
+      -ignore_missing_gd             Ignore missing or old libgd installations 
and try to compile anyway
+ 
+ If no options are passed on the command line.  The program will
+@@ -100,6 +102,12 @@
+     @INC     = ("-I$lib_zlib_path/include", @INC);
+     @LIBPATH = ("-L$lib_zlib_path/lib", @LIBPATH); 
+ }
++if( defined($lib_fontconfig_path) ) 
++{
++    print "Fontconfig library used from:     $lib_fontconfig_path\n";
++    @INC     = ("-I$lib_fontconfig_path/include", @INC);
++    @LIBPATH = ("-L$lib_fontconfig_path/lib", @LIBPATH); 
++}
+ 
#############################################################################################
+ 
+ if ($^O eq 'VMS'){