From 0342506efa0d05ce6e56d0901f1a0b2ef55dd897 Mon Sep 17 00:00:00 2001
From: jc_gargma <jc_gargma@iserlohn-fortress.net>
Date: Sat, 15 Jul 2017 20:36:34 -0700
Subject: Updated kdenetwork-kopete to 17.04.3

Signed-off-by: Isaac David <isacdaavid@isacdaavid.info>
---
 libre/kdenetwork-kopete/PKGBUILD | 27 ++++++++++++++++-----------
 1 file changed, 16 insertions(+), 11 deletions(-)

(limited to 'libre/kdenetwork-kopete/PKGBUILD')

diff --git a/libre/kdenetwork-kopete/PKGBUILD b/libre/kdenetwork-kopete/PKGBUILD
index e037cd155..5e7910bf0 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=17.04.0
-pkgrel=3.parabola1
+pkgver=17.04.3
+pkgrel=1.parabola1
 pkgdesc='Instant Messenger, without nonfree Skype support'
 url='https://kde.org/applications/internet/kopete/'
 arch=('i686' 'x86_64' 'armv7h')
@@ -16,14 +16,19 @@ replaces=(${pkgname}-libre)
 conflicts=(${pkgname}-libre)
 depends=('kdebase-runtime' 'libotr' 'qimageblitz' 'kdepimlibs4' 'qca-qt4')
 makedepends=('cmake' 'automoc4' 'boost' 'mediastreamer' 'libgadu' 'jsoncpp')
-optdepends=('mediastreamer: jingle support' 'libgadu: Gadu-Gadu protocol')
+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 kopete-pthread-link.patch)
-sha256sums=('50dab3e927a992bb30a801edb1dab50526ab0f04744b558be15a17b94f2cb3f1'
+        kopete-mediastreamer2.14.patch
+        kopete-pthread-link.patch
+        kopete-openssl-1.1.patch)
+sha512sums=('d9c2ccec7f72e68090cd72632884b86f6b5a9cdd7fd3d23c1dedf3fe0331296d0b750c48050b80f36a58b92815e240983ab2c96eebb18997235c2a22bc4d2b26'
             'SKIP'
-            'c34a268aaa058e563174581dbe37c15fed91e82326ec704d2a872463139865e0'
-            'a7ebdd8dd4336b7ec085ef254bf18040f473b73379a8cd84569b28441a6c71df')
-validpgpkeys=(CA262C6C83DE4D2FB28A332A3A6A4DB839EAA6D7) # Albert Astals Cid <aacid@kde.org>
+            '6aac8084becfc619a6746828573242ddd0d901cc4c8fa4feb3477a395605330242e2d8a8636b319b1a5afb91074e07e1dd4dd1a8d7a8cfe332b9783526571e6a'
+            '7200c6f580425ef41b27d885ea73301772f75e0a26c829c1741eeb22c084a0f703baea85863522ebf78d55865fe84d725624da6443c6e3174e8a16644a5bf2db'
+            '4aaec507b162c5ec94762704222f37cd8c72a6ce9d2853f8f7d1d8ff6ba777b53acf6dcb660f5647bdcf291633a0e8272948cfb4c0698640a5f2927e7a276885')
+validpgpkeys=(CA262C6C83DE4D2FB28A332A3A6A4DB839EAA6D7  # Albert Astals Cid <aacid@kde.org>
+              F23275E4BF10AFC1DF6914A6DBD2CE893E2D1C87) # Christoph Feck <cfeck@kde.org>
 
 prepare() {
   cd kopete-$pkgver
@@ -38,6 +43,9 @@ prepare() {
   patch -p1 -i ../kopete-mediastreamer2.14.patch
 # Fix linking to pthread in libjingle-call
   patch -p1 -i ../kopete-pthread-link.patch
+# Fix build with OpenSSL 1.1 (based on Fedora patch for libjingle)
+  cd protocols/jabber/libjingle
+  patch -p1 -i "$srcdir"/kopete-openssl-1.1.patch
 }
 
 build() {
@@ -48,9 +56,6 @@ 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
 }
-- 
cgit v1.2.3