[arch-commits] Commit in pidgin/repos (3 files)

[Eric Belanger]

    Date: Friday, June 6, 2008 @ 14:05:40
  Author: eric
Revision: 2544

Merged revisions 2-2543 via svnmerge from 
svn+ssh://svn.archlinux.org/home/svn-packages/pidgin/trunk

........
  r356 | aaron | 2008-04-18 18:56:27 -0400 (Fri, 18 Apr 2008) | 1 line
  
  Added svn:keywords to all PKGBUILDs
........
  r2524 | dan | 2008-06-06 00:25:38 -0400 (Fri, 06 Jun 2008) | 1 line
  
  upgpkg: pidgin 2.4.2-1
........

Modified:
  pidgin/repos/extra-x86_64/	(properties)
  pidgin/repos/extra-x86_64/PKGBUILD
Deleted:
  pidgin/repos/extra-x86_64/iconv-fix.patch

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


Property changes on: pidgin/repos/extra-x86_64
___________________________________________________________________
Name: svnmerge-integrated
   - /pidgin/trunk:1
   + /pidgin/trunk:1-2543

Modified: extra-x86_64/PKGBUILD
===================================================================
--- extra-x86_64/PKGBUILD	2008-06-06 17:42:55 UTC (rev 2543)
+++ extra-x86_64/PKGBUILD	2008-06-06 18:05:40 UTC (rev 2544)
@@ -3,7 +3,7 @@
 # Maintainer: Dan McGee <dan at archlinux.org>
 
 pkgname=pidgin
-pkgver=2.4.1
+pkgver=2.4.2
 pkgrel=1
 pkgdesc="A GTK+-based messaging client"
 arch=(i686 x86_64)
@@ -16,17 +16,11 @@
 provides=('gaim')
 options=(!libtool)
 install=pidgin.install
-source=(http://downloads.sourceforge.net/sourceforge/$pkgname/$pkgname-$pkgver.tar.bz2
-        iconv-fix.patch)
-md5sums=('ff015bb8bbdcc6a9b4ac954c355179d7'
-         'de084bf1e2f345eada74671787256b74')
+source=(http://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.bz2)
 
 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
   sed -i -e 's/gconftool-2/no/g' configure.ac
 
@@ -36,7 +30,7 @@
   libtoolize --force --copy || return 1
   aclocal || return 1
   autoconf || return 1
-  automake || return 1
+  automake --add-missing || return 1
 
   ./configure --prefix=/usr --sysconfdir=/etc \
               --disable-perl --disable-cap \
@@ -44,7 +38,10 @@
               --enable-gtkspell --enable-gnutls=yes \
               --enable-nss=no --disable-gevolution \
               --enable-dbus --disable-mono \
+              --disable-meanwhile --disable-nm \
               --disable-debug
   make || return 1
   make DESTDIR=${startdir}/pkg install
 }
+
+md5sums=('2d10f9b6a5f0162cf88016ea2ca0a36d')

Deleted: extra-x86_64/iconv-fix.patch
===================================================================
--- extra-x86_64/iconv-fix.patch	2008-06-06 17:42:55 UTC (rev 2543)
+++ extra-x86_64/iconv-fix.patch	2008-06-06 18:05:40 UTC (rev 2544)
@@ -1,11 +0,0 @@
---- 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.