From adebb68830b910fcb976bee704a96cd109d667fd Mon Sep 17 00:00:00 2001 From: André Fabian Silva Delgado Date: Fri, 9 Nov 2012 16:44:26 -0200 Subject: kdenetwork-kopete-libre-4.9.3-1: updating version --- libre/kdenetwork-kopete-libre/PKGBUILD | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) (limited to 'libre/kdenetwork-kopete-libre/PKGBUILD') diff --git a/libre/kdenetwork-kopete-libre/PKGBUILD b/libre/kdenetwork-kopete-libre/PKGBUILD index d5211499b..2b7a87dfa 100755 --- a/libre/kdenetwork-kopete-libre/PKGBUILD +++ b/libre/kdenetwork-kopete-libre/PKGBUILD @@ -1,25 +1,28 @@ -# $Id: PKGBUILD 165994 2012-09-03 21:52:07Z andrea $ +# $Id: PKGBUILD 10325 2012-11-06 13:01:47Z andrea $ # Maintainer: Andrea Scarpino # Contributor: Pierre Schmitz # Maintainer (Parabola): André Silva pkgbase=kdenetwork pkgname=('kdenetwork-kopete-libre') -pkgver=4.9.2 +pkgver=4.9.3 pkgrel=1 -arch=('i686' 'x86_64') +arch=('i686' 'x86_64' 'mips64el') url='http://www.kde.org' license=('GPL' 'LGPL' 'FDL') groups=('kde' 'kdenetwork') -makedepends=('cmake' 'automoc4' 'boost' 'speex' 'ortp' 'libotr' 'ppp' +makedepends=('cmake' 'automoc4' 'boost' 'speex' 'ortp' 'libotr3' 'ppp' 'qca-ossl' 'kdebase-workspace' 'kdebase-lib' 'libvncserver' 'v4l-utils' 'libidn' 'qimageblitz' 'libxdamage' 'libgadu' 'libmsn' 'libktorrent' 'libmms' 'mediastreamer' 'telepathy-qt') -source=("http://download.kde.org/stable/${pkgver}/src/${pkgbase}-${pkgver}.tar.xz") -sha1sums=('6779039e5354fae02cf7faa3442385b95befb430') +source=("http://download.kde.org/stable/${pkgver}/src/${pkgbase}-${pkgver}.tar.xz" + 'use-libotr3.patch') +sha1sums=('2a0b31a292f4805224fdb0ba26a9426e1126f4f6' + '808fa0400dc419d446d4ff8a9b536b5fddcb4727') build() { cd "${srcdir}" + patch -p1 -i ./use-libotr3.patch # 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" @@ -40,7 +43,7 @@ build() { package_kdenetwork-kopete-libre() { pkgdesc='Instant Messenger (without skype support)' - depends=('kdebase-runtime' 'kdepimlibs' 'qca-ossl' 'libotr' 'libmsn' + depends=('kdebase-runtime' 'kdepimlibs' 'qca-ossl' 'libotr3' 'libmsn' 'libidn' 'qimageblitz' 'libgadu' 'mediastreamer') conflicts=('kdenetwork-kopete') provides=("kdenetwork-kopete=${pkgver}") -- cgit v1.2.3-54-g00ecf From ba4c662f002990f3dfd05596e9b68ac3a7891ecc Mon Sep 17 00:00:00 2001 From: André Fabian Silva Delgado Date: Fri, 9 Nov 2012 21:38:03 -0200 Subject: kdenetwork-kopete-libre-4.9.3-1: fixing issues on building --- libre/kdenetwork-kopete-libre/PKGBUILD | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'libre/kdenetwork-kopete-libre/PKGBUILD') diff --git a/libre/kdenetwork-kopete-libre/PKGBUILD b/libre/kdenetwork-kopete-libre/PKGBUILD index 2b7a87dfa..facd65fad 100755 --- a/libre/kdenetwork-kopete-libre/PKGBUILD +++ b/libre/kdenetwork-kopete-libre/PKGBUILD @@ -21,8 +21,9 @@ sha1sums=('2a0b31a292f4805224fdb0ba26a9426e1126f4f6' '808fa0400dc419d446d4ff8a9b536b5fddcb4727') 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" -- cgit v1.2.3-54-g00ecf From 03d5565a5e31c4f5189f8fd91eaf11aac5b9d5d3 Mon Sep 17 00:00:00 2001 From: André Fabian Silva Delgado Date: Fri, 9 Nov 2012 21:50:37 -0200 Subject: kdenetwork-kopete-libre-4.9.3-1: better version of use-libotr3 patch --- libre/kdenetwork-kopete-libre/PKGBUILD | 4 +- libre/kdenetwork-kopete-libre/use-libotr3.patch | 55 ++++++++++++++++++++++++- 2 files changed, 55 insertions(+), 4 deletions(-) (limited to 'libre/kdenetwork-kopete-libre/PKGBUILD') diff --git a/libre/kdenetwork-kopete-libre/PKGBUILD b/libre/kdenetwork-kopete-libre/PKGBUILD index facd65fad..71c772a4e 100755 --- 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 # Contributor: Pierre Schmitz # Maintainer (Parabola): André Silva @@ -18,7 +18,7 @@ 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 ${pkgbase}-${pkgver} 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 +-#include +-#include +-#include ++#include ++#include ++#include ++#include + } + + +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 + + extern "C" { +-#include +-#include +-#include +-#include +-#include ++#include ++#include ++#include ++#include ++#include + } + + class KOPETE_OTR_SHARED_EXPORT OtrlConfInterface : public QObject -- cgit v1.2.3-54-g00ecf