summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--libre/kdenetwork-kopete/PKGBUILD18
-rw-r--r--libre/kdenetwork-kopete/kopete-pthread-link.patch12
2 files changed, 24 insertions, 6 deletions
diff --git a/libre/kdenetwork-kopete/PKGBUILD b/libre/kdenetwork-kopete/PKGBUILD
index 27b830959..e037cd155 100644
--- a/libre/kdenetwork-kopete/PKGBUILD
+++ b/libre/kdenetwork-kopete/PKGBUILD
@@ -5,8 +5,8 @@
# Maintainer: André Silva <emulatorman@parabola.nu>
pkgname=kdenetwork-kopete
-pkgver=16.12.3
-pkgrel=1.parabola1
+pkgver=17.04.0
+pkgrel=3.parabola1
pkgdesc='Instant Messenger, without nonfree Skype support'
url='https://kde.org/applications/internet/kopete/'
arch=('i686' 'x86_64' 'armv7h')
@@ -14,14 +14,15 @@ license=('GPL' 'LGPL' 'FDL')
groups=('kde-applications' 'kdenetwork')
replaces=(${pkgname}-libre)
conflicts=(${pkgname}-libre)
-depends=('kdebase-runtime' 'libotr' 'qimageblitz' 'kdepimlibs4')
+depends=('kdebase-runtime' 'libotr' 'qimageblitz' 'kdepimlibs4' 'qca-qt4')
makedepends=('cmake' 'automoc4' 'boost' 'mediastreamer' 'libgadu' 'jsoncpp')
optdepends=('mediastreamer: jingle support' 'libgadu: Gadu-Gadu protocol')
source=("https://download.kde.org/stable/applications/${pkgver}/src/kopete-${pkgver}.tar.xz"{,.sig}
- kopete-mediastreamer2.14.patch)
-sha256sums=('61be9e45cb08e42a00bdc0e99f5d7ad7872299ac2e104124a3c0d939422376b6'
+ kopete-mediastreamer2.14.patch kopete-pthread-link.patch)
+sha256sums=('50dab3e927a992bb30a801edb1dab50526ab0f04744b558be15a17b94f2cb3f1'
'SKIP'
- 'c34a268aaa058e563174581dbe37c15fed91e82326ec704d2a872463139865e0')
+ 'c34a268aaa058e563174581dbe37c15fed91e82326ec704d2a872463139865e0'
+ 'a7ebdd8dd4336b7ec085ef254bf18040f473b73379a8cd84569b28441a6c71df')
validpgpkeys=(CA262C6C83DE4D2FB28A332A3A6A4DB839EAA6D7) # Albert Astals Cid <aacid@kde.org>
prepare() {
@@ -35,6 +36,8 @@ prepare() {
# Fix build with mediastreamer 2.14
cd kopete-$pkgver
patch -p1 -i ../kopete-mediastreamer2.14.patch
+# Fix linking to pthread in libjingle-call
+ patch -p1 -i ../kopete-pthread-link.patch
}
build() {
@@ -45,6 +48,9 @@ build() {
-DCMAKE_INSTALL_PREFIX=/usr \
-DCMAKE_SKIP_RPATH=ON \
-DWITH_Libmsn=OFF \
+ -DOPENSSL_INCLUDE_DIR=/usr/include/openssl-1.0 \
+ -DOPENSSL_SSL_LIBRARY=/usr/lib/openssl-1.0/libssl.so \
+ -DOPENSSL_CRYPTO_LIBRARY=/usr/lib/openssl-1.0/libcrypto.so \
-DWITH_skype=OFF
make
}
diff --git a/libre/kdenetwork-kopete/kopete-pthread-link.patch b/libre/kdenetwork-kopete/kopete-pthread-link.patch
new file mode 100644
index 000000000..d917fe65e
--- /dev/null
+++ b/libre/kdenetwork-kopete/kopete-pthread-link.patch
@@ -0,0 +1,12 @@
+diff --git a/protocols/jabber/libjingle/CMakeLists.txt b/protocols/jabber/libjingle/CMakeLists.txt
+index 7ea8c3eb6..4b73085b8 100644
+--- a/protocols/jabber/libjingle/CMakeLists.txt
++++ b/protocols/jabber/libjingle/CMakeLists.txt
+@@ -288,6 +288,7 @@ set ( call_LIBS
+ ${MEDIASTREAMER_LIBRARIES}
+ ${LIBORTP_LIBRARY}
+ ${CMAKE_DL_LIBS}
++ pthread
+ )
+
+ if ( NOT WIN32 )