diff options
| author | Michał Masłowski <mtjm@mtjm.eu> | 2012-05-14 17:12:15 +0200 |
|---|---|---|
| committer | Michał Masłowski <mtjm@mtjm.eu> | 2012-05-14 17:12:15 +0200 |
| commit | 6feb300093e37e58027d52ca5734624565e09598 (patch) | |
| tree | 418d2cc8c7e631c42898a28731ade8a29e3cb955 /extra/pidgin | |
| parent | 216722b262c18f99fa53875247e7a258cb3b4b34 (diff) | |
| parent | d3af8dc0117dc1ce4fea3d05c7a2d7786bd78986 (diff) | |
Merge branch 'master' of ssh://parabolagnulinux.org:1863/home/parabola/abslibre-pre-mips64el
Conflicts:
community/openbox/PKGBUILD
community/powertop/PKGBUILD
core/libusb-compat/PKGBUILD
core/openssl/PKGBUILD
extra/libvpx/PKGBUILD
extra/php-apc/PKGBUILD
extra/pidgin/PKGBUILD
extra/pulseaudio/PKGBUILD
extra/pygobject/PKGBUILD
extra/xfce4-genmon-plugin/PKGBUILD
extra/xorg-server/PKGBUILD
multilib/gcc-multilib/PKGBUILD
multilib/lib32-cairo/PKGBUILD
multilib/lib32-glib2/PKGBUILD
multilib/lib32-libffi/PKGBUILD
multilib/lib32-libpulse/PKGBUILD
multilib/lib32-llvm/PKGBUILD
multilib/wine/PKGBUILD
testing/mdadm/PKGBUILD
testing/php/PKGBUILD
testing/xorg-server/PKGBUILD
testing/xorg-server/git-fixes.patch
Diffstat (limited to 'extra/pidgin')
| -rw-r--r-- | extra/pidgin/PKGBUILD | 30 |
1 files changed, 9 insertions, 21 deletions
diff --git a/extra/pidgin/PKGBUILD b/extra/pidgin/PKGBUILD index c3bd974da..cdc06f895 100644 --- a/extra/pidgin/PKGBUILD +++ b/extra/pidgin/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 156957 2012-04-23 09:10:00Z ibiru $ +# $Id: PKGBUILD 158683 2012-05-07 06:27:02Z foutrelis $ # Maintainer: Evangelos Foutras <evangelos@foutrelis.com> # Contributor: Ionut Biru <ibiru@archlinux.org> # Contributor: Andrea Scarpino <andrea@archlinux.org> @@ -6,8 +6,8 @@ # Contributor: Lucien Immink <l.immink@student.fnt.hvu.nl> pkgname=('pidgin' 'libpurple' 'finch') -pkgver=2.10.3 -pkgrel=2 +pkgver=2.10.4 +pkgrel=1 arch=('i686' 'x86_64' 'mips64el') url="http://pidgin.im/" license=('GPL') @@ -16,21 +16,12 @@ makedepends=('startup-notification' 'gtkspell' 'libxss' 'nss' 'libsasl' 'libsm' 'farstream' 'avahi' 'tk' 'ca-certificates' 'intltool' 'networkmanager') options=('!libtool') -source=(http://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.bz2 - port-to-farstream-v3.patch) -sha256sums=('0f67d96231fea3945c2735e6a3b4bd92590ef489fa1511fa69aa6a543cb4168b' - '4c11c10da01855afe865408f29f514672b736830105523fe48aa74676d5052ca') +source=(http://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.bz2) +sha256sums=('8fbef835c8dfa2281532ad7064d664477d72015d6dcd4345362dcfe658aaee0e') build() { cd "$srcdir/$pkgname-$pkgver" - # Apply patch for farsight -> farstream transition - # http://developer.pidgin.im/ticket/14936 - patch -Np1 -i "$srcdir/port-to-farstream-v3.patch" - - # The farstream patch changes configure.ac - autoreconf -vi - # Use Python 2 sed -i 's/env python$/&2/' */plugins/*.py \ libpurple/purple-{remote,notifications-example,url-handler} @@ -54,9 +45,7 @@ package_pidgin(){ depends=('libpurple' 'startup-notification' 'gtkspell' 'libxss' 'libsm' 'gstreamer0.10' 'hicolor-icon-theme') optdepends=('aspell: for spelling correction' - 'ca-certificates: SSL CA certificates' - 'gstreamer0.10-good-plugins: video and voice support' - 'tk: Tcl/Tk scripting support') + 'gstreamer0.10-good-plugins: video and voice support') install=pidgin.install cd "$srcdir/pidgin-$pkgver" @@ -79,7 +68,9 @@ package_libpurple(){ pkgdesc="IM library extracted from Pidgin" depends=('farstream' 'libsasl' 'libidn' 'dbus-glib' 'nss') optdepends=('avahi: Bonjour protocol support' - 'dbus-python: for purple-remote and purple-url-handler') + 'ca-certificates: SSL CA certificates' + 'dbus-python: for purple-remote and purple-url-handler' + 'tk: Tcl/Tk scripting support') cd "$srcdir/pidgin-$pkgver" @@ -91,9 +82,6 @@ package_libpurple(){ package_finch(){ pkgdesc="A ncurses-based messaging client" depends=("libpurple=$pkgver-$pkgrel" 'python2' 'gstreamer0.10') - optdepends=('avahi: Bonjour protocol support' - 'ca-certificates: SSL CA certificates' - 'tk: Tcl/Tk scripting support') cd "$srcdir/pidgin-$pkgver" |