Enable building with giflib v5

fixes PR pkg/48084

3 files changed, 73 insertions, 3 deletions

diff --git a/net/kdenetwork4/Makefile b/net/kdenetwork4/Makefile
index 3bdb6efa04b..0ef9e7f9f33 100644
--- a/net/kdenetwork4/Makefile
+++ b/net/kdenetwork4/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.56 2013/07/05 13:29:41 ryoon Exp $
+# $NetBSD: Makefile,v 1.57 2013/08/07 10:17:59 markd Exp $
 
 DISTNAME=	kdenetwork-${_KDE_VERSION}
 PKGNAME=	${DISTNAME:S/-4/4-4/}
-PKGREVISION=	4
+PKGREVISION=	5
 CATEGORIES=	net
 COMMENT=	Network modules for the KDE integrated X11 desktop
 
diff --git a/net/kdenetwork4/distinfo b/net/kdenetwork4/distinfo
index ffad1a05df9..10ec440cfc5 100644
--- a/net/kdenetwork4/distinfo
+++ b/net/kdenetwork4/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.23 2013/05/21 12:49:36 markd Exp $
+$NetBSD: distinfo,v 1.24 2013/08/07 10:17:59 markd Exp $
 
 SHA1 (kdenetwork-4.10.3.tar.xz) = 9c5e14b1ebc575777d1e6d09b593f62940a4fd1d
 RMD160 (kdenetwork-4.10.3.tar.xz) = 593f3577c2e7daf9b211e9e9d0293848abf3a4ff
@@ -10,3 +10,4 @@ SHA1 (patch-af) = ebd1bc3ae40b5cd551a1283e28fb0f4a80764cfb
 SHA1 (patch-kget_CMakeLists.txt) = 91029f47cf50dbdd31b3ba63bf8e4e35c303f6cb
 SHA1 (patch-kget_core_transferhistorystore.cpp) = 4db4ecea52a77a076b732d2d0ac3bb1e4d821c09
 SHA1 (patch-kopete_protocols_wlm_CMakeLists.txt) = bf4929a7e872adb13b2017957801385ca9623f37
+SHA1 (patch-kopete_protocols_wlm_wlmchatsession.cpp) = 317247f16584a8e7cf099f8c40c9ee0507b8f849
diff --git a/net/kdenetwork4/patches/patch-kopete_protocols_wlm_wlmchatsession.cpp b/net/kdenetwork4/patches/patch-kopete_protocols_wlm_wlmchatsession.cpp
new file mode 100644
index 00000000000..54fe6d7d13e
--- /dev/null
+++ b/net/kdenetwork4/patches/patch-kopete_protocols_wlm_wlmchatsession.cpp
@@ -0,0 +1,69 @@
+$NetBSD: patch-kopete_protocols_wlm_wlmchatsession.cpp,v 1.1 2013/08/07 10:17:59 markd Exp $
+
+From: Raymond Wooninck <tittiatcoke@gmail.com>
+Date: Sun, 17 Mar 2013 12:24:09 +0000
+Subject: Enable building with giflib v5
+X-Git-Tag: v4.10.80
+X-Git-Url: http://quickgit.kde.org/?p=kopete.git&a=commitdiff&h=47ceec53aa5ee6b84a753fdbf735e44558513fe2
+---
+Enable building with giflib v5
+
+REVIEW: 7066
+
+svn path=/trunk/KDE/kdenetwork/kopete/; revision=1344846
+---
+
+
+--- kopete/protocols/wlm/wlmchatsession.cpp
++++ kopete/protocols/wlm/wlmchatsession.cpp
+@@ -65,6 +65,10 @@
+ #include "wlmchatsessioninkaction.h"
+ #ifdef HAVE_GIFLIB
+ #include <gif_lib.h>
++/* old giflib has no GIFLIB_MAJOR, define to avoid cpp warnings */
++#ifndef GIFLIB_MAJOR
++#define GIFLIB_MAJOR 4
++#endif
+ #endif
+ 
+ WlmChatSession::WlmChatSession (Kopete::Protocol * protocol,
+@@ -467,11 +471,15 @@
+ {
+ #ifdef HAVE_GIFLIB
+ #ifdef HAVE_GIF_ERROR_STRING // giflib 4.2.0+
++#if GIFLIB_MAJOR >= 5
++        fprintf(stderr, "GIF-LIB error (exact reporting not implemented)\n");
++#else
+         const char * errorString = GifErrorString();
+         if (errorString)
+             fprintf(stderr, "GIF-LIB error: %s\n", errorString);
+         else
+             fprintf(stderr, "GIF-LIB undefined error: %d\n", GifError());
++#endif
+ #else // older giflib versions, libungif
+         PrintGifError();
+ #endif // HAVE_GIF_ERROR_STRING
+@@ -483,6 +491,10 @@
+ WlmChatSession::convertToGif( const QPixmap & ink, QString filename)
+ {
+ #ifdef HAVE_GIFLIB
++#if GIFLIB_MAJOR >= 5
++#define FreeMapObject  GifFreeMapObject
++#define MakeMapObject  GifMakeMapObject
++#endif
+     int i, status;
+     GifFileType *GifFile;
+     ColorMapObject *screenColourmap;
+@@ -525,7 +537,11 @@
+         }
+     }
+ 
++#if GIFLIB_MAJOR >= 5
++    GifFile= EGifOpenFileName(QFile::encodeName(filename).constData(), 0, NULL);
++#else
+     GifFile= EGifOpenFileName(QFile::encodeName(filename).constData(), 0);
++#endif
+     if (!GifFile) {
+         FreeMapObject(imageColourmap);
+         FreeMapObject(screenColourmap);
+