diff options
| author | Michał Masłowski <mtjm@mtjm.eu> | 2013-02-15 10:59:36 +0100 |
|---|---|---|
| committer | Michał Masłowski <mtjm@mtjm.eu> | 2013-02-15 10:59:36 +0100 |
| commit | 7545c059f8a1aadcf7dc1a15adb739ddbd8c61cc (patch) | |
| tree | ec53c4230cddd1602f9893574dd8a16c7c2d6747 /extra/pidgin | |
| parent | a81a0b6ad84173e4494421a1dfafa77415f479df (diff) | |
| parent | 3cc17982fa285effbc27ce867815e56bae56238d (diff) | |
Merge branch 'master' of ssh://parabolagnulinux.org:1863/home/parabola/abslibre-pre-mips64el
Conflicts:
core/gmp/PKGBUILD
extra/pidgin/PKGBUILD
extra/qtwebkit/PKGBUILD
Diffstat (limited to 'extra/pidgin')
| -rw-r--r-- | extra/pidgin/PKGBUILD | 14 | ||||
| -rw-r--r-- | extra/pidgin/pidgin-2.10.7-link-libirc-to-libsasl2.patch | 12 |
2 files changed, 22 insertions, 4 deletions
diff --git a/extra/pidgin/PKGBUILD b/extra/pidgin/PKGBUILD index 90c4dee85..2e6cea0c8 100644 --- a/extra/pidgin/PKGBUILD +++ b/extra/pidgin/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 178012 2013-02-13 16:03:52Z foutrelis $ +# $Id: PKGBUILD 178040 2013-02-14 01:37:10Z foutrelis $ # Maintainer: Evangelos Foutras <evangelos@foutrelis.com> # Contributor: Ionut Biru <ibiru@archlinux.org> # Contributor: Andrea Scarpino <andrea@archlinux.org> @@ -7,7 +7,7 @@ pkgname=('pidgin' 'libpurple' 'finch') pkgver=2.10.7 -pkgrel=1 +pkgrel=2 arch=('i686' 'x86_64' 'mips64el') url="http://pidgin.im/" license=('GPL') @@ -15,12 +15,18 @@ makedepends=('startup-notification' 'gtkspell' 'libxss' 'nss' 'libsasl' 'libsm' 'libidn' 'python2' 'hicolor-icon-theme' 'farstream-0.1' 'avahi' 'tk' 'ca-certificates' 'intltool' 'networkmanager') options=('!libtool') -source=(http://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.bz2) -sha256sums=('eba32994eca20d1cf24a4261b059b2de71a1ec2dd0926e904074b0db49f7f192') +source=(http://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.bz2 + pidgin-2.10.7-link-libirc-to-libsasl2.patch) +sha256sums=('eba32994eca20d1cf24a4261b059b2de71a1ec2dd0926e904074b0db49f7f192' + '063723d5dc5726c43137b4b383c9d07c2c008391f6a626faaf6cedd31a2f1e8f') build() { cd "$srcdir/$pkgname-$pkgver" + # https://developer.pidgin.im/ticket/15517 + patch -Np1 -i "$srcdir/pidgin-2.10.7-link-libirc-to-libsasl2.patch" + autoreconf -vi + # Use Python 2 sed -i 's/env python$/&2/' */plugins/*.py \ libpurple/purple-{remote,notifications-example,url-handler} diff --git a/extra/pidgin/pidgin-2.10.7-link-libirc-to-libsasl2.patch b/extra/pidgin/pidgin-2.10.7-link-libirc-to-libsasl2.patch new file mode 100644 index 000000000..abffa20b8 --- /dev/null +++ b/extra/pidgin/pidgin-2.10.7-link-libirc-to-libsasl2.patch @@ -0,0 +1,12 @@ +diff -upr pidgin-2.10.7.orig/libpurple/protocols/irc/Makefile.am pidgin-2.10.7/libpurple/protocols/irc/Makefile.am +--- pidgin-2.10.7.orig/libpurple/protocols/irc/Makefile.am 2013-02-14 02:44:47.000000000 +0200 ++++ pidgin-2.10.7/libpurple/protocols/irc/Makefile.am 2013-02-14 02:49:58.000000000 +0200 +@@ -27,7 +27,7 @@ else + st = + pkg_LTLIBRARIES = libirc.la + libirc_la_SOURCES = $(IRCSOURCES) +-libirc_la_LIBADD = $(GLIB_LIBS) ++libirc_la_LIBADD = $(GLIB_LIBS) $(SASL_LIBS) + + endif + |