diff options
| author |   Michael Palimaka <kensington@gentoo.org> | 2013-05-10 18:20:19 +0000 |
|---|---|---|
| committer | Michael Palimaka <kensington@gentoo.org> | 2013-05-10 18:20:19 +0000 |
| commit | c5de707ec13cea9d7e3bec61176f375b4cc03d0b (patch) | |
| tree | a8507a913634cf0306eed94e78a23f519e2f0bda | |
| parent | Version bump (diff) | |
| download | gentoo-2-c5de707ec13cea9d7e3bec61176f375b4cc03d0b.tar.gz gentoo-2-c5de707ec13cea9d7e3bec61176f375b4cc03d0b.tar.bz2 gentoo-2-c5de707ec13cea9d7e3bec61176f375b4cc03d0b.zip | |
Remove unused patch.
(Portage version: 2.1.11.63/cvs/Linux x86_64, signed Manifest commit with key 675D0D2C)
| -rw-r--r-- | kde-base/kdelibs/ChangeLog | 6 | ||||
| -rw-r--r-- | kde-base/kdelibs/files/kdelibs-4.10.1-giflib5.patch | 55 |
2 files changed, 5 insertions, 56 deletions
diff --git a/kde-base/kdelibs/ChangeLog b/kde-base/kdelibs/ChangeLog index f13e3e62c59a..89b2b981b004 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.922 2013/05/09 10:52:23 ago Exp $ +# $Header: /var/cvsroot/gentoo-x86/kde-base/kdelibs/ChangeLog,v 1.923 2013/05/10 18:20:18 kensington Exp $ + + 10 May 2013; Michael Palimaka <kensington@gentoo.org> + -files/kdelibs-4.10.1-giflib5.patch: + Remove unused patch. 09 May 2013; Agostino Sarubbo <ago@gentoo.org> -kdelibs-4.10.2.ebuild: Remove old diff --git a/kde-base/kdelibs/files/kdelibs-4.10.1-giflib5.patch b/kde-base/kdelibs/files/kdelibs-4.10.1-giflib5.patch deleted file mode 100644 index 85c40ff34dc4..000000000000 --- a/kde-base/kdelibs/files/kdelibs-4.10.1-giflib5.patch +++ /dev/null @@ -1,55 +0,0 @@ -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 - |