From 9074082c17f3bdf5fa17a2dca3e4f8a28aa2d35b Mon Sep 17 00:00:00 2001
From: Paul Howarth <paul@city-fan.org>
Date: Sun, 23 Apr 2017 11:44:50 +0100
Subject: [PATCH] Update to 2.64

- New upstream release 2.64
  - Add CONFIGURE_REQUIRES META
  - Add --gdlib_config_path
  - Add Image Filters: scatter, pixelate, negate, grayscale, brightness,
    contrast, color, selectiveBlur, edgeDetectQuick, gaussianBlur, emboss,
    meanRemoval, smooth, copyGaussianBlurred
  - Add palette methods: createPaletteFromTrueColor, neuQuant (but
    discouraged), colorMatch
  - Add interpolation methods: copyScale, copyRotateInterpolated,
    interpolationMethod
  - Add double GD::VERSION
  - Add all gd.h constants
  - Fixed wrong <5.14 code generated with ExtUtils::Constants (CPAN RT#121297);
    only generate const-xs.inc when it's missing
  - Add -liconv on hpux too (our pkgconfig parser cannot handle it)
  - Renamed VERSION() to LIBGD_VERSION() (CPAN RT#121307); it was treated
    magically by "use GD 2.18"
  - Update doc for LIBGD_VERSION()
  - Fix 5.6.2, which does not have float in its typemap
---
 GD-2.56-flaky-test.patch                     | 13 ----------
 GD-2.60-cflags.patch => GD-2.64-cflags.patch |  4 +--
 perl-GD.spec                                 | 26 ++++++++++++++++++--
 sources                                      |  2 +-
 4 files changed, 27 insertions(+), 18 deletions(-)
 delete mode 100644 GD-2.56-flaky-test.patch
 rename GD-2.60-cflags.patch => GD-2.64-cflags.patch (78%)

diff --git a/GD-2.56-flaky-test.patch b/GD-2.56-flaky-test.patch
deleted file mode 100644
index 2b929f6..0000000
--- a/GD-2.56-flaky-test.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- t/GD.t
-+++ t/GD.t
-@@ -246,7 +246,10 @@ sub run_image_regression_tests {
- 	if (!$gd) {
- 	    fail("unable to generate comparison image for test $t: $@");
- 	} else {
-+	  TODO: {
-+	    local $TODO = "Flaky test (CPAN RT#100294)" if $t == 7;
- 	    ok(compare($gd,$t,$suffix),"image comparison test $t");
-+	  }
- 	}
-     }
- }
diff --git a/GD-2.60-cflags.patch b/GD-2.64-cflags.patch
similarity index 78%
rename from GD-2.60-cflags.patch
rename to GD-2.64-cflags.patch
index 2bd07b1..9fd3657 100644
--- a/GD-2.60-cflags.patch
+++ b/GD-2.64-cflags.patch
@@ -1,11 +1,11 @@
 --- Makefile.PL
 +++ Makefile.PL
-@@ -248,7 +248,7 @@ print F $DEFINES,"\n";
+@@ -259,7 +259,7 @@ print F $DEFINES,"\n";
  close F;
  
  my $CCFLAGS = $Config{ccflags};
 -$CCFLAGS .= " -Wall -Wextra -Wformat=0" if $Config{gccversion} and $] > 5.020;
 +$CCFLAGS .= " -Wall -Wextra" if $Config{gccversion} and $] > 5.020;
  
- WriteMakefile(
+ my %WriteMakefileArgs = (
      'NAME'	=> 'GD',
diff --git a/perl-GD.spec b/perl-GD.spec
index bfc8c14..08ce256 100644
--- a/perl-GD.spec
+++ b/perl-GD.spec
@@ -1,12 +1,12 @@
 Name:           perl-GD
-Version:        2.60
+Version:        2.64
 Release:        1%{?dist}
 Summary:        Perl interface to the GD graphics library
 License:        GPL+ or Artistic 2.0
 URL:            http://search.cpan.org/dist/GD/
 Source0:        http://www.cpan.org/authors/id/R/RU/RURBAN/GD-%{version}.tar.gz
 Patch0:         GD-2.56-utf8.patch
-Patch1:         GD-2.60-cflags.patch
+Patch1:         GD-2.64-cflags.patch
 # Module Build
 BuildRequires:  coreutils
 BuildRequires:  findutils
@@ -17,6 +17,7 @@ BuildRequires:  perl
 BuildRequires:  perl-devel
 BuildRequires:  perl-generators
 BuildRequires:  perl(Config)
+BuildRequires:  perl(ExtUtils::Constant)
 BuildRequires:  perl(ExtUtils::MakeMaker)
 BuildRequires:  perl(ExtUtils::PkgConfig)
 BuildRequires:  perl(Getopt::Long)
@@ -91,6 +92,27 @@ make test TEST_VERBOSE=1
 %{_mandir}/man3/GD::Simple.3*
 
 %changelog
+* Sun Apr 23 2017 Paul Howarth <paul@city-fan.org> - 2.64-1
+- Update to 2.64
+  - Add CONFIGURE_REQUIRES META
+  - Add --gdlib_config_path
+  - Add Image Filters: scatter, pixelate, negate, grayscale, brightness,
+    contrast, color, selectiveBlur, edgeDetectQuick, gaussianBlur, emboss,
+    meanRemoval, smooth, copyGaussianBlurred
+  - Add palette methods: createPaletteFromTrueColor, neuQuant (but
+    discouraged), colorMatch
+  - Add interpolation methods: copyScale, copyRotateInterpolated,
+    interpolationMethod
+  - Add double GD::VERSION
+  - Add all gd.h constants
+  - Fixed wrong <5.14 code generated with ExtUtils::Constants (CPAN RT#121297);
+    only generate const-xs.inc when it's missing
+  - Add -liconv on hpux too (our pkgconfig parser cannot handle it)
+  - Renamed VERSION() to LIBGD_VERSION() (CPAN RT#121307); it was treated
+    magically by "use GD 2.18"
+  - Update doc for LIBGD_VERSION()
+  - Fix 5.6.2, which does not have float in its typemap
+
 * Sat Apr 22 2017 Paul Howarth <paul@city-fan.org> - 2.60-1
 - Update to 2.60
   - Add missing methods newFromWBMP, newFromXbm (CPAN RT #68784) and some
diff --git a/sources b/sources
index 060daa0..7135957 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (GD-2.60.tar.gz) = 19decda8663c4e9e56fc0ab36348ba6b2f8f7bf28ff061e6c8568526db0d5945218e3c3f7effdce6e615f98067092f7b598156c932ea4887d3c173e5c722a397
+SHA512 (GD-2.64.tar.gz) = b715b7bde5cf4d3067f93df61753bb015e8a8cfd1f17972234df993f432382702688510490e2fcfc924bbe9db55d30af4b03441c288157193813020178bf6651