summaryrefslogtreecommitdiff
path: root/nonprism
diff options
context:
space:
mode:
Diffstat (limited to 'nonprism')
-rw-r--r--nonprism/kdenetwork-kopete/PKGBUILD13
-rw-r--r--nonprism/kdenetwork-kopete/kdenetwork-kopete.install12
-rw-r--r--nonprism/kdenetwork-kopete/kdenetwork.install11
-rw-r--r--nonprism/kdenetwork-kopete/mediastreamer-2.11.patch166
4 files changed, 6 insertions, 196 deletions
diff --git a/nonprism/kdenetwork-kopete/PKGBUILD b/nonprism/kdenetwork-kopete/PKGBUILD
index 183464e7f..04d5a2be0 100644
--- a/nonprism/kdenetwork-kopete/PKGBUILD
+++ b/nonprism/kdenetwork-kopete/PKGBUILD
@@ -1,14 +1,14 @@
-# $Id: PKGBUILD 265157 2016-04-19 07:23:59Z arojas $
+# $Id: PKGBUILD 266422 2016-04-28 07:59:01Z fyan $
# Maintainer (Arch): Felix Yan <felixonmars@archlinux.org>
# Contributor (Arch): Andrea Scarpino <andrea@archlinux.org>
# Maintainer: André Silva <emulatorman@parabola.nu>
pkgname=kdenetwork-kopete
pkgver=16.04.0
-pkgrel=1.parabola1.nonprism1
+pkgrel=2.parabola1.nonprism1
pkgdesc='Instant Messenger, without nonfree Skype support and support for unsafe and dangerous for privacy protocols'
url='http://kde.org/applications/internet/kopete/'
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'armv7h')
license=('GPL' 'LGPL' 'FDL')
groups=('kde-applications' 'kdenetwork')
replaces=(${pkgname}-libre ${pkgname}-libre-nonprism)
@@ -16,14 +16,13 @@ conflicts=(${pkgname}-libre ${pkgname}-libre-nonprism)
depends=('kdebase-runtime' 'libotr' 'qimageblitz' 'jsoncpp')
makedepends=('cmake' 'automoc4' 'boost' 'mediastreamer')
optdepends=('mediastreamer: jingle support')
-install=${pkgname}.install
source=("http://download.kde.org/stable/applications/${pkgver}/src/kopete-${pkgver}.tar.xz"
'libre-nonprism.patch')
sha1sums=('929f6b9a4891097c5f08d0cc3d51ba87bd5253a4'
'f0d7b727da1b5160f05952eec4df1bfbefab99cf')
prepare() {
- cd kopete-${pkgver}
+ cd kopete-$pkgver
# Based on http://bzr.trisquel.info/package-helpers/trunk/annotate/head%3A/helpers/natty/make-kdenetwork, revision 34.
rm -rv protocols/skype
# remove unsafe/dangerous services
@@ -41,7 +40,7 @@ prepare() {
build() {
cd build
- cmake ../kopete-${pkgver} \
+ cmake ../kopete-$pkgver \
-DCMAKE_BUILD_TYPE=Release \
-DKDE4_BUILD_TESTS=OFF \
-DCMAKE_INSTALL_PREFIX=/usr \
@@ -63,5 +62,5 @@ build() {
package() {
cd build
- make DESTDIR=$pkgdir install
+ make DESTDIR="$pkgdir" install
}
diff --git a/nonprism/kdenetwork-kopete/kdenetwork-kopete.install b/nonprism/kdenetwork-kopete/kdenetwork-kopete.install
deleted file mode 100644
index 5495fb1b5..000000000
--- a/nonprism/kdenetwork-kopete/kdenetwork-kopete.install
+++ /dev/null
@@ -1,12 +0,0 @@
-post_install() {
- xdg-icon-resource forceupdate --theme hicolor &> /dev/null
- update-desktop-database -q
-}
-
-post_upgrade() {
- post_install
-}
-
-post_remove() {
- post_install
-}
diff --git a/nonprism/kdenetwork-kopete/kdenetwork.install b/nonprism/kdenetwork-kopete/kdenetwork.install
deleted file mode 100644
index e70c054ec..000000000
--- a/nonprism/kdenetwork-kopete/kdenetwork.install
+++ /dev/null
@@ -1,11 +0,0 @@
-post_install() {
- xdg-icon-resource forceupdate --theme hicolor &> /dev/null
-}
-
-post_upgrade() {
- post_install
-}
-
-post_remove() {
- post_install
-}
diff --git a/nonprism/kdenetwork-kopete/mediastreamer-2.11.patch b/nonprism/kdenetwork-kopete/mediastreamer-2.11.patch
deleted file mode 100644
index 6fd7809e5..000000000
--- a/nonprism/kdenetwork-kopete/mediastreamer-2.11.patch
+++ /dev/null
@@ -1,166 +0,0 @@
-From 7624830d2ec11d2f3645a27384ae9ced7ac7a258 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Pali=20Roh=C3=A1r?= <pali.rohar@gmail.com>
-Date: Sun, 15 Mar 2015 14:00:40 +0100
-Subject: [PATCH] Fix libjingle compilation with mediastreamer >= 2.11
-
-BUG: 345162
-FIXED-IN: 15.04
----
- cmake/modules/FindMediastreamer.cmake | 11 +++--
- protocols/jabber/libjingle/CMakeLists.txt | 10 +++--
- .../libjingle/patches/08_mediastreamer_2_11.patch | 47 ++++++++++++++++++++
- .../talk/session/phone/linphonemediaengine.cc | 22 ++++-----
- 4 files changed, 74 insertions(+), 16 deletions(-)
- create mode 100644 protocols/jabber/libjingle/patches/08_mediastreamer_2_11.patch
-
-diff --git a/cmake/modules/FindMediastreamer.cmake b/cmake/modules/FindMediastreamer.cmake
-index 929b1ee..47fe5c3 100644
---- a/cmake/modules/FindMediastreamer.cmake
-+++ b/cmake/modules/FindMediastreamer.cmake
-@@ -22,9 +22,14 @@ IF (MEDIASTREAMER_FOUND)
- IF (NOT MEDIASTREAMER_FIND_QUIETLY)
- MESSAGE(STATUS "Found Mediastreamer: ${MEDIASTREAMER_LIBRARIES} (version: ${MEDIASTREAMER_VERSION})")
- IF (MEDIASTREAMER_VERSION VERSION_LESS 2.9)
-- SET(MEDIASTREAMER_OLD TRUE)
-+ SET(MEDIASTREAMER_LESS_2_9 TRUE)
-+ SET(MEDIASTREAMER_LESS_2_11 TRUE)
-+ ELSEIF (MEDIASTREAMER_VERSION VERSION_LESS 2.11)
-+ SET(MEDIASTREAMER_LESS_2_9 FALSE)
-+ SET(MEDIASTREAMER_LESS_2_11 TRUE)
- ELSE (MEDIASTREAMER_VERSION VERSION_LESS 2.9)
-- SET(MEDIASTREAMER_OLD FALSE)
-+ SET(MEDIASTREAMER_LESS_2_9 FALSE)
-+ SET(MEDIASTREAMER_LESS_2_11 FALSE)
- ENDIF (MEDIASTREAMER_VERSION VERSION_LESS 2.9)
- ENDIF (NOT MEDIASTREAMER_FIND_QUIETLY)
- ELSE (MEDIASTREAMER_FOUND)
-@@ -33,4 +38,4 @@ ELSE (MEDIASTREAMER_FOUND)
- ENDIF (MEDIASTREAMER_FIND_REQUIRED)
- ENDIF (MEDIASTREAMER_FOUND)
-
--MARK_AS_ADVANCED(MEDIASTREAMER_INCLUDE_DIR MEDIASTREAMER_LIBRARIES MEDIASTREAMER_OLD)
-+MARK_AS_ADVANCED(MEDIASTREAMER_INCLUDE_DIR MEDIASTREAMER_LIBRARIES MEDIASTREAMER_LESS_2_9 MEDIASTREAMER_LESS_2_11)
-diff --git a/protocols/jabber/libjingle/CMakeLists.txt b/protocols/jabber/libjingle/CMakeLists.txt
-index 6db3da3..4b4b620 100644
---- a/protocols/jabber/libjingle/CMakeLists.txt
-+++ b/protocols/jabber/libjingle/CMakeLists.txt
-@@ -28,9 +28,13 @@ if ( NOT WIN32 )
- endif ( NOT APPLE )
- endif ( NOT WIN32 )
-
--if ( MEDIASTREAMER_OLD )
-- add_definitions ( -DMEDIASTREAMER_OLD )
--endif ( MEDIASTREAMER_OLD )
-+if ( MEDIASTREAMER_LESS_2_9 )
-+ add_definitions ( -DMEDIASTREAMER_LESS_2_9 )
-+endif ( MEDIASTREAMER_LESS_2_9 )
-+
-+if ( MEDIASTREAMER_LESS_2_11 )
-+ add_definitions ( -DMEDIASTREAMER_LESS_2_11 )
-+endif ( MEDIASTREAMER_LESS_2_11 )
-
- if ( CMAKE_BUILD_TYPE STREQUAL "Debug" )
- add_definitions ( -D_DEBUG )
-diff --git a/protocols/jabber/libjingle/patches/08_mediastreamer_2_11.patch b/protocols/jabber/libjingle/patches/08_mediastreamer_2_11.patch
-new file mode 100644
-index 0000000..5eef985
---- /dev/null
-+++ b/protocols/jabber/libjingle/patches/08_mediastreamer_2_11.patch
-@@ -0,0 +1,47 @@
-+diff --git a/protocols/jabber/libjingle/talk/session/phone/linphonemediaengine.cc b/protocols/jabber/libjingle/talk/session/phone/linphonemediaengine.cc
-+index 6da35e0..e337dd4 100644
-+--- a/protocols/jabber/libjingle/talk/session/phone/linphonemediaengine.cc
-++++ b/protocols/jabber/libjingle/talk/session/phone/linphonemediaengine.cc
-+@@ -171,6 +171,16 @@ bool LinphoneVoiceChannel::SetPlayout(bool playout) {
-+ return true;
-+ }
-+
-++#ifdef MEDIASTREAMER_LESS_2_11
-++static inline RtpSession * audio_stream_get_rtp_session(const AudioStream *stream) {
-++#ifdef MEDIASTREAMER_LESS_2_9
-++ return stream->session;
-++#else
-++ return stream->ms.session;
-++#endif
-++}
-++#endif
-++
-+ bool LinphoneVoiceChannel::SetSendCodecs(const std::vector<AudioCodec>& codecs) {
-+
-+ bool first = true;
-+@@ -200,11 +210,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 */
-+-#ifdef MEDIASTREAMER_OLD
-+- port2 = rtp_session_get_local_port(audio_stream_->session);
-+-#else
-+- port2 = rtp_session_get_local_port(audio_stream_->ms.session);
-+-#endif
-++ port2 = rtp_session_get_local_port(audio_stream_get_rtp_session(audio_stream_));
-+ first = false;
-+ }
-+ }
-+@@ -215,11 +221,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 */
-+-#ifdef MEDIASTREAMER_OLD
-+- port2 = rtp_session_get_local_port(audio_stream_->session);
-+-#else
-+- port2 = rtp_session_get_local_port(audio_stream_->ms.session);
-+-#endif
-++ port2 = rtp_session_get_local_port(audio_stream_get_rtp_session(audio_stream_));
-+ }
-+
-+ return true;
-diff --git a/protocols/jabber/libjingle/talk/session/phone/linphonemediaengine.cc b/protocols/jabber/libjingle/talk/session/phone/linphonemediaengine.cc
-index 6da35e0..e337dd4 100644
---- a/protocols/jabber/libjingle/talk/session/phone/linphonemediaengine.cc
-+++ b/protocols/jabber/libjingle/talk/session/phone/linphonemediaengine.cc
-@@ -171,6 +171,16 @@ bool LinphoneVoiceChannel::SetPlayout(bool playout) {
- return true;
- }
-
-+#ifdef MEDIASTREAMER_LESS_2_11
-+static inline RtpSession * audio_stream_get_rtp_session(const AudioStream *stream) {
-+#ifdef MEDIASTREAMER_LESS_2_9
-+ return stream->session;
-+#else
-+ return stream->ms.session;
-+#endif
-+}
-+#endif
-+
- bool LinphoneVoiceChannel::SetSendCodecs(const std::vector<AudioCodec>& codecs) {
-
- bool first = true;
-@@ -200,11 +210,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 */
--#ifdef MEDIASTREAMER_OLD
-- port2 = rtp_session_get_local_port(audio_stream_->session);
--#else
-- port2 = rtp_session_get_local_port(audio_stream_->ms.session);
--#endif
-+ port2 = rtp_session_get_local_port(audio_stream_get_rtp_session(audio_stream_));
- first = false;
- }
- }
-@@ -215,11 +221,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 */
--#ifdef MEDIASTREAMER_OLD
-- port2 = rtp_session_get_local_port(audio_stream_->session);
--#else
-- port2 = rtp_session_get_local_port(audio_stream_->ms.session);
--#endif
-+ port2 = rtp_session_get_local_port(audio_stream_get_rtp_session(audio_stream_));
- }
-
- return true;
---
-1.7.9.5
-
generated by cgit v1.2.3-2-g168b (git 2.25.1) at 2024-11-18 16:00:51 +0000