[gentoo-commits] gentoo-x86 commit in kde-base/kdelibs/files: kdelibs-4.10.1-giflib5.patch

[gentoo-commits] gentoo-x86 commit in kde-base/kdelibs/files: kdelibs-4.10.1-giflib5.patch

[Andreas HAttel (dilfridge)]

dilfridge    13/03/18 23:22:00

  Added:                kdelibs-4.10.1-giflib5.patch
  Log:
  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!)

Revision  Changes    Path
1.1                  kde-base/kdelibs/files/kdelibs-4.10.1-giflib5.patch

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/kde-base/kdelibs/files/kdelibs-4.10.1-giflib5.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/kde-base/kdelibs/files/kdelibs-4.10.1-giflib5.patch?rev=1.1&content-type=text/plain

Index: kdelibs-4.10.1-giflib5.patch
===================================================================
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

[gentoo-commits] gentoo-x86 commit in kde-base/kdelibs/files: kdelibs-4.10.1-giflib5.patch

[Michael Palimaka (kensington)]

kensington    13/05/10 18:20:19

  Removed:              kdelibs-4.10.1-giflib5.patch
  Log:
  Remove unused patch.
  
  (Portage version: 2.1.11.63/cvs/Linux x86_64, signed Manifest commit with key 675D0D2C)