From 8f814536e3f5536acbcf32019be99bdae73445a7 Mon Sep 17 00:00:00 2001 From: Mariusz Mazur Date: Fri, 19 May 2017 15:27:15 +0200 Subject: [PATCH] Up to 2.66 --- perl-GD-version.patch | 44 ------------------------------------------- perl-GD.spec | 13 +++---------- 2 files changed, 3 insertions(+), 54 deletions(-) delete mode 100644 perl-GD-version.patch diff --git a/perl-GD-version.patch b/perl-GD-version.patch deleted file mode 100644 index e40bcb4..0000000 --- a/perl-GD-version.patch +++ /dev/null @@ -1,44 +0,0 @@ -From 58eceb8a19cb893fc7e9abc3a725d8bb4761dec3 Mon Sep 17 00:00:00 2001 -From: sauoq -Date: Mon, 23 Mar 2015 09:34:21 -0400 -Subject: [PATCH] Fixes libgd ver check in Makefile.PL and Build.PL - ---- - Build.PL | 6 ++++-- - Makefile.PL | 6 ++++-- - 2 files changed, 8 insertions(+), 4 deletions(-) - -diff --git a/Build.PL b/Build.PL -index ad31624..d3b5b8b 100644 ---- a/Build.PL -+++ b/Build.PL -@@ -280,8 +280,10 @@ sub try_to_autoconfigure { - ($$lib_gd_path = $libdir) =~ s!/[^/]+$!!; - $$options = $features; - -- my ($minor) = $version =~ /^2\.\d+\.(\d+)$/; -- $$options .= " GD_UNCLOSEDPOLY GD_ANIMGIF GD_FTCIRCLE VERSION_33" if defined($minor) && $minor >= 33; -+ my ($minor, $patch) = $version =~ /^2\.(\d+)\.(\d+)$/; -+ if ((defined($minor) && $minor > 0) or (defined($patch) && $patch >=33)) { -+ $$options .= " GD_UNCLOSEDPOLY GD_ANIMGIF GD_FTCIRCLE VERSION_33"; -+ } - - my @correct_inc = map {s/^-I// && $_} split /\s+/,$cflags; - check_for_stray_headers($includedir,@correct_inc); -diff --git a/Makefile.PL b/Makefile.PL -index 80ce95a..2b7551f 100644 ---- a/Makefile.PL -+++ b/Makefile.PL -@@ -299,8 +299,10 @@ sub try_to_autoconfigure { - ($$lib_gd_path = $libdir) =~ s!/[^/]+$!!; - $$options = $features; - -- my ($minor) = $version =~ /^2\.\d+\.(\d+)$/; -- $$options .= " GD_UNCLOSEDPOLY GD_ANIMGIF GD_FTCIRCLE VERSION_33" if defined($minor) && $minor >= 33; -+ my ($minor, $patch) = $version =~ /^2\.(\d+)\.(\d+)$/; -+ if ((defined($minor) && $minor > 0) or (defined($patch) && $patch >= 33)) { -+ $$options .= " GD_UNCLOSEDPOLY GD_ANIMGIF GD_FTCIRCLE VERSION_33"; -+ } - - my @correct_inc = map {s/^-I// && $_} split /\s+/,$cflags; - check_for_stray_headers($includedir,@correct_inc); diff --git a/perl-GD.spec b/perl-GD.spec index f0b1a40..02b39bf 100644 --- a/perl-GD.spec +++ b/perl-GD.spec @@ -6,14 +6,13 @@ Summary: GD - interface to GD graphics library Summary(pl.UTF-8): GD - interfejs do biblioteki graficznej GD Name: perl-GD -Version: 2.56 -Release: 5 +Version: 2.66 +Release: 1 License: Artistic Group: Development/Languages/Perl Source0: http://www.cpan.org/modules/by-module/GD/GD-%{version}.tar.gz -# Source0-md5: c4b3afd98b2c4ce3c2e1027d101a8f1e +# Source0-md5: 5c89ea8861810ca41bc4aca98e3fdfda Patch0: %{name}-paths.patch -Patch1: %{name}-version.patch URL: http://search.cpan.org/dist/GD/ BuildRequires: gd-devel >= 2.0.28 BuildRequires: perl-devel >= 1:5.8.0 @@ -36,13 +35,7 @@ PNG. %prep %setup -q -n GD-%{version} %patch0 -p1 -%patch1 -p1 -# temporarily disable comparison test7 (fails with recent libs) -%{__sed} -i -e 's/IMAGE_TESTS => 7/IMAGE_TESTS => 6/;s/tests => 11/tests => 10/' t/GD.t - -# MakeMaker fails to find it -%{__mv} lib/GD.xs . %build %{__perl} Makefile.PL