Fix build with giflib-5, bug 457640

(Portage version: 2.2.0_alpha166/cvs/Linux x86_64, RepoMan options: --force, signed Manifest commit with key EBE6A336BE19039C!)

3 files changed, 62 insertions, 2 deletions

diff --git a/kde-base/kdelibs/ChangeLog b/kde-base/kdelibs/ChangeLog
index 4bdd12f68f39..361fa1ed384f 100644
--- a/kde-base/kdelibs/ChangeLog
+++ b/kde-base/kdelibs/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for kde-base/kdelibs
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdelibs/ChangeLog,v 1.898 2013/03/06 13:41:50 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdelibs/ChangeLog,v 1.899 2013/03/18 23:21:59 dilfridge Exp $
+
+  18 Mar 2013; Andreas K. Huettel <dilfridge@gentoo.org> kdelibs-4.10.1.ebuild,
+  +files/kdelibs-4.10.1-giflib5.patch:
+  Fix build with giflib-5, bug 457640
 
 *kdelibs-4.10.1 (06 Mar 2013)
 
diff --git a/kde-base/kdelibs/files/kdelibs-4.10.1-giflib5.patch b/kde-base/kdelibs/files/kdelibs-4.10.1-giflib5.patch
new file mode 100644
index 000000000000..85c40ff34dc4
--- /dev/null
+++ b/kde-base/kdelibs/files/kdelibs-4.10.1-giflib5.patch
@@ -0,0 +1,55 @@
+From 96af9ef4f8bd16816834008b73e7b29694136552 Mon Sep 17 00:00:00 2001
+From: Raymond Wooninck <tittiatcoke@gmail.com>
+Date: Thu, 14 Mar 2013 10:26:45 +0100
+Subject: [PATCH] Make kdelibs compile with the latest giflib v5 while
+ maintaining backwards compatibility
+
+REVIEW: 109478
+---
+ khtml/imload/decoders/gifloader.cpp | 14 ++++++++++++++
+ 1 file changed, 14 insertions(+)
+
+diff --git a/khtml/imload/decoders/gifloader.cpp b/khtml/imload/decoders/gifloader.cpp
+index ebbb749..0c1acf5 100644
+--- a/khtml/imload/decoders/gifloader.cpp
++++ b/khtml/imload/decoders/gifloader.cpp
+@@ -45,6 +45,11 @@ extern "C" {
+ #include <gif_lib.h>
+ }
+ 
++/* avoid cpp warning about undefined macro, old giflib had no GIFLIB_MAJOR */
++#ifndef GIFLIB_MAJOR
++#define GIFLIB_MAJOR 4
++#endif
++
+ // #define DEBUG_GIFLOADER
+ 
+ namespace khtmlImLoad {
+@@ -300,7 +305,11 @@ public:
+     }
+     
+     
++#if GIFLIB_MAJOR >= 5
++    static unsigned int decode16Bit(unsigned char* signedLoc)
++#else
+     static unsigned int decode16Bit(char* signedLoc)
++#endif
+     {
+         unsigned char* loc = reinterpret_cast<unsigned char*>(signedLoc);
+     
+@@ -348,7 +357,12 @@ public:
+     virtual int processEOF()
+     {
+         //Feed the buffered data to libUnGif
++#if GIFLIB_MAJOR >= 5
++        int errorCode;
++        GifFileType* file = DGifOpen(this, gifReaderBridge, &errorCode);
++#else
+         GifFileType* file = DGifOpen(this, gifReaderBridge);
++#endif
+         
+         if (!file)
+             return Error;
+-- 
+1.8.1.5
+
diff --git a/kde-base/kdelibs/kdelibs-4.10.1.ebuild b/kde-base/kdelibs/kdelibs-4.10.1.ebuild
index 96055964db54..9bebc219c24e 100644
--- a/kde-base/kdelibs/kdelibs-4.10.1.ebuild
+++ b/kde-base/kdelibs/kdelibs-4.10.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdelibs/kdelibs-4.10.1.ebuild,v 1.1 2013/03/06 13:41:50 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdelibs/kdelibs-4.10.1.ebuild,v 1.2 2013/03/18 23:21:59 dilfridge Exp $
 
 EAPI=5
 
@@ -139,6 +139,7 @@ PATCHES=(
 	"${FILESDIR}/${PN}-4.8.1-norpath.patch"
 	"${FILESDIR}/${PN}-4.9.3-werror.patch"
 	"${FILESDIR}/${PN}-4.10.0-udisks.patch"
+	"${FILESDIR}/${PN}-4.10.1-giflib5.patch"
 )
 
 pkg_pretend() {