summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndré Fabian Silva Delgado <emulatorman@lavabit.com>2013-08-01 06:06:53 -0300
committerAndré Fabian Silva Delgado <emulatorman@lavabit.com>2013-08-01 06:06:53 -0300
commit4e275e2f744850f36423d4cf3c6c7b5ffb2870cf (patch)
tree4964b33a768c125106198c886d7c09747a67d2dc
parentd69a58c618878fcef45c1e38aa00be067233eba4 (diff)
downloadabslibre-4e275e2f744850f36423d4cf3c6c7b5ffb2870cf.tar.gz
abslibre-4e275e2f744850f36423d4cf3c6c7b5ffb2870cf.tar.bz2
abslibre-4e275e2f744850f36423d4cf3c6c7b5ffb2870cf.zip
kdenetwork-kopete-libre-4.10.5-2: giflib rebuild
-rw-r--r--libre/kdenetwork-kopete-libre/PKGBUILD14
-rw-r--r--libre/kdenetwork-kopete-libre/giflib5.patch67
2 files changed, 75 insertions, 6 deletions
diff --git a/libre/kdenetwork-kopete-libre/PKGBUILD b/libre/kdenetwork-kopete-libre/PKGBUILD
index 3b4295415..2fa9f0f11 100644
--- a/libre/kdenetwork-kopete-libre/PKGBUILD
+++ b/libre/kdenetwork-kopete-libre/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 189302 2013-07-02 21:26:19Z andrea $
+# $Id: PKGBUILD 191752 2013-07-30 08:53:59Z andrea $
# Maintainer: Andrea Scarpino <andrea@archlinux.org>
# Contributor: Pierre Schmitz <pierre@archlinux.de>
# Maintainer (Parabola): André Silva <emulatorman@lavabit.com>
@@ -6,25 +6,27 @@
pkgbase=kdenetwork
pkgname=('kdenetwork-kopete-libre')
pkgver=4.10.5
-pkgrel=1
+pkgrel=2
arch=('i686' 'x86_64' 'mips64el')
url='http://www.kde.org'
license=('GPL' 'LGPL' 'FDL')
groups=('kde' 'kdenetwork')
-makedepends=('cmake' 'automoc4' 'boost' 'speex' 'ortp' 'libotr3' 'ppp'
+makedepends=('cmake' 'automoc4' 'boost' 'speex' 'libotr3' 'ppp'
'qca-ossl' 'kdebase-workspace' 'kdebase-lib' 'libvncserver'
'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 ../
-# Based on http://bzr.trisquel.info/package-helpers/trunk/annotate/head%3A/helpers/natty/make-kdenetwork, revision 34.
+ # Based on http://bzr.trisquel.info/package-helpers/trunk/annotate/head%3A/helpers/natty/make-kdenetwork, revision 34.
sed -i 's/Skype protocol" ON/Skype protocol" OFF/g' "${pkgbase}-${pkgver}/kopete/protocols/CMakeLists.txt"
rm -rf "${pkgbase}-${pkgver}/kopete/protocols/skype"
sed 's/, Skype//' -i "${pkgbase}-${pkgver}/kopete/doc/index.docbook"
diff --git a/libre/kdenetwork-kopete-libre/giflib5.patch b/libre/kdenetwork-kopete-libre/giflib5.patch
new file mode 100644
index 000000000..231aefbc2
--- /dev/null
+++ b/libre/kdenetwork-kopete-libre/giflib5.patch
@@ -0,0 +1,67 @@
+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
+---
+
+
+--- 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);
+