From ec7807215a14e3fc6cd99c72394007e8802c3fd0 Mon Sep 17 00:00:00 2001
From: Remi Collet <remi@fedoraproject.org>
Date: Fri, 24 Jun 2016 12:45:53 +0200
Subject: [PATCH] v2.2.2

---
 .gitignore                                  |  1 +
 gd-2.2.1-fix-unused-variable-in-tests.patch | 22 ---------------------
 gd.spec                                     | 14 +++++++++----
 sources                                     |  2 +-
 4 files changed, 12 insertions(+), 27 deletions(-)
 delete mode 100644 gd-2.2.1-fix-unused-variable-in-tests.patch

diff --git a/.gitignore b/.gitignore
index fbe9aec..3a0927c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -5,3 +5,4 @@ gd-2.0.35.tar.bz2
 /libgd-2.1.0.tar.xz
 /libgd-2.1.1.tar.xz
 /libgd-2.2.1.tar.xz
+/libgd-2.2.2.tar.xz
diff --git a/gd-2.2.1-fix-unused-variable-in-tests.patch b/gd-2.2.1-fix-unused-variable-in-tests.patch
deleted file mode 100644
index 837bca8..0000000
--- a/gd-2.2.1-fix-unused-variable-in-tests.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-From 7d0d9d2a4f8e48f19e1603c649d4f15d0b9736de Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Ond=C5=99ej=20Sur=C3=BD?= <ondrej@sury.org>
-Date: Fri, 20 May 2016 10:44:33 +0200
-Subject: [PATCH] Fix error: unused variable in tests/
-
----
- tests/gdimagesetpixel/gdeffectoverlay.c | 2 --
- 1 file changed, 2 deletions(-)
-
-diff --git a/tests/gdimagesetpixel/gdeffectoverlay.c b/tests/gdimagesetpixel/gdeffectoverlay.c
-index 5e42547..7f63e17 100644
---- a/tests/gdimagesetpixel/gdeffectoverlay.c
-+++ b/tests/gdimagesetpixel/gdeffectoverlay.c
-@@ -5,8 +5,6 @@ int main()
- {
- 	gdImagePtr im;
- 	int x, y, c;
--	FILE *out;
--	char path[1024];
- 	int r=0;
- 
- 
diff --git a/gd.spec b/gd.spec
index f6ddecc..a245de7 100644
--- a/gd.spec
+++ b/gd.spec
@@ -4,8 +4,8 @@
 
 Summary:       A graphics library for quick creation of PNG or JPEG images
 Name:          gd
-Version:       2.2.1
-Release:       2%{?prever}%{?short}%{?dist}
+Version:       2.2.2
+Release:       1%{?prever}%{?short}%{?dist}
 Group:         System Environment/Libraries
 License:       MIT
 URL:           http://libgd.github.io/
@@ -19,7 +19,6 @@ Source0:       https://github.com/libgd/libgd/releases/download/gd-%{version}/li
 
 Patch1:        gd-2.1.0-multilib.patch
 Patch2:        gd-2.2.1-initialize-full_filename.patch
-Patch3:        gd-2.2.1-fix-unused-variable-in-tests.patch
 
 BuildRequires: freetype-devel
 BuildRequires: fontconfig-devel
@@ -79,7 +78,6 @@ files for gd, a graphics library for creating PNG and JPEG graphics.
 %setup -q -n libgd-%{version}%{?prever:-%{prever}}
 %patch1 -p1 -b .mlib
 %patch2 -p1 -b .full_filename
-%patch3 -p1 -b .unused-variable
 
 : $(perl config/getver.pl)
 
@@ -114,6 +112,11 @@ rm -f $RPM_BUILD_ROOT/%{_libdir}/libgd.a
 
 
 %check
+%ifarch %{ix86}
+# see https://github.com/libgd/libgd/issues/242
+export XFAIL_TESTS="gdimagerotate/bug00067 $XFAIL_TESTS"
+%endif
+
 : Upstream test suite
 make check
 
@@ -144,6 +147,9 @@ grep %{version} $RPM_BUILD_ROOT%{_libdir}/pkgconfig/gdlib.pc
 
 
 %changelog
+* Fri Jun 24 2016 Remi Collet <remi@fedoraproject.org> - 2.2.2-1
+- Update to 2.2.2
+
 * Sat May 28 2016 Remi Collet <remi@fedoraproject.org> - 2.2.1-2
 - remove unneeded sources
 
diff --git a/sources b/sources
index 19470cd..fd86b28 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-4d3d5b6c77c4875861af1bc663441efd  libgd-2.2.1.tar.xz
+735015d79ea250f8f1ae0949c44af26c  libgd-2.2.2.tar.xz