From 60e278a271fd741bc87166c1b828093b875bcfbf Mon Sep 17 00:00:00 2001
From: Hugo Villeneuve <hugo@hugovil.com>
Date: Fri, 26 Dec 2014 22:22:12 -0500
Subject: [PATCH] Upgrade to giflib-5.1.0

---
 config/packages-list                          |  2 +-
 stage3/hv-install-1                           |  2 +-
 .../common/giflib-5.1.0-no-html-doc.patch     | 12 +++++
 .../WindowMaker-0.95.6-libgif-5.1.0.patch     | 50 +++++++++++++++++++
 4 files changed, 64 insertions(+), 2 deletions(-)
 create mode 100644 stage3/patches/common/giflib-5.1.0-no-html-doc.patch
 create mode 100644 stage4/patches/common/WindowMaker-0.95.6-libgif-5.1.0.patch

diff --git a/config/packages-list b/config/packages-list
index 1305517..5e441e9 100644
--- a/config/packages-list
+++ b/config/packages-list
@@ -121,7 +121,7 @@ GETTEXT="gettext-0.18.2.1"
 GHOSTSCRIPT="ghostscript-9.15"
 GHOSTSCRIPT_FONTS_STD="ghostscript-fonts-std-8.11"
 GHOSTSCRIPT_FONTS_OTHER="ghostscript-fonts-other-6.0"
-GIFLIB="giflib-4.1.6"
+GIFLIB="giflib-5.1.0"
 GIMP="gimp-2.8.14"
 GIT="git-1.9.0"
 GLIB="glib-2.42.1"
diff --git a/stage3/hv-install-1 b/stage3/hv-install-1
index 6999f74..0788db6 100755
--- a/stage3/hv-install-1
+++ b/stage3/hv-install-1
@@ -139,7 +139,7 @@ ipkg ${LIBART}
 ipkg ${LIBEXIF}
 ipkg ${FRIBIDI}
 ipkg -m acnb ${HICOLOR_ICON_THEME}
-ipkg ${GIFLIB}
+ipkg ${GIFLIB} "--disable-static"
 ipkg -m acnb ${LIBMNG} "--disable-static"
 
 ipkg ${FREETYPE} "--disable-static"
diff --git a/stage3/patches/common/giflib-5.1.0-no-html-doc.patch b/stage3/patches/common/giflib-5.1.0-no-html-doc.patch
new file mode 100644
index 0000000..c23a798
--- /dev/null
+++ b/stage3/patches/common/giflib-5.1.0-no-html-doc.patch
@@ -0,0 +1,12 @@
+diff -Naur giflib-5.1.0.orig/doc/Makefile.in giflib-5.1.0.new/doc/Makefile.in
+--- giflib-5.1.0.orig/doc/Makefile.in	2014-05-14 22:04:57.000000000 -0400
++++ giflib-5.1.0.new/doc/Makefile.in	2014-12-23 12:54:34.268155252 -0500
+@@ -608,7 +608,7 @@
+ .asc.html:
+ 	asciidoc $<
+ 
+-all: allhtml manpages
++all: manpages
+ 
+ # Philosophical choice: the website gets the internal manual pages
+ allhtml: $(XMLALL:.xml=.html) $(XMLINTERNAL:.xml=.html)
diff --git a/stage4/patches/common/WindowMaker-0.95.6-libgif-5.1.0.patch b/stage4/patches/common/WindowMaker-0.95.6-libgif-5.1.0.patch
new file mode 100644
index 0000000..21819c7
--- /dev/null
+++ b/stage4/patches/common/WindowMaker-0.95.6-libgif-5.1.0.patch
@@ -0,0 +1,50 @@
+From: Christophe CURIS <christophe.curis@free.fr>
+
+As reported by Andrew, the compilation of the WRaster broke because
+there was an API change in libgif v5.1 versus the v5.0 (something had been
+forgotten for DGifCloseFile to be easily used in wrappers for dynamic
+languages).
+
+Now, if we have detected that we're in 5.x release, we use the GIFLIB_MINOR
+macro to see what the function prototype is (this macro was introduced only
+in 4.1.6 so we cannot fully rely on it to detect the version of the
+library).
+
+The possible error code is not used because at the place we use the
+function we would not be able do do anything more meaningful with it.
+
+Signed-off-by: Christophe CURIS <christophe.curis@free.fr>
+---
+ wrlib/load_gif.c | 8 ++++++++
+ 1 file changed, 8 insertions(+)
+
+diff --git a/wrlib/load_gif.c b/wrlib/load_gif.c
+index 7a6cfc7..d70d044 100644
+--- a/wrlib/load_gif.c
++++ b/wrlib/load_gif.c
+@@ -81,7 +81,11 @@ RImage *RLoadGIF(const char *file, int index)
+ 	}
+ 
+ 	if (gif->SWidth < 1 || gif->SHeight < 1) {
++#if (USE_GIF == 5) && (GIFLIB_MINOR >= 1)
++		DGifCloseFile(gif, NULL);
++#else
+ 		DGifCloseFile(gif);
++#endif
+ 		RErrorCode = RERR_BADIMAGEFILE;
+ 		return NULL;
+ 	}
+@@ -216,7 +220,11 @@ RImage *RLoadGIF(const char *file, int index)
+ 		free(buffer);
+ 
+ 	if (gif)
++#if (USE_GIF == 5) && (GIFLIB_MINOR >= 1)
++		DGifCloseFile(gif, NULL);
++#else
+ 		DGifCloseFile(gif);
++#endif
+ 
+ 	return image;
+ }
+-- 
+2.1.1
-- 
2.20.1