summaryrefslogtreecommitdiff
path: root/nonprism/pidgin-nonprism
diff options
context:
space:
mode:
Diffstat (limited to 'nonprism/pidgin-nonprism')
-rw-r--r--nonprism/pidgin-nonprism/PKGBUILD19
-rw-r--r--nonprism/pidgin-nonprism/pidgin-2.10.7-link-libirc-to-libsasl2.patch12
2 files changed, 7 insertions, 24 deletions
diff --git a/nonprism/pidgin-nonprism/PKGBUILD b/nonprism/pidgin-nonprism/PKGBUILD
index 50bf3d05d..4c9fff786 100644
--- a/nonprism/pidgin-nonprism/PKGBUILD
+++ b/nonprism/pidgin-nonprism/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 185869 2013-05-19 16:42:53Z foutrelis $
+# $Id: PKGBUILD 204841 2014-01-28 15:36:09Z foutrelis $
# Maintainer: Evangelos Foutras <evangelos@foutrelis.com>
# Contributor: Ionut Biru <ibiru@archlinux.org>
# Contributor: Andrea Scarpino <andrea@archlinux.org>
@@ -7,19 +7,18 @@
_pkgname=pidgin
pkgname=('pidgin-nonprism' 'libpurple-nonprism' 'finch-nonprism')
-pkgver=2.10.7
-pkgrel=4
+pkgver=2.10.8
+pkgrel=1
arch=('i686' 'x86_64' 'mips64el')
url="http://pidgin.im/"
license=('GPL')
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
- pidgin-2.10.7-link-libirc-to-libsasl2.patch nonprism.patch)
-sha256sums=('eba32994eca20d1cf24a4261b059b2de71a1ec2dd0926e904074b0db49f7f192'
- '063723d5dc5726c43137b4b383c9d07c2c008391f6a626faaf6cedd31a2f1e8f'
+source=(http://downloads.sourceforge.net/$_pkgname/$_pkgname-$pkgver.tar.bz2{,.asc}
+ nonprism.patch)
+sha256sums=('b633367e3588ff3e615d68e812302dfdbe32e73693cbe42a0d827b7aed7a8227'
+ 'SKIP'
'f7acfb852cdecfed16e8b116546b643cad1c44d28b56f28ff5485f92af68e9e2')
prepare() {
@@ -34,10 +33,6 @@ prepare() {
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/nonprism/pidgin-nonprism/pidgin-2.10.7-link-libirc-to-libsasl2.patch b/nonprism/pidgin-nonprism/pidgin-2.10.7-link-libirc-to-libsasl2.patch
deleted file mode 100644
index abffa20b8..000000000
--- a/nonprism/pidgin-nonprism/pidgin-2.10.7-link-libirc-to-libsasl2.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-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
-