aboutsummaryrefslogtreecommitdiff
path: root/gnu/packages/patches
diff options
context:
space:
mode:
authorTobias Geerinckx-Rice <me@tobias.gr>2018-02-27 01:21:27 +0100
committerTobias Geerinckx-Rice <me@tobias.gr>2018-02-27 16:49:58 +0100
commitd5d7d26df7c424a9cffee27f1210b59ef8682d5c (patch)
treed79c9275294734afb55091194788c5b9938373e6 /gnu/packages/patches
parent2504fd3794e9a6fa6fba0fbce4bec2e97652154b (diff)
downloadguix-d5d7d26df7c424a9cffee27f1210b59ef8682d5c.tar
guix-d5d7d26df7c424a9cffee27f1210b59ef8682d5c.tar.gz
gnu: perl-gd: Update to 2.68.
* gnu/packages/gd.scm (perl-gd): Update to 2.68. [source]: Remove obsolete patch. [native-inputs]: Remove perl-module-build. [inputs]: Use canonical package names and order alphabetically. [arguments]: Replace #:module-build-flags with fewer #:make-maker-flags, enable #:tests?, and remove ‘clear-autogenerated-files’ phase. * gnu/packages/patches/perl-gd-options-passthrough-and-fontconfig.patch: Delete file. * gnu/local.mk (dist_patch_DATA): Remove it.
Diffstat (limited to 'gnu/packages/patches')
-rw-r--r--gnu/packages/patches/perl-gd-options-passthrough-and-fontconfig.patch53
1 files changed, 0 insertions, 53 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
deleted file mode 100644
index b2ff43c0d3..0000000000
--- a/gnu/packages/patches/perl-gd-options-passthrough-and-fontconfig.patch
+++ /dev/null
@@ -1,53 +0,0 @@
-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,\@INC,\@LIBPATH,\@LIBS)) {
- 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'){