[arch-commits] Commit in kdenetwork/repos (16 files)
Andrea Scarpino
andrea at nymeria.archlinux.org
Tue Jul 30 08:54:15 UTC 2013
Date: Tuesday, July 30, 2013 @ 10:54:15
Author: andrea
Revision: 191753
archrelease: copy trunk to staging-i686, staging-x86_64
Added:
kdenetwork/repos/staging-i686/
kdenetwork/repos/staging-i686/PKGBUILD
(from rev 191752, kdenetwork/trunk/PKGBUILD)
kdenetwork/repos/staging-i686/giflib5.patch
(from rev 191752, kdenetwork/trunk/giflib5.patch)
kdenetwork/repos/staging-i686/kdenetwork-kget.install
(from rev 191752, kdenetwork/trunk/kdenetwork-kget.install)
kdenetwork/repos/staging-i686/kdenetwork-kopete.install
(from rev 191752, kdenetwork/trunk/kdenetwork-kopete.install)
kdenetwork/repos/staging-i686/kdenetwork-kppp.install
(from rev 191752, kdenetwork/trunk/kdenetwork-kppp.install)
kdenetwork/repos/staging-i686/kdenetwork.install
(from rev 191752, kdenetwork/trunk/kdenetwork.install)
kdenetwork/repos/staging-i686/use-libotr3.patch
(from rev 191752, kdenetwork/trunk/use-libotr3.patch)
kdenetwork/repos/staging-x86_64/
kdenetwork/repos/staging-x86_64/PKGBUILD
(from rev 191752, kdenetwork/trunk/PKGBUILD)
kdenetwork/repos/staging-x86_64/giflib5.patch
(from rev 191752, kdenetwork/trunk/giflib5.patch)
kdenetwork/repos/staging-x86_64/kdenetwork-kget.install
(from rev 191752, kdenetwork/trunk/kdenetwork-kget.install)
kdenetwork/repos/staging-x86_64/kdenetwork-kopete.install
(from rev 191752, kdenetwork/trunk/kdenetwork-kopete.install)
kdenetwork/repos/staging-x86_64/kdenetwork-kppp.install
(from rev 191752, kdenetwork/trunk/kdenetwork-kppp.install)
kdenetwork/repos/staging-x86_64/kdenetwork.install
(from rev 191752, kdenetwork/trunk/kdenetwork.install)
kdenetwork/repos/staging-x86_64/use-libotr3.patch
(from rev 191752, kdenetwork/trunk/use-libotr3.patch)
------------------------------------------+
staging-i686/PKGBUILD | 122 +++++++++++++++++++++++++++++
staging-i686/giflib5.patch | 67 +++++++++++++++
staging-i686/kdenetwork-kget.install | 12 ++
staging-i686/kdenetwork-kopete.install | 12 ++
staging-i686/kdenetwork-kppp.install | 12 ++
staging-i686/kdenetwork.install | 11 ++
staging-i686/use-libotr3.patch | 71 ++++++++++++++++
staging-x86_64/PKGBUILD | 122 +++++++++++++++++++++++++++++
staging-x86_64/giflib5.patch | 67 +++++++++++++++
staging-x86_64/kdenetwork-kget.install | 12 ++
staging-x86_64/kdenetwork-kopete.install | 12 ++
staging-x86_64/kdenetwork-kppp.install | 12 ++
staging-x86_64/kdenetwork.install | 11 ++
staging-x86_64/use-libotr3.patch | 71 ++++++++++++++++
14 files changed, 614 insertions(+)
Copied: kdenetwork/repos/staging-i686/PKGBUILD (from rev 191752, kdenetwork/trunk/PKGBUILD)
===================================================================
--- staging-i686/PKGBUILD (rev 0)
+++ staging-i686/PKGBUILD 2013-07-30 08:54:15 UTC (rev 191753)
@@ -0,0 +1,122 @@
+# $Id$
+# Maintainer: Andrea Scarpino <andrea at archlinux.org>
+# Contributor: Pierre Schmitz <pierre at archlinux.de>
+
+pkgbase=kdenetwork
+pkgname=('kdenetwork-filesharing'
+ 'kdenetwork-kdnssd'
+ 'kdenetwork-kget'
+ 'kdenetwork-kopete'
+ 'kdenetwork-kppp'
+ 'kdenetwork-krdc'
+ 'kdenetwork-krfb')
+pkgver=4.10.5
+pkgrel=2
+arch=('i686' 'x86_64')
+url='http://www.kde.org'
+license=('GPL' 'LGPL' 'FDL')
+groups=('kde' 'kdenetwork')
+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'
+ 'giflib5.patch')
+sha1sums=('3ee86a1a227593e9f37881da3c1db1a3c384b2e4'
+ '9c3b0ee15538fbfa36aa0a4748b1f6b5a7905384'
+ '388319373e96e6f44446ea1132c35ae9f660e01c')
+
+prepare() {
+ cd ${pkgbase}-${pkgver}
+ patch -p1 -i "${srcdir}"/use-libotr3.patch
+ cd kopete
+ patch -p1 -i "${srcdir}"/giflib5.patch
+}
+
+build() {
+ mkdir build
+ cd build
+ cmake ../${pkgbase}-${pkgver} \
+ -DCMAKE_BUILD_TYPE=Release \
+ -DKDE4_BUILD_TESTS=OFF \
+ -DCMAKE_SKIP_RPATH=ON \
+ -DCMAKE_INSTALL_PREFIX=/usr \
+ -DMOZPLUGIN_INSTALL_DIR=/usr/lib/mozilla/plugins/ \
+ -DWITH_Xmms=OFF \
+ -DWITH_LibMeanwhile=OFF \
+ -DWITH_qq=OFF
+ make
+}
+
+package_kdenetwork-filesharing() {
+ pkgdesc='Konqueror properties dialog plugin to share a directory with the local network'
+ depends=('kdelibs' 'smbclient')
+ install='kdenetwork.install'
+ cd $srcdir/build/kdenetwork-filesharing
+ make DESTDIR=$pkgdir install
+}
+
+package_kdenetwork-kdnssd() {
+ pkgdesc='Monitors the network for DNS-SD services'
+ depends=('kdelibs')
+ cd $srcdir/build/kdnssd
+ make DESTDIR=$pkgdir install
+}
+
+package_kdenetwork-kget() {
+ pkgdesc='Download Manager'
+ depends=('kdebase-workspace' 'kdebase-lib' 'libktorrent' 'libmms')
+ url="http://kde.org/applications/internet/kget/"
+ install='kdenetwork-kget.install'
+ cd $srcdir/build/kget
+ make DESTDIR=$pkgdir install
+}
+
+package_kdenetwork-kopete() {
+ pkgdesc='Instant Messenger'
+ depends=('kdebase-runtime' 'kdepimlibs' 'qca-ossl' 'libotr3' 'libmsn'
+ 'libidn' 'qimageblitz' 'libgadu')
+ url="http://kde.org/applications/internet/kopete/"
+ install='kdenetwork-kopete.install'
+ cd $srcdir/build/kopete
+ make DESTDIR=$pkgdir install
+ cd $srcdir/build/kopete/doc
+ make DESTDIR=$pkgdir install
+}
+
+package_kdenetwork-kppp() {
+ pkgdesc='Internet Dial-Up Tool'
+ depends=('kdebase-runtime' 'ppp')
+ url="http://kde.org/applications/internet/kppp/"
+ install='kdenetwork-kppp.install'
+ cd $srcdir/build/kppp
+ make DESTDIR=$pkgdir install
+ cd $srcdir/build/kppp/doc
+ make DESTDIR=$pkgdir install
+}
+
+package_kdenetwork-krdc() {
+ pkgdesc='Remote Desktop Client'
+ depends=('kdebase-runtime' 'telepathy-qt')
+ optdepends=('libvncserver: VNC support'
+ 'rdesktop: RDP support'
+ 'kdebase-keditbookmarks: to edit bookmarks')
+ url="http://kde.org/applications/internet/krdc/"
+ cd $srcdir/build/krdc
+ make DESTDIR=$pkgdir install
+ cd $srcdir/build/krdc/doc
+ make DESTDIR=$pkgdir install
+}
+
+package_kdenetwork-krfb() {
+ pkgdesc='Desktop Sharing'
+ # note on libxdamage:
+ # not detected by namcap because libgl depends on it
+ # but nvidia providing libgl does not depend on libxdamage
+ depends=('kdebase-runtime' 'libvncserver' 'libxdamage' 'telepathy-qt')
+ cd $srcdir/build/krfb
+ make DESTDIR=$pkgdir install
+ cd $srcdir/build/krfb/doc
+ make DESTDIR=$pkgdir install
+}
Copied: kdenetwork/repos/staging-i686/giflib5.patch (from rev 191752, kdenetwork/trunk/giflib5.patch)
===================================================================
--- staging-i686/giflib5.patch (rev 0)
+++ staging-i686/giflib5.patch 2013-07-30 08:54:15 UTC (rev 191753)
@@ -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);
+
Copied: kdenetwork/repos/staging-i686/kdenetwork-kget.install (from rev 191752, kdenetwork/trunk/kdenetwork-kget.install)
===================================================================
--- staging-i686/kdenetwork-kget.install (rev 0)
+++ staging-i686/kdenetwork-kget.install 2013-07-30 08:54:15 UTC (rev 191753)
@@ -0,0 +1,12 @@
+post_install() {
+ xdg-icon-resource forceupdate --theme hicolor &> /dev/null
+ update-desktop-database -q
+}
+
+post_upgrade() {
+ post_install
+}
+
+post_remove() {
+ post_install
+}
Copied: kdenetwork/repos/staging-i686/kdenetwork-kopete.install (from rev 191752, kdenetwork/trunk/kdenetwork-kopete.install)
===================================================================
--- staging-i686/kdenetwork-kopete.install (rev 0)
+++ staging-i686/kdenetwork-kopete.install 2013-07-30 08:54:15 UTC (rev 191753)
@@ -0,0 +1,12 @@
+post_install() {
+ xdg-icon-resource forceupdate --theme hicolor &> /dev/null
+ update-desktop-database -q
+}
+
+post_upgrade() {
+ post_install
+}
+
+post_remove() {
+ post_install
+}
Copied: kdenetwork/repos/staging-i686/kdenetwork-kppp.install (from rev 191752, kdenetwork/trunk/kdenetwork-kppp.install)
===================================================================
--- staging-i686/kdenetwork-kppp.install (rev 0)
+++ staging-i686/kdenetwork-kppp.install 2013-07-30 08:54:15 UTC (rev 191753)
@@ -0,0 +1,12 @@
+post_install() {
+ xdg-icon-resource forceupdate --theme hicolor &> /dev/null
+ update-desktop-database -q
+}
+
+post_upgrade() {
+ post_install
+}
+
+post_remove() {
+ post_install
+}
Copied: kdenetwork/repos/staging-i686/kdenetwork.install (from rev 191752, kdenetwork/trunk/kdenetwork.install)
===================================================================
--- staging-i686/kdenetwork.install (rev 0)
+++ staging-i686/kdenetwork.install 2013-07-30 08:54:15 UTC (rev 191753)
@@ -0,0 +1,11 @@
+post_install() {
+ xdg-icon-resource forceupdate --theme hicolor &> /dev/null
+}
+
+post_upgrade() {
+ post_install
+}
+
+post_remove() {
+ post_install
+}
Copied: kdenetwork/repos/staging-i686/use-libotr3.patch (from rev 191752, kdenetwork/trunk/use-libotr3.patch)
===================================================================
--- staging-i686/use-libotr3.patch (rev 0)
+++ staging-i686/use-libotr3.patch 2013-07-30 08:54:15 UTC (rev 191753)
@@ -0,0 +1,71 @@
+diff -urN a/kopete/cmake/modules/FindLibOTR.cmake b/kopete/cmake/modules/FindLibOTR.cmake
+--- a/kopete/cmake/modules/FindLibOTR.cmake 2012-08-12 18:08:59.000000000 -0600
++++ b/kopete/cmake/modules/FindLibOTR.cmake 2012-11-09 12:14:24.251450904 -0700
+@@ -13,13 +13,13 @@
+ SET(LIBOTR_FIND_QUIETLY TRUE)
+ ENDIF (LIBOTR_INCLUDE_DIR AND LIBOTR_LIBRARY)
+
+-FIND_PATH(LIBOTR_INCLUDE_DIR libotr/version.h)
++FIND_PATH(LIBOTR_INCLUDE_DIR libotr3/version.h)
+
+-FIND_LIBRARY(LIBOTR_LIBRARY NAMES otr libotr)
++FIND_LIBRARY(LIBOTR_LIBRARY NAMES otr3 libotr3)
+
+-# Determine version information from libotr/version.h
++# Determine version information from libotr3/version.h
+ IF( LIBOTR_INCLUDE_DIR AND LIBOTR_LIBRARY )
+- EXECUTE_PROCESS(COMMAND grep "OTRL_VERSION" "${LIBOTR_INCLUDE_DIR}/libotr/version.h" OUTPUT_VARIABLE output)
++ EXECUTE_PROCESS(COMMAND grep "OTRL_VERSION" "${LIBOTR_INCLUDE_DIR}/libotr3/version.h" OUTPUT_VARIABLE output)
+ STRING(REGEX MATCH "OTRL_VERSION \"[0-9]+\\.[0-9]+\\.[0-9]+" LIBOTR_VERSION "${output}")
+ STRING(REGEX REPLACE "^OTRL_VERSION \"" "" LIBOTR_VERSION "${LIBOTR_VERSION}")
+ # Check if version is at least 3.2.0
+diff -urN a/kopete/plugins/otr/authenticationwizard.h b/kopete/plugins/otr/authenticationwizard.h
+--- a/kopete/plugins/otr/authenticationwizard.h 2012-08-12 18:09:00.000000000 -0600
++++ b/kopete/plugins/otr/authenticationwizard.h 2012-11-09 12:15:11.181265336 -0700
+@@ -26,7 +26,7 @@
+ */
+
+ extern "C"{
+-#include "libotr/proto.h"
++#include "libotr3/proto.h"
+ }
+
+ #include "kopetechatsession.h"
+diff -urN a/kopete/plugins/otr/otrlchatinterface.h b/kopete/plugins/otr/otrlchatinterface.h
+--- a/kopete/plugins/otr/otrlchatinterface.h 2012-08-12 18:09:00.000000000 -0600
++++ b/kopete/plugins/otr/otrlchatinterface.h 2012-11-09 12:16:10.141032744 -0700
+@@ -36,10 +36,10 @@
+ #include "authenticationwizard.h"
+
+ extern "C" {
+-#include <libotr/privkey.h>
+-#include <libotr/proto.h>
+-#include <libotr/message.h>
+-#include <libotr/userstate.h>
++#include <libotr3/privkey.h>
++#include <libotr3/proto.h>
++#include <libotr3/message.h>
++#include <libotr3/userstate.h>
+ }
+
+
+diff -urN a/kopete/plugins/otr/otrlconfinterface.h b/kopete/plugins/otr/otrlconfinterface.h
+--- a/kopete/plugins/otr/otrlconfinterface.h 2012-08-12 18:09:00.000000000 -0600
++++ b/kopete/plugins/otr/otrlconfinterface.h 2012-11-09 12:15:56.961084991 -0700
+@@ -32,11 +32,11 @@
+ #include <kopetechatsession.h>
+
+ extern "C" {
+-#include <libotr/privkey.h>
+-#include <libotr/proto.h>
+-#include <libotr/message.h>
+-#include <libotr/userstate.h>
+-#include <libotr/context.h>
++#include <libotr3/privkey.h>
++#include <libotr3/proto.h>
++#include <libotr3/message.h>
++#include <libotr3/userstate.h>
++#include <libotr3/context.h>
+ }
+
+ class KOPETE_OTR_SHARED_EXPORT OtrlConfInterface : public QObject
Copied: kdenetwork/repos/staging-x86_64/PKGBUILD (from rev 191752, kdenetwork/trunk/PKGBUILD)
===================================================================
--- staging-x86_64/PKGBUILD (rev 0)
+++ staging-x86_64/PKGBUILD 2013-07-30 08:54:15 UTC (rev 191753)
@@ -0,0 +1,122 @@
+# $Id$
+# Maintainer: Andrea Scarpino <andrea at archlinux.org>
+# Contributor: Pierre Schmitz <pierre at archlinux.de>
+
+pkgbase=kdenetwork
+pkgname=('kdenetwork-filesharing'
+ 'kdenetwork-kdnssd'
+ 'kdenetwork-kget'
+ 'kdenetwork-kopete'
+ 'kdenetwork-kppp'
+ 'kdenetwork-krdc'
+ 'kdenetwork-krfb')
+pkgver=4.10.5
+pkgrel=2
+arch=('i686' 'x86_64')
+url='http://www.kde.org'
+license=('GPL' 'LGPL' 'FDL')
+groups=('kde' 'kdenetwork')
+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'
+ 'giflib5.patch')
+sha1sums=('3ee86a1a227593e9f37881da3c1db1a3c384b2e4'
+ '9c3b0ee15538fbfa36aa0a4748b1f6b5a7905384'
+ '388319373e96e6f44446ea1132c35ae9f660e01c')
+
+prepare() {
+ cd ${pkgbase}-${pkgver}
+ patch -p1 -i "${srcdir}"/use-libotr3.patch
+ cd kopete
+ patch -p1 -i "${srcdir}"/giflib5.patch
+}
+
+build() {
+ mkdir build
+ cd build
+ cmake ../${pkgbase}-${pkgver} \
+ -DCMAKE_BUILD_TYPE=Release \
+ -DKDE4_BUILD_TESTS=OFF \
+ -DCMAKE_SKIP_RPATH=ON \
+ -DCMAKE_INSTALL_PREFIX=/usr \
+ -DMOZPLUGIN_INSTALL_DIR=/usr/lib/mozilla/plugins/ \
+ -DWITH_Xmms=OFF \
+ -DWITH_LibMeanwhile=OFF \
+ -DWITH_qq=OFF
+ make
+}
+
+package_kdenetwork-filesharing() {
+ pkgdesc='Konqueror properties dialog plugin to share a directory with the local network'
+ depends=('kdelibs' 'smbclient')
+ install='kdenetwork.install'
+ cd $srcdir/build/kdenetwork-filesharing
+ make DESTDIR=$pkgdir install
+}
+
+package_kdenetwork-kdnssd() {
+ pkgdesc='Monitors the network for DNS-SD services'
+ depends=('kdelibs')
+ cd $srcdir/build/kdnssd
+ make DESTDIR=$pkgdir install
+}
+
+package_kdenetwork-kget() {
+ pkgdesc='Download Manager'
+ depends=('kdebase-workspace' 'kdebase-lib' 'libktorrent' 'libmms')
+ url="http://kde.org/applications/internet/kget/"
+ install='kdenetwork-kget.install'
+ cd $srcdir/build/kget
+ make DESTDIR=$pkgdir install
+}
+
+package_kdenetwork-kopete() {
+ pkgdesc='Instant Messenger'
+ depends=('kdebase-runtime' 'kdepimlibs' 'qca-ossl' 'libotr3' 'libmsn'
+ 'libidn' 'qimageblitz' 'libgadu')
+ url="http://kde.org/applications/internet/kopete/"
+ install='kdenetwork-kopete.install'
+ cd $srcdir/build/kopete
+ make DESTDIR=$pkgdir install
+ cd $srcdir/build/kopete/doc
+ make DESTDIR=$pkgdir install
+}
+
+package_kdenetwork-kppp() {
+ pkgdesc='Internet Dial-Up Tool'
+ depends=('kdebase-runtime' 'ppp')
+ url="http://kde.org/applications/internet/kppp/"
+ install='kdenetwork-kppp.install'
+ cd $srcdir/build/kppp
+ make DESTDIR=$pkgdir install
+ cd $srcdir/build/kppp/doc
+ make DESTDIR=$pkgdir install
+}
+
+package_kdenetwork-krdc() {
+ pkgdesc='Remote Desktop Client'
+ depends=('kdebase-runtime' 'telepathy-qt')
+ optdepends=('libvncserver: VNC support'
+ 'rdesktop: RDP support'
+ 'kdebase-keditbookmarks: to edit bookmarks')
+ url="http://kde.org/applications/internet/krdc/"
+ cd $srcdir/build/krdc
+ make DESTDIR=$pkgdir install
+ cd $srcdir/build/krdc/doc
+ make DESTDIR=$pkgdir install
+}
+
+package_kdenetwork-krfb() {
+ pkgdesc='Desktop Sharing'
+ # note on libxdamage:
+ # not detected by namcap because libgl depends on it
+ # but nvidia providing libgl does not depend on libxdamage
+ depends=('kdebase-runtime' 'libvncserver' 'libxdamage' 'telepathy-qt')
+ cd $srcdir/build/krfb
+ make DESTDIR=$pkgdir install
+ cd $srcdir/build/krfb/doc
+ make DESTDIR=$pkgdir install
+}
Copied: kdenetwork/repos/staging-x86_64/giflib5.patch (from rev 191752, kdenetwork/trunk/giflib5.patch)
===================================================================
--- staging-x86_64/giflib5.patch (rev 0)
+++ staging-x86_64/giflib5.patch 2013-07-30 08:54:15 UTC (rev 191753)
@@ -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);
+
Copied: kdenetwork/repos/staging-x86_64/kdenetwork-kget.install (from rev 191752, kdenetwork/trunk/kdenetwork-kget.install)
===================================================================
--- staging-x86_64/kdenetwork-kget.install (rev 0)
+++ staging-x86_64/kdenetwork-kget.install 2013-07-30 08:54:15 UTC (rev 191753)
@@ -0,0 +1,12 @@
+post_install() {
+ xdg-icon-resource forceupdate --theme hicolor &> /dev/null
+ update-desktop-database -q
+}
+
+post_upgrade() {
+ post_install
+}
+
+post_remove() {
+ post_install
+}
Copied: kdenetwork/repos/staging-x86_64/kdenetwork-kopete.install (from rev 191752, kdenetwork/trunk/kdenetwork-kopete.install)
===================================================================
--- staging-x86_64/kdenetwork-kopete.install (rev 0)
+++ staging-x86_64/kdenetwork-kopete.install 2013-07-30 08:54:15 UTC (rev 191753)
@@ -0,0 +1,12 @@
+post_install() {
+ xdg-icon-resource forceupdate --theme hicolor &> /dev/null
+ update-desktop-database -q
+}
+
+post_upgrade() {
+ post_install
+}
+
+post_remove() {
+ post_install
+}
Copied: kdenetwork/repos/staging-x86_64/kdenetwork-kppp.install (from rev 191752, kdenetwork/trunk/kdenetwork-kppp.install)
===================================================================
--- staging-x86_64/kdenetwork-kppp.install (rev 0)
+++ staging-x86_64/kdenetwork-kppp.install 2013-07-30 08:54:15 UTC (rev 191753)
@@ -0,0 +1,12 @@
+post_install() {
+ xdg-icon-resource forceupdate --theme hicolor &> /dev/null
+ update-desktop-database -q
+}
+
+post_upgrade() {
+ post_install
+}
+
+post_remove() {
+ post_install
+}
Copied: kdenetwork/repos/staging-x86_64/kdenetwork.install (from rev 191752, kdenetwork/trunk/kdenetwork.install)
===================================================================
--- staging-x86_64/kdenetwork.install (rev 0)
+++ staging-x86_64/kdenetwork.install 2013-07-30 08:54:15 UTC (rev 191753)
@@ -0,0 +1,11 @@
+post_install() {
+ xdg-icon-resource forceupdate --theme hicolor &> /dev/null
+}
+
+post_upgrade() {
+ post_install
+}
+
+post_remove() {
+ post_install
+}
Copied: kdenetwork/repos/staging-x86_64/use-libotr3.patch (from rev 191752, kdenetwork/trunk/use-libotr3.patch)
===================================================================
--- staging-x86_64/use-libotr3.patch (rev 0)
+++ staging-x86_64/use-libotr3.patch 2013-07-30 08:54:15 UTC (rev 191753)
@@ -0,0 +1,71 @@
+diff -urN a/kopete/cmake/modules/FindLibOTR.cmake b/kopete/cmake/modules/FindLibOTR.cmake
+--- a/kopete/cmake/modules/FindLibOTR.cmake 2012-08-12 18:08:59.000000000 -0600
++++ b/kopete/cmake/modules/FindLibOTR.cmake 2012-11-09 12:14:24.251450904 -0700
+@@ -13,13 +13,13 @@
+ SET(LIBOTR_FIND_QUIETLY TRUE)
+ ENDIF (LIBOTR_INCLUDE_DIR AND LIBOTR_LIBRARY)
+
+-FIND_PATH(LIBOTR_INCLUDE_DIR libotr/version.h)
++FIND_PATH(LIBOTR_INCLUDE_DIR libotr3/version.h)
+
+-FIND_LIBRARY(LIBOTR_LIBRARY NAMES otr libotr)
++FIND_LIBRARY(LIBOTR_LIBRARY NAMES otr3 libotr3)
+
+-# Determine version information from libotr/version.h
++# Determine version information from libotr3/version.h
+ IF( LIBOTR_INCLUDE_DIR AND LIBOTR_LIBRARY )
+- EXECUTE_PROCESS(COMMAND grep "OTRL_VERSION" "${LIBOTR_INCLUDE_DIR}/libotr/version.h" OUTPUT_VARIABLE output)
++ EXECUTE_PROCESS(COMMAND grep "OTRL_VERSION" "${LIBOTR_INCLUDE_DIR}/libotr3/version.h" OUTPUT_VARIABLE output)
+ STRING(REGEX MATCH "OTRL_VERSION \"[0-9]+\\.[0-9]+\\.[0-9]+" LIBOTR_VERSION "${output}")
+ STRING(REGEX REPLACE "^OTRL_VERSION \"" "" LIBOTR_VERSION "${LIBOTR_VERSION}")
+ # Check if version is at least 3.2.0
+diff -urN a/kopete/plugins/otr/authenticationwizard.h b/kopete/plugins/otr/authenticationwizard.h
+--- a/kopete/plugins/otr/authenticationwizard.h 2012-08-12 18:09:00.000000000 -0600
++++ b/kopete/plugins/otr/authenticationwizard.h 2012-11-09 12:15:11.181265336 -0700
+@@ -26,7 +26,7 @@
+ */
+
+ extern "C"{
+-#include "libotr/proto.h"
++#include "libotr3/proto.h"
+ }
+
+ #include "kopetechatsession.h"
+diff -urN a/kopete/plugins/otr/otrlchatinterface.h b/kopete/plugins/otr/otrlchatinterface.h
+--- a/kopete/plugins/otr/otrlchatinterface.h 2012-08-12 18:09:00.000000000 -0600
++++ b/kopete/plugins/otr/otrlchatinterface.h 2012-11-09 12:16:10.141032744 -0700
+@@ -36,10 +36,10 @@
+ #include "authenticationwizard.h"
+
+ extern "C" {
+-#include <libotr/privkey.h>
+-#include <libotr/proto.h>
+-#include <libotr/message.h>
+-#include <libotr/userstate.h>
++#include <libotr3/privkey.h>
++#include <libotr3/proto.h>
++#include <libotr3/message.h>
++#include <libotr3/userstate.h>
+ }
+
+
+diff -urN a/kopete/plugins/otr/otrlconfinterface.h b/kopete/plugins/otr/otrlconfinterface.h
+--- a/kopete/plugins/otr/otrlconfinterface.h 2012-08-12 18:09:00.000000000 -0600
++++ b/kopete/plugins/otr/otrlconfinterface.h 2012-11-09 12:15:56.961084991 -0700
+@@ -32,11 +32,11 @@
+ #include <kopetechatsession.h>
+
+ extern "C" {
+-#include <libotr/privkey.h>
+-#include <libotr/proto.h>
+-#include <libotr/message.h>
+-#include <libotr/userstate.h>
+-#include <libotr/context.h>
++#include <libotr3/privkey.h>
++#include <libotr3/proto.h>
++#include <libotr3/message.h>
++#include <libotr3/userstate.h>
++#include <libotr3/context.h>
+ }
+
+ class KOPETE_OTR_SHARED_EXPORT OtrlConfInterface : public QObject
More information about the arch-commits
mailing list