Date: Wednesday, May 30, 2018 @ 20:46:32
Author: arojas
Revision: 325223
archrelease: copy trunk to extra-x86_64
Added:
telepathy-haze/repos/extra-x86_64/PKGBUILD
(from rev 325222, telepathy-haze/trunk/PKGBUILD)
telepathy-haze/repos/extra-x86_64/telepathy-haze-purple-2.0.12.patch
(from rev 325222, telepathy-haze/trunk/telepathy-haze-purple-2.0.12.patch)
telepathy-haze/repos/extra-x86_64/telepathy-haze.install
(from rev 325222, telepathy-haze/trunk/telepathy-haze.install)
Deleted:
telepathy-haze/repos/extra-x86_64/PKGBUILD
telepathy-haze/repos/extra-x86_64/telepathy-haze.install
------------------------------------+
PKGBUILD | 68 +++++++++++++++++++----------------
telepathy-haze-purple-2.0.12.patch | 25 ++++++++++++
telepathy-haze.install | 26 ++++++-------
3 files changed, 75 insertions(+), 44 deletions(-)
Deleted: PKGBUILD
===================================================================
--- PKGBUILD 2018-05-30 20:46:08 UTC (rev 325222)
+++ PKGBUILD 2018-05-30 20:46:32 UTC (rev 325223)
@@ -1,31 +0,0 @@
-# $Id$
-# Maintainer: Ionut Biru <ib...@archlinux.org>
-# Contributor: Timm Preetz <t...@preetz.us>
-pkgname=telepathy-haze
-pkgver=0.8.0
-pkgrel=1
-pkgdesc="A telepathy-backend to use libpurple (Pidgin) protocols."
-arch=('i686' 'x86_64')
-url="http://telepathy.freedesktop.org";
-license=('GPL')
-depends=('telepathy-glib' 'libpurple')
-makedepends=('libxslt' 'python2')
-replaces=('telepathy-butterfly')
-install=telepathy-haze.install
-groups=('telepathy')
-source=(https://telepathy.freedesktop.org/releases/$pkgname/$pkgname-$pkgver.tar.gz{,.asc})
-md5sums=('b9ee3638833fb50db6276d1b771820b0'
- 'SKIP')
-validpgpkeys=(DA98F25C0871C49A59EAFF2C4DE8FF2A63C7CC90) # Simon McVittie
<s...@pseudorandom.co.uk>
-
-build() {
- cd "$pkgname-$pkgver"
- PYTHON=/usr/bin/python2 ./configure --prefix=/usr \
- --libexecdir=/usr/lib/telepathy
- make
-}
-
-package(){
- cd "$pkgname-$pkgver"
- make DESTDIR="$pkgdir" install
-}
Copied: telepathy-haze/repos/extra-x86_64/PKGBUILD (from rev 325222,
telepathy-haze/trunk/PKGBUILD)
===================================================================
--- PKGBUILD (rev 0)
+++ PKGBUILD 2018-05-30 20:46:32 UTC (rev 325223)
@@ -0,0 +1,37 @@
+# $Id$
+# Maintainer: Antonio Rojas <aro...@archlinux.org>
+# Contributor: Ionut Biru <ib...@archlinux.org>
+# Contributor: Timm Preetz <t...@preetz.us>
+pkgname=telepathy-haze
+pkgver=0.8.0
+pkgrel=2
+pkgdesc="A telepathy-backend to use libpurple (Pidgin) protocols."
+arch=(x86_64)
+url="http://telepathy.freedesktop.org";
+license=(GPL)
+depends=(telepathy-glib libpurple)
+makedepends=(libxslt python2 python)
+install=telepathy-haze.install
+groups=(telepathy)
+source=(https://telepathy.freedesktop.org/releases/$pkgname/$pkgname-$pkgver.tar.gz{,.asc}
telepathy-haze-purple-2.0.12.patch)
+sha256sums=('3e76049c05f2cd5900c5c0c1cfebdf7ae79eec987a599f1090946673c5b8f9c9'
+ 'SKIP'
+ '6da40c6b854db1a7031d2e3838bfe0961e66e283f8ea57931ce0e57874d658b8')
+validpgpkeys=(DA98F25C0871C49A59EAFF2C4DE8FF2A63C7CC90) # Simon McVittie
<s...@pseudorandom.co.uk>
+
+prepare() {
+ cd $pkgname-$pkgver
+ patch -p1 -i ../telepathy-haze-purple-2.0.12.patch # Fix build with
libpurple 2.0.12
+}
+
+build() {
+ cd $pkgname-$pkgver
+ PYTHON=python2 ./configure --prefix=/usr \
+ --libexecdir=/usr/lib/telepathy
+ make
+}
+
+package() {
+ cd $pkgname-$pkgver
+ make DESTDIR="$pkgdir" install
+}
Copied: telepathy-haze/repos/extra-x86_64/telepathy-haze-purple-2.0.12.patch
(from rev 325222, telepathy-haze/trunk/telepathy-haze-purple-2.0.12.patch)
===================================================================
--- telepathy-haze-purple-2.0.12.patch (rev 0)
+++ telepathy-haze-purple-2.0.12.patch 2018-05-30 20:46:32 UTC (rev 325223)
@@ -0,0 +1,25 @@
+From: Koop Mast <kwm freebsd org>
+Date: Mon, 11 Jan 2016 11:53:23 +0100
+Subject: Fix the build with libpurple 2.0.12
+
+http://pidgin.im/pipermail/devel/2015-March/023639.html
+Replaces the old emu with the _PASSIVE.
+
+Origin: vendor, FreeBSD,
https://lists.freebsd.org/pipermail/svn-ports-head/2016-January/111612.html
+---
+ src/media-stream.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/media-stream.c b/src/media-stream.c
+index 7b4f29f..da088d1 100644
+--- a/src/media-stream.c
++++ b/src/media-stream.c
+@@ -1076,7 +1076,7 @@ haze_media_stream_new_native_candidate
(TpSvcMediaStreamHandler *iface,
+ if (proto == TP_MEDIA_STREAM_BASE_PROTO_UDP)
+ protocol = PURPLE_MEDIA_NETWORK_PROTOCOL_UDP;
+ else if (proto == TP_MEDIA_STREAM_BASE_PROTO_TCP)
+- protocol = PURPLE_MEDIA_NETWORK_PROTOCOL_TCP;
++ protocol = PURPLE_MEDIA_NETWORK_PROTOCOL_TCP_PASSIVE;
+ else
+ DEBUG ("Unknown network protocol");
+
Deleted: telepathy-haze.install
===================================================================
--- telepathy-haze.install 2018-05-30 20:46:08 UTC (rev 325222)
+++ telepathy-haze.install 2018-05-30 20:46:32 UTC (rev 325223)
@@ -1,13 +0,0 @@
-post_install() {
- killall -HUP dbus-daemon 2>&1
-}
-
-post_upgrade() {
- post_install $1
-}
-
-post_remove() {
- post_install $1
-}
-
-# vim:set ts=2 sw=2 et:
Copied: telepathy-haze/repos/extra-x86_64/telepathy-haze.install (from rev
325222, telepathy-haze/trunk/telepathy-haze.install)
===================================================================
--- telepathy-haze.install (rev 0)
+++ telepathy-haze.install 2018-05-30 20:46:32 UTC (rev 325223)
@@ -0,0 +1,13 @@
+post_install() {
+ killall -HUP dbus-daemon 2>&1
+}
+
+post_upgrade() {
+ post_install $1
+}
+
+post_remove() {
+ post_install $1
+}
+
+# vim:set ts=2 sw=2 et:
