diff options
Diffstat (limited to 'gnome-unstable')
24 files changed, 637 insertions, 63 deletions
diff --git a/gnome-unstable/evince/PKGBUILD b/gnome-unstable/evince/PKGBUILD index 64b05f036..d1de9f3b0 100644 --- a/gnome-unstable/evince/PKGBUILD +++ b/gnome-unstable/evince/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 153796 2012-03-19 18:26:38Z ibiru $ +# $Id: PKGBUILD 154384 2012-03-27 11:56:28Z heftig $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgname=evince -pkgver=3.3.92 +pkgver=3.4.0 pkgrel=1 pkgdesc="Simply a document viewer" url="http://projects.gnome.org/evince/" @@ -15,7 +15,7 @@ groups=('gnome-extra') install=evince.install options=('!libtool' '!emptydirs') source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz) -sha256sums=('06b0511fde4d462fcb8276ee7a7ee858eeedc026704feba86e90e085f1360e00') +sha256sums=('02f1c74c123ea0cb4c1a98cb9ba2b67d724e9f90d7ff15acbcd6b8dbeef0a129') build() { cd "$pkgname-$pkgver" diff --git a/gnome-unstable/evolution-data-server/PKGBUILD b/gnome-unstable/evolution-data-server/PKGBUILD index 1e39bca6f..735cbbbc0 100644 --- a/gnome-unstable/evolution-data-server/PKGBUILD +++ b/gnome-unstable/evolution-data-server/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 153757 2012-03-19 15:42:30Z ibiru $ +# $Id: PKGBUILD 154366 2012-03-27 11:34:53Z heftig $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgname=evolution-data-server -pkgver=3.3.92 +pkgver=3.4.0 pkgrel=1 pkgdesc="Centralized access to appointments and contacts" arch=('i686' 'x86_64') @@ -13,7 +13,7 @@ install=$pkgname.install url="http://www.gnome.org" license=('GPL') source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz) -sha256sums=('a5cc6324899ecc936171ceb07ef678d341089615e6e600584baefbdd63e35a7d') +sha256sums=('7132aee89b73187155c8afec43b9b3cc5c97098a488aad3872f7fedd0552a6ac') build() { cd "$pkgname-$pkgver" diff --git a/gnome-unstable/evolution-ews/PKGBUILD b/gnome-unstable/evolution-ews/PKGBUILD new file mode 100644 index 000000000..63b730d33 --- /dev/null +++ b/gnome-unstable/evolution-ews/PKGBUILD @@ -0,0 +1,27 @@ +# $Id: PKGBUILD 154373 2012-03-27 11:38:10Z heftig $ +# Maintainer: Ionut Biru <ibiru@archlinux.org> + +pkgname=evolution-ews +pkgver=3.4.0 +pkgrel=1 +pkgdesc="MS Exchange integration through Exchange Web Services" +arch=('i686' 'x86_64') +license=('LGPL2.1') +url="http://www.gnome.org" +depends=('evolution-data-server' 'gtkhtml4' 'gnome-desktop') +makedepends=('intltool' 'evolution') +options=('!libtool' '!emptydirs') +source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz) +sha256sums=('2bc20f65fc645f0a76d218d483650f9c9cc75ce3104ad849af6e7eec2d5a7f72') + +build() { + cd $pkgname-$pkgver + ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \ + --libexecdir=/usr/lib/evolution --disable-static + make +} + +package() { + cd $pkgname-$pkgver + make DESTDIR="$pkgdir" install +} diff --git a/gnome-unstable/evolution-exchange/PKGBUILD b/gnome-unstable/evolution-exchange/PKGBUILD new file mode 100644 index 000000000..414a126ac --- /dev/null +++ b/gnome-unstable/evolution-exchange/PKGBUILD @@ -0,0 +1,33 @@ +# $Id: PKGBUILD 154369 2012-03-27 11:36:53Z heftig $ +# Maintainer: Jan de Groot <jgc@archlinux.org> + +pkgname=evolution-exchange +pkgver=3.4.0 +pkgrel=1 +pkgdesc="Ximian Connector Exchange plugin for Evolution" +arch=('i686' 'x86_64') +license=('GPL') +url="http://www.ximian.com" +depends=('evolution-data-server' 'gtkhtml4' 'gnome-desktop') +makedepends=('intltool' 'evolution') +options=('!libtool' '!emptydirs') +install=evolution-exchange.install +source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz) +sha256sums=('7bfdf2fb44e691e7eb611aa0d1129cbacf43f7a2477fdae87f06368eecc89fb4') + +build() { + cd $pkgname-$pkgver + ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \ + --libexecdir=/usr/lib/evolution --disable-static \ + --with-libdb=/usr --with-krb5=/usr + make +} + +package() { + cd $pkgname-$pkgver + make DESTDIR="$pkgdir" install + + install -m755 -d "$pkgdir/usr/share/gconf/schemas" + gconf-merge-schema "$pkgdir/usr/share/gconf/schemas/$pkgname.schemas" --domain evolution-exchange-3.2 "$pkgdir"/etc/gconf/schemas/*.schemas + rm -f $pkgdir/etc/gconf/schemas/*.schemas +} diff --git a/gnome-unstable/evolution-exchange/evolution-exchange.install b/gnome-unstable/evolution-exchange/evolution-exchange.install new file mode 100644 index 000000000..1179887f9 --- /dev/null +++ b/gnome-unstable/evolution-exchange/evolution-exchange.install @@ -0,0 +1,17 @@ +pkgname=evolution-exchange + +post_install() { + usr/sbin/gconfpkg --install ${pkgname} +} + +pre_upgrade() { + pre_remove $1 +} + +post_upgrade() { + post_install $1 +} + +pre_remove() { + usr/sbin/gconfpkg --uninstall ${pkgname} +} diff --git a/gnome-unstable/evolution-groupwise/PKGBUILD b/gnome-unstable/evolution-groupwise/PKGBUILD new file mode 100644 index 000000000..7841c3f88 --- /dev/null +++ b/gnome-unstable/evolution-groupwise/PKGBUILD @@ -0,0 +1,32 @@ +# $Id: PKGBUILD 154370 2012-03-27 11:37:28Z heftig $ +# Maintainer : Ionut Biru <ibiru@archlinux.org> +# Contributor: György Balló <ballogy@freestart.hu> + +pkgname=evolution-groupwise +pkgver=3.4.0 +pkgrel=1 +pkgdesc="GroupWise connector for evolution" +arch=(i686 x86_64) +url="http://projects.gnome.org/evolution/" +license=(LGPL) +depends=('evolution-data-server' 'gtkhtml4') +makedepends=(intltool evolution) +optdepends=('evolution: evolution plugin') +options=(!libtool) +source=(http://ftp.gnome.org/pub/GNOME/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz) +sha256sums=('b5e882811d10411249accb4ce1131d2e2d336d357b68a8f5dcfe7576b320c717') + +build() { + cd $pkgname-$pkgver + + ./configure --prefix=/usr --sysconfdir=/etc \ + --localstatedir=/var --disable-static + make +} + +package() { + cd $pkgname-$pkgver + + make DESTDIR="$pkgdir" install +} + diff --git a/gnome-unstable/evolution/PKGBUILD b/gnome-unstable/evolution/PKGBUILD index d68c09fee..3e62ed88f 100644 --- a/gnome-unstable/evolution/PKGBUILD +++ b/gnome-unstable/evolution/PKGBUILD @@ -1,15 +1,15 @@ -# $Id: PKGBUILD 153788 2012-03-19 17:50:23Z ibiru $ +# $Id: PKGBUILD 154367 2012-03-27 11:36:06Z heftig $ # Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com> # Contributor: Jan de Groot <jgc@archlinux.org> pkgname=evolution -pkgver=3.3.92 +pkgver=3.4.0 pkgrel=1 pkgdesc="Manage your email, contacts and schedule" arch=('i686' 'x86_64') license=('GPL') depends=('gnome-desktop' 'evolution-data-server' 'gtkhtml4' 'libcanberra' 'gstreamer0.10' 'libpst' 'libytnef' 'desktop-file-utils' 'hicolor-icon-theme' 'dconf') -makedepends=('intltool' 'gnome-doc-utils' 'networkmanager') +makedepends=('intltool' 'gnome-doc-utils' 'networkmanager' 'gnome-common' 'gtk-doc') optdepends=('bogofilter: possible junk filter plugin' 'spamassassin: possible junk filter plugin') groups=('gnome-extra') @@ -17,10 +17,14 @@ options=('!libtool' '!emptydirs') install=evolution.install url=http://www.gnome.org/projects/evolution/ source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz) -sha256sums=('5932bd6d9c37657dde1ef3350341760c07a7c3022a4c24e7f533dbcd587bc33d') +sha256sums=('e7d0eecaa1ee33c15e327b724f2bd7017ea6c732ac764189f0ba2a5ba20bd8e4') build() { cd $pkgname-$pkgver + + # Fixed past 3.4.0 + USE_GNOME2_MACROS=1 gnome-autogen.sh + ./configure --prefix=/usr --sysconfdir=/etc \ --localstatedir=/var \ --libexecdir=/usr/lib \ diff --git a/gnome-unstable/farstream/PKGBUILD b/gnome-unstable/farstream/PKGBUILD index dfb5bddc3..da3042e7f 100644 --- a/gnome-unstable/farstream/PKGBUILD +++ b/gnome-unstable/farstream/PKGBUILD @@ -1,23 +1,26 @@ -# $Id: PKGBUILD 152819 2012-03-09 18:01:22Z ibiru $ +# $Id: PKGBUILD 154395 2012-03-27 14:04:54Z ibiru $ # Maintainer: Ionut Biru <ibiru@archlinux.org> pkgname=farstream -pkgver=0.1.1 +pkgver=0.1.2 pkgrel=1 pkgdesc="Farstream (formerly Farsight) - Audio/Video Communications Framework" arch=(i686 x86_64) url="http://www.freedesktop.org/wiki/Software/Farstream" license=('LGPL2.1') -depends=('libnice' 'gstreamer0.10-base' 'gstreamer0.10-bad' 'gstreamer0.10-good') +depends=('libnice' 'gstreamer0.10-base' 'gstreamer0.10-bad-plugins' 'gstreamer0.10-good' 'gstreamer0.10-ffmpeg') makedepends=('gobject-introspection' 'gstreamer0.10-python' 'python2-gobject2') conflicts=('farsight2') replaces=('farsight2') options=(!libtool) -source=(http://freedesktop.org/software/$pkgname/releases/$pkgname/$pkgname-$pkgver.tar.gz) -md5sums=('74f8048c915e8f4675cb749bc10f54e9') +source=(http://freedesktop.org/software/$pkgname/releases/$pkgname/$pkgname-$pkgver.tar.gz + vp8.patch) +md5sums=('5d6e561b3688d0d0c8906fec4f356df3' + 'c4e76d03d678d29b872b610f9cff42cd') build() { cd "$pkgname-$pkgver" + patch -Np1 -i "$srcdir/vp8.patch" ./configure --prefix=/usr \ --with-package-name='Arch Linux farstream package' \ --with-package-origin='http://archlinux.org' \ diff --git a/gnome-unstable/farstream/vp8.patch b/gnome-unstable/farstream/vp8.patch new file mode 100644 index 000000000..67009a8ad --- /dev/null +++ b/gnome-unstable/farstream/vp8.patch @@ -0,0 +1,12 @@ +diff -urNp farstream-0.1.1.orig/gst/fsrtpconference/default-codec-preferences farstream-0.1.1/gst/fsrtpconference/default-codec-preferences +--- farstream-0.1.1.orig/gst/fsrtpconference/default-codec-preferences 2012-03-20 12:12:22.644324485 +0100 ++++ farstream-0.1.1/gst/fsrtpconference/default-codec-preferences 2012-03-21 09:32:04.468634455 +0100 +@@ -41,6 +41,8 @@ feedback:nack/pli= + [video/H263] + feedback:nack/pli= + ++[video/VP8-DRAFT-IETF-01] ++ + [video/THEORA] + #feedback:tfrc= + feedback:nack/pli= diff --git a/gnome-unstable/gnome-desktop/PKGBUILD b/gnome-unstable/gnome-desktop/PKGBUILD index af539eef9..df10b5539 100644 --- a/gnome-unstable/gnome-desktop/PKGBUILD +++ b/gnome-unstable/gnome-desktop/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 153782 2012-03-19 17:15:54Z ibiru $ +# $Id: PKGBUILD 154383 2012-03-27 11:54:51Z heftig $ # Maintainer: Jan de Groot <jan@archlinux.org> pkgname=gnome-desktop -pkgver=3.3.92 +pkgver=3.4.0 pkgrel=1 epoch=1 pkgdesc="Library with common API for various GNOME modules" @@ -14,14 +14,13 @@ url="http://www.gnome.org" groups=('gnome') options=('!libtool') source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz) -sha256sums=('278fe94a9ec8391956bab35be93e365e25c919773dcb033b37fadadc202c02de') +sha256sums=('8b162ca977075c1dd806feef24e9db7ee0cbe42c0ef8d3fbc386265dcea2b08c') build() { cd "$pkgname-$pkgver" ./configure --prefix=/usr --sysconfdir=/etc \ --localstatedir=/var --disable-static \ - --with-gnome-distributor="Arch Linux" \ - --disable-scrollkeeper + --with-gnome-distributor="Arch Linux" make } diff --git a/gnome-unstable/gnome-menus/PKGBUILD b/gnome-unstable/gnome-menus/PKGBUILD index 02778780c..cd7abc27d 100644 --- a/gnome-unstable/gnome-menus/PKGBUILD +++ b/gnome-unstable/gnome-menus/PKGBUILD @@ -1,19 +1,19 @@ -# $Id: PKGBUILD 152847 2012-03-09 21:34:34Z ibiru $ +# $Id: PKGBUILD 154375 2012-03-27 11:39:53Z heftig $ # Maintainer: Jan de Groot <jan@archlinux.org> pkgname=gnome-menus -pkgver=3.3.5 +pkgver=3.4.0 pkgrel=1 pkgdesc="GNOME menu specifications" arch=('i686' 'x86_64') -depends=('glib2' 'python2') +depends=('glib2' 'python2-gobject') makedepends=('intltool' 'gobject-introspection') options=('!libtool') license=('GPL' 'LGPL') url="http://www.gnome.org" source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz menus.patch) -sha256sums=('92f640bdb96dacbfcbf183bac1657cc52dd2ddf866b4b33504d01719dbd951d5' +sha256sums=('199ce6bce3e24cbab8aed7f3488e7557a8f365314eae354aa2b50727b2f11f86' 'df2779777906b038fa911dc745534564ede9524a64ab368e2f6f8e38d54e7acc') build() { diff --git a/gnome-unstable/gnome-panel/PKGBUILD b/gnome-unstable/gnome-panel/PKGBUILD index cdda80666..e02ba0f71 100644 --- a/gnome-unstable/gnome-panel/PKGBUILD +++ b/gnome-unstable/gnome-panel/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 153800 2012-03-19 18:36:53Z ibiru $ +# $Id: PKGBUILD 154382 2012-03-27 11:53:30Z heftig $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgname=gnome-panel -pkgver=3.3.92 +pkgver=3.4.0 pkgrel=1 arch=('i686' 'x86_64') license=('GPL') @@ -14,7 +14,7 @@ install=gnome-panel.install groups=('gnome') options=('!libtool' '!emptydirs') source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz) -sha256sums=('f67a08540592b8d685163f4468fffa1440508f2f3214ae401466ae93bc7253bd') +sha256sums=('70020645ecac8f54164454e6d413b62183d58372a8d10d2b072fee69eb11fd91') build() { cd "$pkgname-$pkgver" diff --git a/gnome-unstable/gtkhtml4/PKGBUILD b/gnome-unstable/gtkhtml4/PKGBUILD index f46d46aa9..67f5f4c9e 100644 --- a/gnome-unstable/gtkhtml4/PKGBUILD +++ b/gnome-unstable/gtkhtml4/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 153772 2012-03-19 16:41:21Z ibiru $ +# $Id: PKGBUILD 154376 2012-03-27 11:40:53Z heftig $ # Maintainer: Ionut Biru <ibiru@archlinux.org> pkgname=gtkhtml4 _pkgbasename=gtkhtml -pkgver=4.3.92 +pkgver=4.4.0 pkgrel=1 pkgdesc="A lightweight HTML renderer/editor widget for GTK3" arch=(i686 x86_64) @@ -13,7 +13,7 @@ makedepends=('intltool') url="http://www.gnome.org" options=('!libtool') source=(http://ftp.gnome.org/pub/gnome/sources/$_pkgbasename/${pkgver%.*}/$_pkgbasename-$pkgver.tar.xz) -sha256sums=('6fc252ea63d0be400630f588cee1820e501ac9661df97ef173e83945befcaaa1') +sha256sums=('9c07260cd5d20c6dfba42fe1e784fffc98af3a82ff5b7d05be3174d6b0bffe9d') build() { cd "$_pkgbasename-$pkgver" diff --git a/gnome-unstable/libgnomekbd/PKGBUILD b/gnome-unstable/libgnomekbd/PKGBUILD index c2941612c..ccb2415ba 100644 --- a/gnome-unstable/libgnomekbd/PKGBUILD +++ b/gnome-unstable/libgnomekbd/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 154338 2012-03-26 13:06:03Z heftig $ +# $Id: PKGBUILD 154358 2012-03-27 10:44:52Z heftig $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgname=libgnomekbd -pkgver=3.4.0.1 +pkgver=3.4.0.2 pkgrel=1 pkgdesc="Gnome keyboard library" url="http://gswitchit.sourceforge.net" @@ -13,7 +13,7 @@ makedepends=('intltool' 'gobject-introspection') options=('!libtool' '!emptydirs') install=libgnomekbd.install source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/${pkgver:0:3}/$pkgname-$pkgver.tar.xz) -sha256sums=('d2e4af0f4b81656f816e491a23165a6ed7695c0e09202fd1dcffd9c27c8e4af1') +sha256sums=('6e6c8956adbd39f1c3a8ec5c77bcf7ffbdaa54320398015d1174cd5003664e39') build() { cd "$pkgname-$pkgver" diff --git a/gnome-unstable/libwacom/PKGBUILD b/gnome-unstable/libwacom/PKGBUILD index d93a77598..81f45b294 100644 --- a/gnome-unstable/libwacom/PKGBUILD +++ b/gnome-unstable/libwacom/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 152826 2012-03-09 18:41:43Z heftig $ +# $Id: PKGBUILD 154378 2012-03-27 11:41:33Z heftig $ # Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com> pkgname=libwacom -pkgver=0.3 +pkgver=0.4 pkgrel=1 pkgdesc="Library to identify Wacom tablets and their features" arch=('x86_64' 'i686') @@ -11,7 +11,7 @@ license=('LGPL') options=('!libtool') source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver:0:3}/$pkgname-$pkgver.tar.xz) url="http://www.gnome.org" -sha256sums=('b24494b4ed524e8665d94372a6d57afa153e8d8e893cb882907ec462c35e3eac') +sha256sums=('13a7989572126b7f9013f8289b7e59707e23690fbd5eaa7f033b88245fa12367') build() { cd $pkgname-$pkgver diff --git a/gnome-unstable/libwnck3/PKGBUILD b/gnome-unstable/libwnck3/PKGBUILD index d89a87b43..b350c8943 100644 --- a/gnome-unstable/libwnck3/PKGBUILD +++ b/gnome-unstable/libwnck3/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 152758 2012-03-09 15:06:07Z ibiru $ +# $Id: PKGBUILD 154377 2012-03-27 11:40:55Z heftig $ # Maintainer: Ionut Biru <ibiru@archlinux.org> pkgname=libwnck3 _pkgbasename=libwnck -pkgver=3.3.5 +pkgver=3.4.0 pkgrel=1 pkgdesc="Window Navigator Construction Kit (GTK+3)" arch=('i686' 'x86_64') @@ -13,7 +13,7 @@ makedepends=('intltool' 'gobject-introspection') options=('!libtool') url="http://www.gnome.org/" source=(http://ftp.gnome.org/pub/gnome/sources/$_pkgbasename/${pkgver%.*}/$_pkgbasename-$pkgver.tar.xz) -sha256sums=('440340d4733f78130d581e88131df178367458004558c6a32f7c5f63a731ba19') +sha256sums=('34a97edf601ee066204bb640b23f58d6897e0f559ce1816b3c1d206d70ea62ad') build() { cd "$_pkgbasename-$pkgver" diff --git a/gnome-unstable/network-manager-applet/PKGBUILD b/gnome-unstable/network-manager-applet/PKGBUILD index 1b4536e3f..4e302ad76 100644 --- a/gnome-unstable/network-manager-applet/PKGBUILD +++ b/gnome-unstable/network-manager-applet/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 153809 2012-03-19 18:59:29Z heftig $ +# $Id: PKGBUILD 154352 2012-03-27 10:39:59Z heftig $ # Maintainer: Jan de Groot <jgc@archlinux.org> # Contributor: Arjan Timmerman <arjan@archlinux.org> # Contributor: Wael Nasreddine <gandalf@siemens-mobiles.org> @@ -6,7 +6,7 @@ # Contributor: Will Rea <sillywilly@gmail.com> pkgname=network-manager-applet -pkgver=0.9.3.997 +pkgver=0.9.4.1 pkgrel=1 pkgdesc="GNOME frontends to NetWorkmanager" arch=('i686' 'x86_64') @@ -19,7 +19,7 @@ optdepends=('gnome-bluetooth: for PAN/DUN support') options=('!libtool' '!emptydirs') install=network-manager-applet.install source=(http://ftp.gnome.org/pub/GNOME/sources/$pkgname/0.9/$pkgname-$pkgver.tar.xz) -sha256sums=('076c6bd3499a36de78d801f255126729267bc19d708a68766c1da7babf529a7b') +sha256sums=('b6b6de75e28d1fbcdfdbb51c0e40fcd6bc0ec0385bfecd16c457260491cd2ff7') build() { cd ${pkgname}-${pkgver} diff --git a/gnome-unstable/networkmanager-openconnect/PKGBUILD b/gnome-unstable/networkmanager-openconnect/PKGBUILD index e2658fd7f..6ecf8e0c2 100644 --- a/gnome-unstable/networkmanager-openconnect/PKGBUILD +++ b/gnome-unstable/networkmanager-openconnect/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 152316 2012-03-06 16:26:58Z heftig $ +# $Id: PKGBUILD 154353 2012-03-27 10:40:52Z heftig $ # Maintainer: Ionut Biru <ibiru@archlinux.org> pkgname=networkmanager-openconnect -pkgver=0.9.3.995 +pkgver=0.9.4.0 pkgrel=1 pkgdesc="NetworkManager VPN integration for openconnect" arch=('i686' 'x86_64') @@ -14,7 +14,7 @@ optdepends=('network-manager-applet: GNOME frontends to NetWorkmanager') options=('!libtool') install=$pkgname.install source=(http://ftp.gnome.org/pub/GNOME/sources/NetworkManager-openconnect/0.9/NetworkManager-openconnect-${pkgver}.tar.xz) -sha256sums=('6ace0f8963f6c8a1ad6e04d8b7cdeffd0cd4fed3e58956cfac4c6a3f3eed7ff9') +sha256sums=('60732587befd062fb8d979540c4410831f5e686b5d092ec24b0237ebd09e1084') build() { cd NetworkManager-openconnect-${pkgver} diff --git a/gnome-unstable/networkmanager-openvpn/PKGBUILD b/gnome-unstable/networkmanager-openvpn/PKGBUILD index 70b1f5771..b551229b6 100644 --- a/gnome-unstable/networkmanager-openvpn/PKGBUILD +++ b/gnome-unstable/networkmanager-openvpn/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 152317 2012-03-06 16:27:48Z heftig $ +# $Id: PKGBUILD 154355 2012-03-27 10:41:36Z heftig $ # Maintainer: Ionut Biru <ibiru@archlinux.org> pkgname=networkmanager-openvpn -pkgver=0.9.3.995 +pkgver=0.9.4.0 pkgrel=1 pkgdesc="NetworkManager VPN plugin for OpenVPN" arch=('i686' 'x86_64') @@ -14,7 +14,7 @@ optdepends=('network-manager-applet: GNOME frontends to NetWorkmanager') install=networkmanager-openvpn.install options=('!libtool') source=(http://ftp.gnome.org/pub/GNOME/sources/NetworkManager-openvpn/0.9/NetworkManager-openvpn-${pkgver}.tar.xz) -sha256sums=('5ede94f377cea8ca5645c86f5de32ea9df7458745c8a41c8004ed38f1b89ab5e') +sha256sums=('d04870b10c2cd3a0671a4be645f595ad0362bcfd23cb849690b27bbac53683e0') build() { cd NetworkManager-openvpn-${pkgver} diff --git a/gnome-unstable/networkmanager-pptp/PKGBUILD b/gnome-unstable/networkmanager-pptp/PKGBUILD index e7126bf5d..b991d7ffa 100644 --- a/gnome-unstable/networkmanager-pptp/PKGBUILD +++ b/gnome-unstable/networkmanager-pptp/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 152318 2012-03-06 16:28:41Z heftig $ +# $Id: PKGBUILD 154356 2012-03-27 10:42:21Z heftig $ # Maintainer: Ionut Biru <ibiru@archlinux.org> pkgname=networkmanager-pptp -pkgver=0.9.3.995 +pkgver=0.9.4.0 pkgrel=1 pkgdesc="NetworkManager VPN plugin for pptp " arch=('i686' 'x86_64') @@ -14,7 +14,7 @@ optdepends=('network-manager-applet: GNOME frontends to NetWorkmanager') options=('!libtool') install=networkmanager-pptp.install source=(http://ftp.gnome.org/pub/GNOME/sources/NetworkManager-pptp/0.9/NetworkManager-pptp-${pkgver}.tar.xz) -sha256sums=('422b9930b2d27f5009561f69165156ced5d2a800d1b3954cc8c8d5b40d2d9c15') +sha256sums=('6fb772985a7273793296375d0ecba59362fe5575f70a8dd36da622db8a8d235d') build() { cd NetworkManager-pptp-${pkgver} diff --git a/gnome-unstable/networkmanager-vpnc/PKGBUILD b/gnome-unstable/networkmanager-vpnc/PKGBUILD index 8fbacd832..8b0ff5d9f 100644 --- a/gnome-unstable/networkmanager-vpnc/PKGBUILD +++ b/gnome-unstable/networkmanager-vpnc/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 152319 2012-03-06 16:29:31Z heftig $ +# $Id: PKGBUILD 154357 2012-03-27 10:43:08Z heftig $ # Maintainer: Ionut Biru <ibiru@archlinux.org> pkgname=networkmanager-vpnc -pkgver=0.9.3.995 +pkgver=0.9.4.0 pkgrel=1 pkgdesc="NetworkManager VPN plugin for vpnc" arch=('i686' 'x86_64') @@ -14,7 +14,7 @@ optdepends=('network-manager-applet: GNOME frontends to NetWorkmanager') options=('!libtool') install=networkmanager-vpnc.install source=(http://ftp.gnome.org/pub/GNOME/sources/NetworkManager-vpnc/0.9/NetworkManager-vpnc-${pkgver}.tar.xz) -sha256sums=('1e0542aebbe40ced9d68271e990cf1d11b6fd6abeef528c727be58eb0c9e868c') +sha256sums=('1d52720ce39bd772753a40c879d0a654fc2efcc4ef7b49ec18f55ae2e82efc7d') build() { cd NetworkManager-vpnc-${pkgver} diff --git a/gnome-unstable/networkmanager/PKGBUILD b/gnome-unstable/networkmanager/PKGBUILD index f2eaadd20..3ade8e128 100644 --- a/gnome-unstable/networkmanager/PKGBUILD +++ b/gnome-unstable/networkmanager/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 153807 2012-03-19 18:58:11Z heftig $ +# $Id: PKGBUILD 154351 2012-03-27 10:39:00Z heftig $ # Maintainer: Jan de Groot <jgc@archlinxu.org> # Contri-butor: Wael Nasreddine <gandalf@siemens-mobiles.org> # Contributor: Tor Krill <tor@krill.nu> @@ -7,7 +7,7 @@ pkgname=networkmanager _pkgname=NetworkManager -pkgver=0.9.3.997 +pkgver=0.9.4.0 pkgrel=1 pkgdesc="Network Management daemon" arch=('i686' 'x86_64') @@ -28,7 +28,7 @@ install=networkmanager.install #source=(http://cgit.freedesktop.org/$_pkgname/$_pkgname/snapshot/$_pkgname-master.tar.xz source=(http://ftp.gnome.org/pub/gnome/sources/$_pkgname/${pkgver:0:3}/$_pkgname-$pkgver.tar.xz NetworkManager.conf disable_set_hostname.patch dnsmasq-path.patch systemd-fallback.patch) -sha256sums=('27bf47926fe43e32bca3b5f64e9eb8f18f4be0ea120493bcbfe2a88cd2602494' +sha256sums=('eb4f124008b3d855a37205d03ef035b7218639cd7332bdae5567095977e93e0f' '44b048804c7c0b8b3b0c29b8632b6ad613c397d0a1635ec918e10c0fbcdadf21' '25056837ea92e559f09563ed817e3e0cd9333be861b8914e45f62ceaae2e0460' '65124505048cc8396daf0242c9f5d532fa669b4bbca305998c248ab2329490cb' diff --git a/gnome-unstable/pidgin/PKGBUILD b/gnome-unstable/pidgin/PKGBUILD index 7309d80d8..a9ae8efe5 100644 --- a/gnome-unstable/pidgin/PKGBUILD +++ b/gnome-unstable/pidgin/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 153446 2012-03-14 12:10:51Z foutrelis $ +# $Id: PKGBUILD 154399 2012-03-27 14:35:39Z foutrelis $ # Maintainer: Evangelos Foutras <evangelos@foutrelis.com> # Contributor: Ionut Biru <ibiru@archlinux.org> # Contributor: Andrea Scarpino <andrea@archlinux.org> @@ -6,7 +6,7 @@ # Contributor: Lucien Immink <l.immink@student.fnt.hvu.nl> pkgname=('pidgin' 'libpurple' 'finch') -pkgver=2.10.2 +pkgver=2.10.3 pkgrel=2 arch=('i686' 'x86_64') url="http://pidgin.im/" @@ -17,16 +17,16 @@ makedepends=('startup-notification' 'gtkspell' 'libxss' 'nss' 'libsasl' 'libsm' 'networkmanager') options=('!libtool') source=(http://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.bz2 - port-to-farstream-v2.patch) -sha256sums=('e5cdd29056d36677cb81225c3b36b1bcde64605e201492f6e2fdf27ff24d32b8' - '03ba48e0da1331a976efc28a66810be4f51599a2b8065ac449965e0aefca4482') + port-to-farstream-v3.patch) +sha256sums=('0f67d96231fea3945c2735e6a3b4bd92590ef489fa1511fa69aa6a543cb4168b' + '4c11c10da01855afe865408f29f514672b736830105523fe48aa74676d5052ca') build() { cd "$srcdir/$pkgname-$pkgver" # Apply patch for farsight -> farstream transition # http://developer.pidgin.im/ticket/14936 - patch -Np1 -i "$srcdir/port-to-farstream-v2.patch" + patch -Np1 -i "$srcdir/port-to-farstream-v3.patch" # The farstream patch changes configure.ac autoreconf -vi diff --git a/gnome-unstable/pidgin/port-to-farstream-v3.patch b/gnome-unstable/pidgin/port-to-farstream-v3.patch new file mode 100644 index 000000000..93e29af50 --- /dev/null +++ b/gnome-unstable/pidgin/port-to-farstream-v3.patch @@ -0,0 +1,447 @@ +diff -upr pidgin-2.10.1.orig/configure.ac pidgin-2.10.1/configure.ac +--- pidgin-2.10.1.orig/configure.ac 2011-12-06 10:44:32.000000000 +0200 ++++ pidgin-2.10.1/configure.ac 2012-03-10 18:21:12.000000000 +0200 +@@ -780,18 +780,18 @@ else + fi + + dnl ####################################################################### +-dnl # Check for Farsight ++dnl # Check for Farstream + dnl ####################################################################### +-AC_ARG_ENABLE(farsight, +- [AC_HELP_STRING([--disable-farsight], [compile without farsight support])], +- enable_farsight="$enableval", enable_farsight="yes") +-if test "x$enable_farsight" != "xno"; then +- PKG_CHECK_MODULES(FARSIGHT, [farsight2-0.10 >= 0.0.9], [ +- AC_DEFINE(USE_FARSIGHT, 1, [Use Farsight for voice and video]) +- AC_SUBST(FARSIGHT_CFLAGS) +- AC_SUBST(FARSIGHT_LIBS) ++AC_ARG_ENABLE(farstream, ++ [AC_HELP_STRING([--disable-farstream], [compile without farstream support])], ++ enable_farstream="$enableval", enable_farstream="yes") ++if test "x$enable_farstream" != "xno"; then ++ PKG_CHECK_MODULES(FARSTREAM, [farstream-0.1], [ ++ AC_DEFINE(USE_FARSTREAM, 1, [Use Farstream for voice and video]) ++ AC_SUBST(FARSTREAM_CFLAGS) ++ AC_SUBST(FARSTREAM_LIBS) + ], [ +- enable_farsight="no" ++ enable_farstream="no" + ]) + fi + +@@ -802,20 +802,20 @@ AC_ARG_ENABLE(vv, + [AC_HELP_STRING([--disable-vv], [compile without voice and video support])], + enable_vv="$enableval", enable_vv="yes") + if test "x$enable_vv" != "xno"; then +- if test "x$enable_gstreamer" != "xno" -a "x$enable_gstinterfaces" != "xno" -a "x$enable_farsight" != "xno"; then ++ if test "x$enable_gstreamer" != "xno" -a "x$enable_gstinterfaces" != "xno" -a "x$enable_farstream" != "xno"; then + AC_DEFINE(USE_VV, 1, [Use voice and video]) + else + enable_vv="no" + if test "x$force_deps" = "xyes"; then + AC_MSG_ERROR([ + Dependencies for voice/video were not met. +-Install the necessary gstreamer and farsight packages first. ++Install the necessary gstreamer and farstream packages first. + Or use --disable-vv if you do not need voice/video support. + ]) + fi + fi + fi +-AM_CONDITIONAL(USE_VV, test "x$enable_gstreamer" != "xno" -a "x$enable_gstinterfaces" != "xno" -a "x$enable_farsight" != "xno") ++AM_CONDITIONAL(USE_VV, test "x$enable_gstreamer" != "xno" -a "x$enable_gstinterfaces" != "xno" -a "x$enable_farstream" != "xno") + + dnl ####################################################################### + dnl # Check for Internationalized Domain Name support +diff -upr pidgin-2.10.1.orig/libpurple/Makefile.am pidgin-2.10.1/libpurple/Makefile.am +--- pidgin-2.10.1.orig/libpurple/Makefile.am 2011-12-06 10:44:33.000000000 +0200 ++++ pidgin-2.10.1/libpurple/Makefile.am 2012-03-10 18:21:19.000000000 +0200 +@@ -306,7 +306,7 @@ libpurple_la_LIBADD = \ + $(LIBXML_LIBS) \ + $(NETWORKMANAGER_LIBS) \ + $(INTLLIBS) \ +- $(FARSIGHT_LIBS) \ ++ $(FARSTREAM_LIBS) \ + $(GSTREAMER_LIBS) \ + $(GSTINTERFACES_LIBS) \ + $(IDN_LIBS) \ +@@ -322,7 +322,7 @@ AM_CPPFLAGS = \ + $(DEBUG_CFLAGS) \ + $(DBUS_CFLAGS) \ + $(LIBXML_CFLAGS) \ +- $(FARSIGHT_CFLAGS) \ ++ $(FARSTREAM_CFLAGS) \ + $(GSTREAMER_CFLAGS) \ + $(GSTINTERFACES_CFLAGS) \ + $(IDN_CFLAGS) \ +diff -upr pidgin-2.10.1.orig/libpurple/media/backend-fs2.c pidgin-2.10.1/libpurple/media/backend-fs2.c +--- pidgin-2.10.1.orig/libpurple/media/backend-fs2.c 2011-12-06 10:44:33.000000000 +0200 ++++ pidgin-2.10.1/libpurple/media/backend-fs2.c 2012-03-10 18:21:19.000000000 +0200 +@@ -1,5 +1,5 @@ + /** +- * @file backend-fs2.c Farsight 2 backend for media API ++ * @file backend-fs2.c Farstream backend for media API + * @ingroup core + */ + +@@ -34,8 +34,9 @@ + #include "network.h" + #include "media-gst.h" + +-#include <gst/farsight/fs-conference-iface.h> +-#include <gst/farsight/fs-element-added-notifier.h> ++#include <farstream/fs-conference.h> ++#include <farstream/fs-element-added-notifier.h> ++#include <farstream/fs-utils.h> + + /** @copydoc _PurpleMediaBackendFs2Class */ + typedef struct _PurpleMediaBackendFs2Class PurpleMediaBackendFs2Class; +@@ -112,6 +113,8 @@ struct _PurpleMediaBackendFs2Stream + gchar *participant; + FsStream *stream; + ++ gboolean supports_add; ++ + GstElement *src; + GstElement *tee; + GstElement *volume; +@@ -147,6 +150,8 @@ struct _PurpleMediaBackendFs2Private + FsConference *conference; + gchar *conference_type; + ++ FsElementAddedNotifier *notifier; ++ + GHashTable *sessions; + GHashTable *participants; + +@@ -212,6 +217,11 @@ purple_media_backend_fs2_dispose(GObject + + purple_debug_info("backend-fs2", "purple_media_backend_fs2_dispose\n"); + ++ if (priv->notifier) { ++ g_object_unref(priv->notifier); ++ priv->notifier = NULL; ++ } ++ + if (priv->confbin) { + GstElement *pipeline; + +@@ -846,7 +856,7 @@ gst_handle_message_element(GstBus *bus, + priv->conference != FS_CONFERENCE(src)) + return; + +- if (gst_structure_has_name(msg->structure, "farsight-error")) { ++ if (gst_structure_has_name(msg->structure, "farstream-error")) { + FsError error_no; + gst_structure_get_enum(msg->structure, "error-no", + FS_TYPE_ERROR, (gint*)&error_no); +@@ -867,16 +877,9 @@ gst_handle_message_element(GstBus *bus, + " strict.")); + purple_media_end(priv->media, NULL, NULL); + break; +- case FS_ERROR_UNKNOWN_CNAME: +- /* +- * Unknown CName is only a problem for the +- * multicast transmitter which isn't used. +- * It is also deprecated. +- */ +- break; + default: + purple_debug_error("backend-fs2", +- "farsight-error: %i: %s\n", ++ "farstream-error: %i: %s\n", + error_no, + gst_structure_get_string( + msg->structure, "error-msg")); +@@ -885,11 +888,11 @@ gst_handle_message_element(GstBus *bus, + + if (FS_ERROR_IS_FATAL(error_no)) { + purple_media_error(priv->media, _("A non-recoverable " +- "Farsight2 error has occurred.")); ++ "Farstream error has occurred.")); + purple_media_end(priv->media, NULL, NULL); + } + } else if (gst_structure_has_name(msg->structure, +- "farsight-new-local-candidate")) { ++ "farstream-new-local-candidate")) { + const GValue *value; + FsStream *stream; + FsCandidate *local_candidate; +@@ -924,7 +927,7 @@ gst_handle_message_element(GstBus *bus, + session->id, name, candidate); + g_object_unref(candidate); + } else if (gst_structure_has_name(msg->structure, +- "farsight-local-candidates-prepared")) { ++ "farstream-local-candidates-prepared")) { + const GValue *value; + FsStream *stream; + FsParticipant *participant; +@@ -942,7 +945,7 @@ gst_handle_message_element(GstBus *bus, + g_signal_emit_by_name(self, "candidates-prepared", + session->id, name); + } else if (gst_structure_has_name(msg->structure, +- "farsight-new-active-candidate-pair")) { ++ "farstream-new-active-candidate-pair")) { + const GValue *value; + FsStream *stream; + FsCandidate *local_candidate; +@@ -976,7 +979,7 @@ gst_handle_message_element(GstBus *bus, + g_object_unref(lcandidate); + g_object_unref(rcandidate); + } else if (gst_structure_has_name(msg->structure, +- "farsight-recv-codecs-changed")) { ++ "farstream-recv-codecs-changed")) { + const GValue *value; + GList *codecs; + FsCodec *codec; +@@ -986,10 +989,10 @@ gst_handle_message_element(GstBus *bus, + codec = codecs->data; + + purple_debug_info("backend-fs2", +- "farsight-recv-codecs-changed: %s\n", ++ "farstream-recv-codecs-changed: %s\n", + codec->encoding_name); + } else if (gst_structure_has_name(msg->structure, +- "farsight-component-state-changed")) { ++ "farstream-component-state-changed")) { + const GValue *value; + FsStreamState fsstate; + guint component; +@@ -1025,11 +1028,11 @@ gst_handle_message_element(GstBus *bus, + } + + purple_debug_info("backend-fs2", +- "farsight-component-state-changed: " ++ "farstream-component-state-changed: " + "component: %u state: %s\n", + component, state); + } else if (gst_structure_has_name(msg->structure, +- "farsight-send-codec-changed")) { ++ "farstream-send-codec-changed")) { + const GValue *value; + FsCodec *codec; + gchar *codec_str; +@@ -1039,12 +1042,12 @@ gst_handle_message_element(GstBus *bus, + codec_str = fs_codec_to_string(codec); + + purple_debug_info("backend-fs2", +- "farsight-send-codec-changed: codec: %s\n", ++ "farstream-send-codec-changed: codec: %s\n", + codec_str); + + g_free(codec_str); + } else if (gst_structure_has_name(msg->structure, +- "farsight-codecs-changed")) { ++ "farstream-codecs-changed")) { + const GValue *value; + FsSession *fssession; + GList *sessions; +@@ -1220,8 +1223,12 @@ stream_info_cb(PurpleMedia *media, Purpl + purple_media_is_initiator(media, sid, name)) + return; + +- fs_stream_set_remote_candidates(stream->stream, +- stream->remote_candidates, &err); ++ if (stream->supports_add) ++ fs_stream_add_remote_candidates(stream->stream, ++ stream->remote_candidates, &err); ++ else ++ fs_stream_force_remote_candidates(stream->stream, ++ stream->remote_candidates, &err); + + if (err == NULL) + return; +@@ -1301,6 +1308,7 @@ init_conference(PurpleMediaBackendFs2 *s + GstElement *pipeline; + GstBus *bus; + gchar *name; ++ GKeyFile *default_props; + + priv->conference = FS_CONFERENCE( + gst_element_factory_make(priv->conference_type, NULL)); +@@ -1343,6 +1351,14 @@ init_conference(PurpleMediaBackendFs2 *s + return FALSE; + } + ++ default_props = fs_utils_get_default_element_properties(GST_ELEMENT(priv->conference)); ++ if (default_props != NULL) { ++ priv->notifier = fs_element_added_notifier_new(); ++ fs_element_added_notifier_add(priv->notifier, ++ GST_BIN(priv->confbin)); ++ fs_element_added_notifier_set_properties_from_keyfile(priv->notifier, default_props); ++ } ++ + g_signal_connect(G_OBJECT(bus), "message", + G_CALLBACK(gst_bus_cb), self); + gst_object_unref(bus); +@@ -1559,7 +1575,7 @@ create_session(PurpleMediaBackendFs2 *se + * receiving the src-pad-added signal. + * Only works for non-multicast FsRtpSessions. + */ +- if (is_nice || !strcmp(transmitter, "rawudp")) ++ if (!!strcmp(transmitter, "multicast")) + g_object_set(G_OBJECT(session->session), + "no-rtcp-timeout", 0, NULL); + +@@ -1612,7 +1628,7 @@ create_participant(PurpleMediaBackendFs2 + GError *err = NULL; + + participant = fs_conference_new_participant( +- priv->conference, name, &err); ++ priv->conference, &err); + + if (err) { + purple_debug_error("backend-fs2", +@@ -1622,6 +1638,12 @@ create_participant(PurpleMediaBackendFs2 + return FALSE; + } + ++ if (g_object_class_find_property(G_OBJECT_GET_CLASS(participant), ++ "cname")) { ++ g_object_set(participant, "cname", name, NULL); ++ } ++ ++ + if (!priv->participants) { + purple_debug_info("backend-fs2", + "Creating hash table for participants\n"); +@@ -1786,6 +1808,40 @@ create_stream(PurpleMediaBackendFs2 *sel + } + } + ++ ++ session = get_session(self, sess_id); ++ ++ if (session == NULL) { ++ purple_debug_error("backend-fs2", ++ "Couldn't find session to create stream.\n"); ++ return FALSE; ++ } ++ ++ participant = get_participant(self, who); ++ ++ if (participant == NULL) { ++ purple_debug_error("backend-fs2", "Couldn't find " ++ "participant to create stream.\n"); ++ return FALSE; ++ } ++ ++ fsstream = fs_session_new_stream(session->session, participant, ++ initiator == TRUE ? type_direction : ++ (type_direction & FS_DIRECTION_RECV), &err); ++ ++ if (fsstream == NULL) { ++ if (err) { ++ purple_debug_error("backend-fs2", ++ "Error creating stream: %s\n", ++ err && err->message ? ++ err->message : "NULL"); ++ g_error_free(err); ++ } else ++ purple_debug_error("backend-fs2", ++ "Error creating stream\n"); ++ return FALSE; ++ } ++ + memcpy(_params, params, sizeof(GParameter) * num_params); + + /* set the controlling mode parameter */ +@@ -1840,45 +1896,22 @@ create_stream(PurpleMediaBackendFs2 *sel + _num_params++; + } + +- session = get_session(self, sess_id); + +- if (session == NULL) { +- purple_debug_error("backend-fs2", +- "Couldn't find session to create stream.\n"); +- return FALSE; +- } +- +- participant = get_participant(self, who); +- +- if (participant == NULL) { +- purple_debug_error("backend-fs2", "Couldn't find " +- "participant to create stream.\n"); +- return FALSE; ++ if(!fs_stream_set_transmitter(fsstream, transmitter, ++ _params, _num_params, &err)) { ++ purple_debug_error("backend-fs2", "Could not set transmitter %s: %s.\n", transmitter, err->message); ++ g_clear_error(&err); ++ g_free(_params); ++ return FALSE; + } +- +- fsstream = fs_session_new_stream(session->session, participant, +- initiator == TRUE ? type_direction : +- (type_direction & FS_DIRECTION_RECV), transmitter, +- _num_params, _params, &err); + g_free(_params); + +- if (fsstream == NULL) { +- if (err) { +- purple_debug_error("backend-fs2", +- "Error creating stream: %s\n", +- err && err->message ? +- err->message : "NULL"); +- g_error_free(err); +- } else +- purple_debug_error("backend-fs2", +- "Error creating stream\n"); +- return FALSE; +- } + + stream = g_new0(PurpleMediaBackendFs2Stream, 1); + stream->participant = g_strdup(who); + stream->session = session; + stream->stream = fsstream; ++ stream->supports_add = !strcmp(transmitter, "nice"); + + priv->streams = g_list_append(priv->streams, stream); + +@@ -1991,7 +2024,11 @@ purple_media_backend_fs2_add_remote_cand + if (purple_media_is_initiator(priv->media, sess_id, participant) || + purple_media_accepted( + priv->media, sess_id, participant)) { +- fs_stream_set_remote_candidates(stream->stream, ++ if (stream->supports_add) ++ fs_stream_add_remote_candidates(stream->stream, ++ stream->remote_candidates, &err); ++ else ++ fs_stream_force_remote_candidates(stream->stream, + stream->remote_candidates, &err); + + if (err) { +diff -upr pidgin-2.10.1.orig/libpurple/media.c pidgin-2.10.1/libpurple/media.c +--- pidgin-2.10.1.orig/libpurple/media.c 2011-12-06 10:44:33.000000000 +0200 ++++ pidgin-2.10.1/libpurple/media.c 2012-03-10 18:21:19.000000000 +0200 +@@ -1067,7 +1067,6 @@ purple_media_add_stream(PurpleMedia *med + { + #ifdef USE_VV + PurpleMediaSession *session; +- PurpleMediaStream *stream = NULL; + + g_return_val_if_fail(PURPLE_IS_MEDIA(media), FALSE); + +@@ -1103,7 +1102,7 @@ purple_media_add_stream(PurpleMedia *med + } + + if (purple_media_get_stream(media, sess_id, who) == NULL) { +- stream = purple_media_insert_stream(session, who, initiator); ++ purple_media_insert_stream(session, who, initiator); + + g_signal_emit(media, purple_media_signals[STATE_CHANGED], + 0, PURPLE_MEDIA_STATE_NEW, +diff -upr pidgin-2.10.1.orig/libpurple/mediamanager.c pidgin-2.10.1/libpurple/mediamanager.c +--- pidgin-2.10.1.orig/libpurple/mediamanager.c 2011-12-06 10:44:33.000000000 +0200 ++++ pidgin-2.10.1/libpurple/mediamanager.c 2012-03-10 18:27:05.000000000 +0200 +@@ -39,7 +39,7 @@ + #ifdef USE_VV + #include <media/backend-fs2.h> + +-#include <gst/farsight/fs-element-added-notifier.h> ++#include <farstream/fs-element-added-notifier.h> + #include <gst/interfaces/xoverlay.h> + + /** @copydoc _PurpleMediaManagerPrivate */ |