[mapserver] 01/03: Add upstream patch for giflib 5.1 support.

[Sebastiaan Couwenberg]

This is an automated email from the git hooks/post-receive script.

sebastic pushed a commit to branch master
in repository mapserver.

commit d2d0866e939c79dc9282f904c9ed011cf226e417
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date:   Wed Oct 28 22:12:07 2015 +0100

    Add upstream patch for giflib 5.1 support.
---
 debian/changelog                                   |  7 +++++
 .../0001-Fix-compilation-with-gif_lib-5.1.patch    | 36 ++++++++++++++++++++++
 debian/patches/series                              |  1 +
 3 files changed, 44 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index f045e68..66a13d5 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+mapserver (7.0.0-6) UNRELEASED; urgency=medium
+
+  * Add upstream patch for giflib 5.1 support.
+    (closes: #803299)
+
+ -- Bas Couwenberg <sebastic at debian.org>  Wed, 28 Oct 2015 22:05:37 +0100
+
 mapserver (7.0.0-5) unstable; urgency=medium
 
   * Add patch to add ARCHIVE install target for Windows builds.
diff --git a/debian/patches/0001-Fix-compilation-with-gif_lib-5.1.patch b/debian/patches/0001-Fix-compilation-with-gif_lib-5.1.patch
new file mode 100644
index 0000000..e6f959d
--- /dev/null
+++ b/debian/patches/0001-Fix-compilation-with-gif_lib-5.1.patch
@@ -0,0 +1,36 @@
+From 3e76491eafeb3f4d573f40fe7699656347882393 Mon Sep 17 00:00:00 2001
+From: Sander Jansen <s.jansen at gmail.com>
+Date: Wed, 19 Aug 2015 16:51:13 -0500
+Subject: Fix compilation with gif_lib 5.1
+Origin: https://github.com/mapserver/mapserver/commit/3e76491eafeb3f4d573f40fe7699656347882393
+Bug: https://github.com/mapserver/mapserver/pull/5144
+Bug-Debian: https://bugs.debian.org/803299
+
+---
+ mapimageio.c | 8 ++++++++
+ 1 file changed, 8 insertions(+)
+
+--- a/mapimageio.c
++++ b/mapimageio.c
+@@ -1058,6 +1058,13 @@ int readGIF(char *path, rasterBufferObj
+ 
+   } while (recordType != TERMINATE_RECORD_TYPE);
+ 
++
++#if defined GIFLIB_MAJOR && GIFLIB_MINOR && ((GIFLIB_MAJOR == 5 && GIFLIB_MINOR >= 1) || (GIFLIB_MAJOR > 5))
++  if (DGifCloseFile(image, &errcode) == GIF_ERROR) {
++    msSetError(MS_MISCERR,"failed to close gif after loading: %s","readGIF()", gif_error_msg(errcode));
++    return MS_FAILURE;
++  }
++#else
+   if (DGifCloseFile(image) == GIF_ERROR) {
+ #if defined GIFLIB_MAJOR && GIFLIB_MAJOR >= 5
+     msSetError(MS_MISCERR,"failed to close gif after loading: %s","readGIF()", gif_error_msg(image->Error));
+@@ -1066,6 +1073,7 @@ int readGIF(char *path, rasterBufferObj
+ #endif
+     return MS_FAILURE;
+   }
++#endif
+ 
+   return MS_SUCCESS;
+ }
diff --git a/debian/patches/series b/debian/patches/series
index 4e345b2..6939d7f 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -6,3 +6,4 @@ java-hardening.patch
 windows-archive-install-target.patch
 dont-install-headers-in-usr-lib.patch
 dont-export-mapserver-target-for-static-libmapserver.patch
+0001-Fix-compilation-with-gif_lib-5.1.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/mapserver.git