diff options
| author | Daiderd Jordan <daiderd@gmail.com> | 2018-06-08 18:06:47 +0200 |
|---|---|---|
| committer | Daiderd Jordan <daiderd@gmail.com> | 2018-06-08 18:06:47 +0200 |
| commit | fcdcfe2de1ab7c3507c8bb68b5fd347ab7f80c74 (patch) | |
| tree | fc80390e190e04aeb8330522f475be313feac4b8 /pkgs/development/perl-modules/gd-options-passthrough-and-fontconfig.patch | |
| parent | 9dfb0b2db04a42815356e6eabba9fac92ccf4cc4 (diff) | |
| parent | b9565143eaa17b7b7e03612769ebc6ca24eddae0 (diff) | |
| download | nixlib-fcdcfe2de1ab7c3507c8bb68b5fd347ab7f80c74.tar nixlib-fcdcfe2de1ab7c3507c8bb68b5fd347ab7f80c74.tar.gz nixlib-fcdcfe2de1ab7c3507c8bb68b5fd347ab7f80c74.tar.bz2 nixlib-fcdcfe2de1ab7c3507c8bb68b5fd347ab7f80c74.tar.lz nixlib-fcdcfe2de1ab7c3507c8bb68b5fd347ab7f80c74.tar.xz nixlib-fcdcfe2de1ab7c3507c8bb68b5fd347ab7f80c74.tar.zst nixlib-fcdcfe2de1ab7c3507c8bb68b5fd347ab7f80c74.zip | |
Merge branch 'master' into staging
Diffstat (limited to 'pkgs/development/perl-modules/gd-options-passthrough-and-fontconfig.patch')
| -rw-r--r-- | pkgs/development/perl-modules/gd-options-passthrough-and-fontconfig.patch | 49 |
1 files changed, 0 insertions, 49 deletions
diff --git a/pkgs/development/perl-modules/gd-options-passthrough-and-fontconfig.patch b/pkgs/development/perl-modules/gd-options-passthrough-and-fontconfig.patch deleted file mode 100644 index 24eab55f6eb5..000000000000 --- a/pkgs/development/perl-modules/gd-options-passthrough-and-fontconfig.patch +++ /dev/null @@ -1,49 +0,0 @@ -This patch 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. -diff -Naur GD-2.45/Makefile.PL GD-2.45-patched/Makefile.PL ---- GD-2.45/Makefile.PL 2009-07-10 13:40:07.000000000 -0430 -+++ GD-2.45-patched/Makefile.PL 2010-11-26 22:48:52.372992578 -0430 -@@ -16,9 +16,9 @@ - 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,$force); -+my ($options,$lib_gd_path,$lib_ft_path,$lib_png_path,$lib_jpeg_path,$lib_xpm_path,$lib_zlib_path,$lib_fontconfig_path,$force); - --use Getopt::Long; -+use Getopt::Long qw(:config pass_through); - GetOptions("ignore_missing_gd" => \$force); - - unless (try_to_autoconfigure(\$options,\$lib_gd_path,\@INC,\@LIBPATH,\@LIBS) || $force) { -@@ -49,6 +49,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) { - print STDERR <<END; -@@ -64,6 +65,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 libfontconfig - -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 -@@ -111,6 +113,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'){ |