diff options
author | root <root@rshg054.dnsready.net> | 2012-11-10 01:23:31 -0800 |
---|---|---|
committer | root <root@rshg054.dnsready.net> | 2012-11-10 01:23:31 -0800 |
commit | 6eea0bd1e92ed5aa53cb5f59102529c88e9e1786 (patch) | |
tree | b069468f4084f5af5ad3ba2ecab7e6b4deb90267 /libre/kdenetwork-kopete-libre | |
parent | 3f7cb62ef558ea147661abe007a4293c0069fc62 (diff) |
Sat Nov 10 01:23:30 PST 2012
Diffstat (limited to 'libre/kdenetwork-kopete-libre')
-rw-r--r-- | libre/kdenetwork-kopete-libre/PKGBUILD | 9 | ||||
-rw-r--r-- | libre/kdenetwork-kopete-libre/use-libotr3.patch | 55 |
2 files changed, 58 insertions, 6 deletions
diff --git a/libre/kdenetwork-kopete-libre/PKGBUILD b/libre/kdenetwork-kopete-libre/PKGBUILD index 2b7a87dfa..71c772a4e 100644 --- a/libre/kdenetwork-kopete-libre/PKGBUILD +++ b/libre/kdenetwork-kopete-libre/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 10325 2012-11-06 13:01:47Z andrea $ +# $Id: PKGBUILD 170697 2012-11-09 20:49:27Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> # Contributor: Pierre Schmitz <pierre@archlinux.de> # Maintainer (Parabola): André Silva <emulatorman@lavabit.com> @@ -18,11 +18,12 @@ makedepends=('cmake' 'automoc4' 'boost' 'speex' 'ortp' 'libotr3' 'ppp' source=("http://download.kde.org/stable/${pkgver}/src/${pkgbase}-${pkgver}.tar.xz" 'use-libotr3.patch') sha1sums=('2a0b31a292f4805224fdb0ba26a9426e1126f4f6' - '808fa0400dc419d446d4ff8a9b536b5fddcb4727') + '9c3b0ee15538fbfa36aa0a4748b1f6b5a7905384') build() { - cd "${srcdir}" - patch -p1 -i ./use-libotr3.patch + 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. sed -i 's/Skype protocol" ON/Skype protocol" OFF/g' "${pkgbase}-${pkgver}/kopete/protocols/CMakeLists.txt" rm -rf "${pkgbase}-${pkgver}/kopete/protocols/skype" diff --git a/libre/kdenetwork-kopete-libre/use-libotr3.patch b/libre/kdenetwork-kopete-libre/use-libotr3.patch index c36d1a00c..1e96c98d6 100644 --- a/libre/kdenetwork-kopete-libre/use-libotr3.patch +++ b/libre/kdenetwork-kopete-libre/use-libotr3.patch @@ -1,5 +1,6 @@ ---- kdenetwork-4.9.3/kopete/cmake/modules/FindLibOTR.cmake~ 2012-11-06 10:51:56.566038215 +0000 -+++ kdenetwork-4.9.3/kopete/cmake/modules/FindLibOTR.cmake 2012-11-06 10:53:38.861993686 +0000 +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) @@ -18,3 +19,53 @@ 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 |