diff options
| author | Nicolás Reynolds <fauno@kiwwwi.com.ar> | 2012-10-31 10:59:28 -0300 |
|---|---|---|
| committer | Nicolás Reynolds <fauno@kiwwwi.com.ar> | 2012-10-31 10:59:28 -0300 |
| commit | 36f1b1bb12934e4fd9012c0ee5d4e3c885a2d433 (patch) | |
| tree | 397141926cac78871a3e9d53cd8fb824bc1b9cd3 /extra/pidgin | |
| parent | 0858e3f6c7deaae69a94818c0d317a767aa3d481 (diff) | |
| parent | 5827948456201df72a1bd73e87977c569129fb27 (diff) | |
Merge branch 'master' of ssh://vparabola/home/parabola/abslibre-pre-mips64el
Conflicts:
community/percona-server/PKGBUILD
community/xmlrpc-c/PKGBUILD
core/util-linux/PKGBUILD
extra/colord/PKGBUILD
extra/epiphany/PKGBUILD
extra/evolution-data-server/PKGBUILD
extra/evolution/PKGBUILD
extra/gcr/PKGBUILD
extra/gdm/PKGBUILD
extra/gnome-color-manager/PKGBUILD
extra/gnome-control-center/PKGBUILD
extra/gnome-dictionary/PKGBUILD
extra/gnome-font-viewer/PKGBUILD
extra/gnome-screenshot/PKGBUILD
extra/gnome-search-tool/PKGBUILD
extra/gnome-system-log/PKGBUILD
extra/gobject-introspection/PKGBUILD
extra/grilo/PKGBUILD
extra/gtkmm3/PKGBUILD
extra/gvfs/PKGBUILD
extra/json-glib/PKGBUILD
extra/libgnome-keyring/PKGBUILD
extra/nautilus-open-terminal/PKGBUILD
extra/pidgin/PKGBUILD
extra/pygobject/PKGBUILD
extra/rest/PKGBUILD
extra/rhythmbox/PKGBUILD
extra/seahorse/PKGBUILD
extra/totem/PKGBUILD
extra/xorg-xinit/PKGBUILD
extra/yelp/PKGBUILD
Diffstat (limited to 'extra/pidgin')
| -rw-r--r-- | extra/pidgin/PKGBUILD | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/extra/pidgin/PKGBUILD b/extra/pidgin/PKGBUILD index 995881099..758c9794f 100644 --- a/extra/pidgin/PKGBUILD +++ b/extra/pidgin/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 163104 2012-07-07 05:24:14Z foutrelis $ +# $Id: PKGBUILD 169990 2012-10-30 23:00:51Z heftig $ # Maintainer: Evangelos Foutras <evangelos@foutrelis.com> # Contributor: Ionut Biru <ibiru@archlinux.org> # Contributor: Andrea Scarpino <andrea@archlinux.org> @@ -7,13 +7,13 @@ pkgname=('pidgin' 'libpurple' 'finch') pkgver=2.10.6 -pkgrel=1 +pkgrel=2 arch=('i686' 'x86_64' 'mips64el') url="http://pidgin.im/" license=('GPL') makedepends=('startup-notification' 'gtkspell' 'libxss' 'nss' 'libsasl' 'libsm' - 'libidn' 'python2' 'hicolor-icon-theme' 'gstreamer0.10' - 'farstream' 'avahi' 'tk' 'ca-certificates' 'intltool' + 'libidn' 'python2' 'hicolor-icon-theme' 'gstreamer0.10' 'avahi' + 'tk' 'ca-certificates' 'intltool' 'networkmanager') options=('!libtool') source=(http://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.bz2) @@ -35,6 +35,7 @@ build() { --enable-cyrus-sasl \ --disable-doxygen \ --enable-nm \ + --disable-vv \ --with-python=/usr/bin/python2 \ --with-system-ssl-certs=/etc/ssl/certs make @@ -43,9 +44,8 @@ build() { package_pidgin(){ pkgdesc="Multi-protocol instant messaging client" depends=('libpurple' 'startup-notification' 'gtkspell' 'libxss' 'libsm' - 'gstreamer0.10' 'hicolor-icon-theme') - optdepends=('aspell: for spelling correction' - 'gstreamer0.10-good-plugins: video and voice support') + 'hicolor-icon-theme') + optdepends=('aspell: for spelling correction') install=pidgin.install cd "$srcdir/pidgin-$pkgver" @@ -66,7 +66,7 @@ package_pidgin(){ package_libpurple(){ pkgdesc="IM library extracted from Pidgin" - depends=('farstream' 'libsasl' 'libidn' 'dbus-glib' 'nss') + depends=('gstreamer0.10' 'libsasl' 'libidn' 'dbus-glib' 'nss') optdepends=('avahi: Bonjour protocol support' 'ca-certificates: SSL CA certificates' 'python2-dbus: for purple-remote and purple-url-handler' @@ -81,7 +81,7 @@ package_libpurple(){ package_finch(){ pkgdesc="A ncurses-based messaging client" - depends=("libpurple=$pkgver-$pkgrel" 'python2' 'gstreamer0.10') + depends=("libpurple=$pkgver-$pkgrel" 'libx11' 'python2') cd "$srcdir/pidgin-$pkgver" |