[arch-commits] CVS update of extra/network/pidgin (PKGBUILD iconv-fix.patch)

[Dan McGee]

    Date: Sunday, September 30, 2007 @ 18:46:05
  Author: dan
    Path: /home/cvs-extra/extra/network/pidgin

   Added: iconv-fix.patch (1.1)
Modified: PKGBUILD (1.10 -> 1.11)

upgpkg: pidgin 2.2.1-1


-----------------+
 PKGBUILD        |   13 +++++++++----
 iconv-fix.patch |   11 +++++++++++
 2 files changed, 20 insertions(+), 4 deletions(-)


Index: extra/network/pidgin/PKGBUILD
diff -u extra/network/pidgin/PKGBUILD:1.10 extra/network/pidgin/PKGBUILD:1.11
--- extra/network/pidgin/PKGBUILD:1.10	Fri Sep 14 08:42:24 2007
+++ extra/network/pidgin/PKGBUILD	Sun Sep 30 18:46:03 2007
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD,v 1.10 2007/09/14 12:42:24 dan Exp $
+# $Id: PKGBUILD,v 1.11 2007/09/30 22:46:03 dan Exp $
 # Contributor: Lucien Immink <l.immink at student.fnt.hvu.nl>
 # Maintainer: Dan McGee <dan at archlinux.org>
 
 pkgname=pidgin
-pkgver=2.2.0
+pkgver=2.2.1
 pkgrel=1
 pkgdesc="A GTK+-based messaging client"
 arch=(i686 x86_64)
@@ -16,11 +16,16 @@
 provides=('gaim')
 options=(!libtool)
 install=pidgin.install
-source=(http://downloads.sourceforge.net/sourceforge/$pkgname/$pkgname-$pkgver.tar.bz2)
-md5sums=('d71cd4de6ef1459ba9b504d0c06d8d04')
+source=(http://downloads.sourceforge.net/sourceforge/$pkgname/$pkgname-$pkgver.tar.bz2 iconv-fix.patch)
+md5sums=('f1703430d4b8ffc96b493fc36cd46131'
+         'de084bf1e2f345eada74671787256b74')
 
 build() {
   cd ${startdir}/src/${pkgname}-${pkgver}
+
+  # fix some weird autoconf substitution bug, should report this upstream
+  patch -p0 < ../iconv-fix.patch || return 1
+
   # gconf won't die with the --disable-schemas-install option
   #  unfortunately this makes configure run twice, but oh well
   sed -i -e 's/gconftool-2/no/g' configure.ac
Index: extra/network/pidgin/iconv-fix.patch
diff -u /dev/null extra/network/pidgin/iconv-fix.patch:1.1
--- /dev/null	Sun Sep 30 18:46:04 2007
+++ extra/network/pidgin/iconv-fix.patch	Sun Sep 30 18:46:04 2007
@@ -0,0 +1,11 @@
+--- intltool-merge.in.old	2007-09-30 17:25:14.000000000 -0500
++++ intltool-merge.in	2007-09-30 17:25:41.000000000 -0500
+@@ -93,7 +93,7 @@
+ 
+ my %po_files_by_lang = ();
+ my %translations = ();
+-my $iconv = $ENV{"ICONV"} || $ENV{"INTLTOOL_ICONV"} || "@INTLTOOL_ICONV@";
++my $iconv = $ENV{"ICONV"} || "iconv";
+ my $devnull = ($^O eq 'MSWin32' ? 'NUL:' : '/dev/null');
+ 
+ # Use this instead of \w for XML files to handle more possible characters.