Date: Monday, March 27, 2017 @ 12:57:50 Author: arojas Revision: 291730
Reenable libjingle Added: kdenetwork-kopete/kde-unstable/kopete-pthread-link.patch Modified: kdenetwork-kopete/kde-unstable/PKGBUILD ---------------------------+ PKGBUILD | 16 +++++++++------- kopete-pthread-link.patch | 12 ++++++++++++ 2 files changed, 21 insertions(+), 7 deletions(-) Modified: PKGBUILD =================================================================== --- PKGBUILD 2017-03-27 12:15:11 UTC (rev 291729) +++ PKGBUILD 2017-03-27 12:57:50 UTC (rev 291730) @@ -5,7 +5,7 @@ pkgname=kdenetwork-kopete pkgver=17.03.80 -pkgrel=1 +pkgrel=2 pkgdesc='Instant Messenger' url='https://kde.org/applications/internet/kopete/' arch=('i686' 'x86_64') @@ -15,10 +15,11 @@ 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) + kopete-mediastreamer2.14.patch kopete-pthread-link.patch) sha256sums=('c4037045790dc0bf5a153b553415d91851249d7a03661b16d3c379c500e659ef' 'SKIP' - 'c34a268aaa058e563174581dbe37c15fed91e82326ec704d2a872463139865e0') + 'c34a268aaa058e563174581dbe37c15fed91e82326ec704d2a872463139865e0' + 'a7ebdd8dd4336b7ec085ef254bf18040f473b73379a8cd84569b28441a6c71df') validpgpkeys=(CA262C6C83DE4D2FB28A332A3A6A4DB839EAA6D7) # Albert Astals Cid <aa...@kde.org> prepare() { @@ -27,6 +28,8 @@ # 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() { @@ -37,10 +40,9 @@ -DCMAKE_INSTALL_PREFIX=/usr \ -DCMAKE_SKIP_RPATH=ON \ -DWITH_Libmsn=OFF \ - -DWITH_libjingle=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 + -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 make } Added: kopete-pthread-link.patch =================================================================== --- kopete-pthread-link.patch (rev 0) +++ kopete-pthread-link.patch 2017-03-27 12:57:50 UTC (rev 291730) @@ -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 )