ilyakooo0/nixpkgs
1
0
Fork 0
mirror of https://github.com/ilyakooo0/nixpkgs.git synced 2024-12-28 22:32:58 +03:00
Code Issues Projects Releases Wiki Activity

[cpan2nix] perlPackages.GD: 2.53 -> 2.68

Browse Source 
dependencies:
perlPackages.TestFork: init at 0.02
This commit is contained in:
volth 2018-06-08 13:33:57 +00:00
parent 2817e29584
commit 757a58ed2f
2 changed files with 16 additions and 60 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

49
pkgs/development/perl-modules/gd-options-passthrough-and-fontconfig.patch
View File

@ -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'){

27
pkgs/top-level/perl-packages.nix
View File

@ -6449,24 +6449,17 @@ let self = _self // overrides; _self = with self; {
};
GD = buildPerlPackage rec {
name = "GD-2.53";
name = "GD-2.68";
src = fetchurl {
url = "mirror://cpan/authors/id/L/LD/LDS/${name}.tar.gz";
sha256 = "1ampz82kf0ixybncfgpvq2bp9nq5sjsmmw4c8srsv0g5jpz02pfh";
url = mirror://cpan/authors/id/R/RU/RURBAN/GD-2.68.tar.gz;
sha256 = "0p2ya641nl5cvcqgw829xgabh835qijfd6vq2ba12862946xx8va";
};
buildInputs = [ pkgs.gd pkgs.libjpeg pkgs.zlib pkgs.freetype pkgs.libpng pkgs.fontconfig pkgs.xorg.libXpm ];
# Patch needed to get arguments past the first GetOptions call
# and to specify libfontconfig search path.
# Patch has been sent upstream.
patches = [ ../development/perl-modules/gd-options-passthrough-and-fontconfig.patch ];
buildInputs = [ pkgs.gd pkgs.libjpeg pkgs.zlib pkgs.freetype pkgs.libpng pkgs.fontconfig pkgs.xorg.libXpm ExtUtilsPkgConfig TestFork ];
# otherwise "cc1: error: -Wformat-security ignored without -Wformat [-Werror=format-security]"
hardeningDisable = [ "format" ];
doCheck = false; # fails 1 out of 13 tests
makeMakerFlags = "--lib_png_path=${pkgs.libpng.out} --lib_jpeg_path=${pkgs.libjpeg.out} --lib_zlib_path=${pkgs.zlib.out} --lib_ft_path=${pkgs.freetype.out} --lib_fontconfig_path=${pkgs.fontconfig.lib} --lib_xpm_path=${pkgs.xorg.libXpm.out}";
};
@ -15303,6 +15296,18 @@ let self = _self // overrides; _self = with self; {
};
};
TestFork = buildPerlModule rec {
name = "Test-Fork-0.02";
src = fetchurl {
url = mirror://cpan/authors/id/M/MS/MSCHWERN/Test-Fork-0.02.tar.gz;
sha256 = "0gnh8m81fdrwmzy1fix12grfq7sf7nn0gbf24zlap1gq4kxzpzpw";
};
meta = {
description = "test code which forks";
license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
};
};
TestHarness = buildPerlPackage {
name = "Test-Harness-3.42";
src = fetchurl {