Date: Saturday, June 15, 2013 @ 18:17:18 Author: andrea Revision: 188571
archrelease: copy kde-unstable to kde-unstable-i686 Added: kdenetwork-kopete/repos/kde-unstable-i686/PKGBUILD (from rev 188570, kdenetwork-kopete/kde-unstable/PKGBUILD) kdenetwork-kopete/repos/kde-unstable-i686/kdenetwork-kopete.install (from rev 188570, kdenetwork-kopete/kde-unstable/kdenetwork-kopete.install) kdenetwork-kopete/repos/kde-unstable-i686/libotr3.patch (from rev 188570, kdenetwork-kopete/kde-unstable/libotr3.patch) kdenetwork-kopete/repos/kde-unstable-i686/mediastreamer29.patch (from rev 188570, kdenetwork-kopete/kde-unstable/mediastreamer29.patch) Deleted: kdenetwork-kopete/repos/kde-unstable-i686/mediastreamer29.patch ---------------------------+ PKGBUILD | 43 ++++++++++++++++++++++++++ kdenetwork-kopete.install | 12 +++++++ libotr3.patch | 71 ++++++++++++++++++++++++++++++++++++++++++++ mediastreamer29.patch | 44 +++++++++++++-------------- 4 files changed, 148 insertions(+), 22 deletions(-) Copied: kdenetwork-kopete/repos/kde-unstable-i686/PKGBUILD (from rev 188570, kdenetwork-kopete/kde-unstable/PKGBUILD) =================================================================== --- PKGBUILD (rev 0) +++ PKGBUILD 2013-06-15 16:17:18 UTC (rev 188571) @@ -0,0 +1,43 @@ +# $Id$ +# Maintainer: Andrea Scarpino <and...@archlinux.org> + +pkgname=kdenetwork-kopete +pkgver=4.10.80 +pkgrel=2 +pkgdesc='Instant Messenger' +url='http://kde.org/applications/internet/kopete/' +arch=('i686' 'x86_64') +license=('GPL' 'LGPL' 'FDL') +groups=('kde' 'kdenetwork') +depends=('kdebase-runtime' 'kdepimlibs' 'qca-ossl' 'libotr3' 'libmsn' 'libidn' + 'qimageblitz' 'libgadu' 'mediastreamer' 'jsoncpp') +makedepends=('cmake' 'automoc4' 'boost') +install=${pkgname}.install +source=("http://download.kde.org/unstable/${pkgver}/src/kopete-${pkgver}.tar.xz" + 'libotr3.patch' + 'mediastreamer29.patch') +sha1sums=('ee9fccbd612f821f5c1a02a0ec107b4faf4cc94c' + '9c3b0ee15538fbfa36aa0a4748b1f6b5a7905384' + '317683a5c2acd0a0058c5ab42f6006e9db511ef3') + +prepare() { + cd kopete-${pkgver} + patch -p2 -i "${srcdir}"/libotr3.patch + patch -p1 -i "${srcdir}"/mediastreamer29.patch +} + +build() { + mkdir build + cd build + cmake ../kopete-${pkgver} \ + -DCMAKE_BUILD_TYPE=Release \ + -DKDE4_BUILD_TESTS=OFF \ + -DCMAKE_INSTALL_PREFIX=/usr \ + -DCMAKE_SKIP_RPATH=ON + make +} + +package() { + cd build + make DESTDIR=$pkgdir install +} Copied: kdenetwork-kopete/repos/kde-unstable-i686/kdenetwork-kopete.install (from rev 188570, kdenetwork-kopete/kde-unstable/kdenetwork-kopete.install) =================================================================== --- kdenetwork-kopete.install (rev 0) +++ kdenetwork-kopete.install 2013-06-15 16:17:18 UTC (rev 188571) @@ -0,0 +1,12 @@ +post_install() { + xdg-icon-resource forceupdate --theme hicolor &> /dev/null + update-desktop-database -q +} + +post_upgrade() { + post_install +} + +post_remove() { + post_install +} Copied: kdenetwork-kopete/repos/kde-unstable-i686/libotr3.patch (from rev 188570, kdenetwork-kopete/kde-unstable/libotr3.patch) =================================================================== --- libotr3.patch (rev 0) +++ libotr3.patch 2013-06-15 16:17:18 UTC (rev 188571) @@ -0,0 +1,71 @@ +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) + +-FIND_PATH(LIBOTR_INCLUDE_DIR libotr/version.h) ++FIND_PATH(LIBOTR_INCLUDE_DIR libotr3/version.h) + +-FIND_LIBRARY(LIBOTR_LIBRARY NAMES otr libotr) ++FIND_LIBRARY(LIBOTR_LIBRARY NAMES otr3 libotr3) + +-# Determine version information from libotr/version.h ++# Determine version information from libotr3/version.h + IF( LIBOTR_INCLUDE_DIR AND LIBOTR_LIBRARY ) +- EXECUTE_PROCESS(COMMAND grep "OTRL_VERSION" "${LIBOTR_INCLUDE_DIR}/libotr/version.h" OUTPUT_VARIABLE output) ++ EXECUTE_PROCESS(COMMAND grep "OTRL_VERSION" "${LIBOTR_INCLUDE_DIR}/libotr3/version.h" OUTPUT_VARIABLE output) + 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 Deleted: mediastreamer29.patch =================================================================== --- mediastreamer29.patch 2013-06-15 16:16:46 UTC (rev 188570) +++ mediastreamer29.patch 2013-06-15 16:17:18 UTC (rev 188571) @@ -1,22 +0,0 @@ -diff --git a/protocols/jabber/googletalk/libjingle/talk/session/phone/linphonemediaengine.cc b/protocols/jabber/googletalk/libjingle/talk/session/phone/linphonemediaengine.cc -index 88fdbd1..57c6c05 100644 ---- a/protocols/jabber/googletalk/libjingle/talk/session/phone/linphonemediaengine.cc -+++ b/protocols/jabber/googletalk/libjingle/talk/session/phone/linphonemediaengine.cc -@@ -200,7 +200,7 @@ bool LinphoneVoiceChannel::SetSendCodecs(const std::vector<AudioCodec>& codecs) - LOG(LS_INFO) << "Using " << i->name << "/" << i->clockrate; - pt_ = i->id; - audio_stream_ = audio_stream_start(&av_profile, -1, "localhost", port1, i->id, 250, 0); /* -1 means that function will choose some free port */ -- port2 = rtp_session_get_local_port(audio_stream_->session); -+ port2 = rtp_session_get_local_port(audio_stream_->ms.session); - first = false; - } - } -@@ -211,7 +211,7 @@ bool LinphoneVoiceChannel::SetSendCodecs(const std::vector<AudioCodec>& codecs) - // working with a buggy client; let's try PCMU. - LOG(LS_WARNING) << "Received empty list of codces; using PCMU/8000"; - audio_stream_ = audio_stream_start(&av_profile, -1, "localhost", port1, 0, 250, 0); /* -1 means that function will choose some free port */ -- port2 = rtp_session_get_local_port(audio_stream_->session); -+ port2 = rtp_session_get_local_port(audio_stream_->ms.session); - } - - return true; Copied: kdenetwork-kopete/repos/kde-unstable-i686/mediastreamer29.patch (from rev 188570, kdenetwork-kopete/kde-unstable/mediastreamer29.patch) =================================================================== --- mediastreamer29.patch (rev 0) +++ mediastreamer29.patch 2013-06-15 16:17:18 UTC (rev 188571) @@ -0,0 +1,22 @@ +diff --git a/protocols/jabber/googletalk/libjingle/talk/session/phone/linphonemediaengine.cc b/protocols/jabber/googletalk/libjingle/talk/session/phone/linphonemediaengine.cc +index 88fdbd1..57c6c05 100644 +--- a/protocols/jabber/googletalk/libjingle/talk/session/phone/linphonemediaengine.cc ++++ b/protocols/jabber/googletalk/libjingle/talk/session/phone/linphonemediaengine.cc +@@ -200,7 +200,7 @@ bool LinphoneVoiceChannel::SetSendCodecs(const std::vector<AudioCodec>& codecs) + LOG(LS_INFO) << "Using " << i->name << "/" << i->clockrate; + pt_ = i->id; + audio_stream_ = audio_stream_start(&av_profile, -1, "localhost", port1, i->id, 250, 0); /* -1 means that function will choose some free port */ +- port2 = rtp_session_get_local_port(audio_stream_->session); ++ port2 = rtp_session_get_local_port(audio_stream_->ms.session); + first = false; + } + } +@@ -211,7 +211,7 @@ bool LinphoneVoiceChannel::SetSendCodecs(const std::vector<AudioCodec>& codecs) + // working with a buggy client; let's try PCMU. + LOG(LS_WARNING) << "Received empty list of codces; using PCMU/8000"; + audio_stream_ = audio_stream_start(&av_profile, -1, "localhost", port1, 0, 250, 0); /* -1 means that function will choose some free port */ +- port2 = rtp_session_get_local_port(audio_stream_->session); ++ port2 = rtp_session_get_local_port(audio_stream_->ms.session); + } + + return true;