[arch-commits] Commit in kdenetwork/trunk (PKGBUILD giflib5.patch)

[Andrea Scarpino]

    Date: Tuesday, July 30, 2013 @ 10:53:59
  Author: andrea
Revision: 191752

upgpkg: kdenetwork 4.10.5-2

giflib rebuild

Added:
  kdenetwork/trunk/giflib5.patch
Modified:
  kdenetwork/trunk/PKGBUILD

---------------+
 PKGBUILD      |   10 +++++---
 giflib5.patch |   67 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 74 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2013-07-30 08:18:26 UTC (rev 191751)
+++ PKGBUILD	2013-07-30 08:53:59 UTC (rev 191752)
@@ -11,7 +11,7 @@
          'kdenetwork-krdc'
          'kdenetwork-krfb')
 pkgver=4.10.5
-pkgrel=1
+pkgrel=2
 arch=('i686' 'x86_64')
 url='http://www.kde.org'
 license=('GPL' 'LGPL' 'FDL')
@@ -21,13 +21,17 @@
     'v4l-utils' 'libidn' 'qimageblitz' 'libxdamage' 'libgadu' 'libmsn'
     'libktorrent' 'libmms' 'telepathy-qt')
 source=("http://download.kde.org/stable/${pkgver}/src/${pkgbase}-${pkgver}.tar.xz"
-        'use-libotr3.patch')
+        'use-libotr3.patch'
+        'giflib5.patch')
 sha1sums=('3ee86a1a227593e9f37881da3c1db1a3c384b2e4'
-          '9c3b0ee15538fbfa36aa0a4748b1f6b5a7905384')
+          '9c3b0ee15538fbfa36aa0a4748b1f6b5a7905384'
+          '388319373e96e6f44446ea1132c35ae9f660e01c')
 
 prepare() {
     cd ${pkgbase}-${pkgver}
     patch -p1 -i "${srcdir}"/use-libotr3.patch
+    cd kopete
+    patch -p1 -i "${srcdir}"/giflib5.patch
 }
 
 build() {

Added: giflib5.patch
===================================================================
--- giflib5.patch	                        (rev 0)
+++ giflib5.patch	2013-07-30 08:53:59 UTC (rev 191752)
@@ -0,0 +1,67 @@
+From: Raymond Wooninck <tittiatcoke at 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
+---
+
+
+--- a/protocols/wlm/wlmchatsession.cpp
++++ b/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);
+