Merge branch 'master' of ssh://parabolagnulinux.org:1863/home/parabola/abslibre-pre-mips64el

Conflicts:
	community/bwbar/PKGBUILD
	community/directfb/PKGBUILD
	community/extremetuxracer/PKGBUILD
	community/freedroidrpg/PKGBUILD
	community/gnash/PKGBUILD
	community/guake/PKGBUILD
	community/pidgin-libnotify/PKGBUILD
	community/png2ico/PKGBUILD
	community/ruby-gtk2/PKGBUILD
	community/torcs/PKGBUILD
	community/virtualbox/PKGBUILD
	extra/abiword/PKGBUILD
	extra/alsaplayer/PKGBUILD
	extra/automoc4/PKGBUILD
	extra/cagibi/PKGBUILD
	extra/fltk/PKGBUILD
	extra/gnome-desktop2/PKGBUILD
	extra/gnome-python/PKGBUILD
	extra/gnome-sharp/PKGBUILD
	extra/gnugo/PKGBUILD
	extra/gstreamer0.10-good/PKGBUILD
	extra/gtk2/PKGBUILD
	extra/gtkmm/PKGBUILD
	extra/imlib2/PKGBUILD
	extra/koffice/PKGBUILD
	extra/lcms/PKGBUILD
	extra/libao/PKGBUILD
	extra/libcue/PKGBUILD
	extra/libdaemon/PKGBUILD
	extra/libgnome-media-profiles/PKGBUILD
	extra/libotf/PKGBUILD
	extra/libotr/PKGBUILD
	extra/libots/PKGBUILD
	extra/libreoffice/PKGBUILD
	extra/libtiff/PKGBUILD
	extra/libwebkit/PKGBUILD
	extra/libwmf/PKGBUILD
	extra/libxfcegui4/PKGBUILD
	extra/mjpegtools/PKGBUILD
	extra/netpbm/PKGBUILD
	extra/php/PKGBUILD
	extra/plotutils/PKGBUILD
	extra/poppler/PKGBUILD
	extra/qrencode/PKGBUILD
	extra/qt/PKGBUILD
	extra/qtiplot/PKGBUILD
	extra/rssh/PKGBUILD
	extra/scim-chewing/PKGBUILD
	extra/scim-m17n/PKGBUILD
	extra/scim-pinyin/PKGBUILD
	extra/scim-tables/PKGBUILD
	extra/scim-uim/PKGBUILD
	extra/tsocks/PKGBUILD
	extra/vigra/PKGBUILD
	extra/w3m/PKGBUILD
	extra/wv/PKGBUILD
	extra/xclip/PKGBUILD
	extra/xfce4-datetime-plugin/PKGBUILD
	extra/xfce4-notes-plugin/PKGBUILD
	extra/xfce4-quicklauncher-plugin/PKGBUILD
	extra/xfce4-sensors-plugin/PKGBUILD
	extra/xorg-font-util/PKGBUILD
	extra/xorg-setxkbmap/PKGBUILD
	extra/xorg-xev/PKGBUILD
	extra/xsane/PKGBUILD
	extra/yakuake/PKGBUILD
	extra/zvbi/PKGBUILD
	multilib/lib32-cairo/PKGBUILD
	multilib/lib32-gdk-pixbuf2/PKGBUILD
	multilib/lib32-libcanberra/PKGBUILD
	multilib/lib32-libcups/PKGBUILD
	multilib/lib32-libglade/PKGBUILD
	multilib/lib32-libpng/PKGBUILD
	multilib/lib32-libtiff/PKGBUILD
	multilib/lib32-pango/PKGBUILD
	multilib/lib32-qt/PKGBUILD
	multilib/lib32-sdl_image/PKGBUILD
	multilib/wine/PKGBUILD
	testing/vlc/PKGBUILD
	testing/xulrunner/PKGBUILD

1 files changed, 7 insertions, 33 deletions

diff --git a/community/gnubiff/PKGBUILD b/community/gnubiff/PKGBUILD
index 65b80b55c..a77f19181 100644
--- a/community/gnubiff/PKGBUILD
+++ b/community/gnubiff/PKGBUILD
@@ -1,55 +1,29 @@
-# $Id: PKGBUILD 53951 2011-08-10 14:38:08Z spupykin $
+# $Id: PKGBUILD 63600 2012-02-05 11:59:28Z ibiru $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Maintainer: Tom K <tomk@runbox.com>
 # Contributor: Todd Musall <tmusall@gmail.com>
 
 pkgname=gnubiff
-pkgver=2.2.13
-pkgrel=2
+pkgver=2.2.14
+pkgrel=1
 pkgdesc="Mail notification program that checks for mail and displays headers when new mail has arrived"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://gnubiff.sourceforge.net/"
 license=("GPL")
-depends=('libglade' 'gtk2' 'popt')
+depends=('libglade' 'gtk3' 'popt')
 makedepends=('perlxml' 'intltool')
 conflicts=(gnubiff-gtk)
 source=(http://downloads.sourceforge.net/gnubiff/gnubiff-$pkgver.tar.gz)
-md5sums=('65423957eb027b94c9e661611c0e4271')
+md5sums=('f2a2c3485d2f3f0adff1b7665c2f3b24')
 
 build() {
   [ "$GNOMEDIR" = "" ] && GNOMEDIR=/usr
-  cd $startdir/src/gnubiff-$pkgver
-
-  patch -p2 src/support.h <<EOF
-diff -wbBur gnubiff-2.2.10/src/support.h gnubiff-2.2.10.my/src/support.h
---- gnubiff-2.2.10/src/support.h	2008-03-22 05:08:51.000000000 +0300
-+++ gnubiff-2.2.10.my/src/support.h	2008-04-22 14:21:58.000000000 +0400
-@@ -35,6 +35,9 @@
- #endif
- #include "nls.h"
- 
-+#include <stdlib.h>
-+#define EXIT_SUCCESS 0
-+#define EXIT_FAILURE 1
- 
- #include <glib.h>
- #include <sstream>
-@@ -131,6 +134,9 @@
- 		if ((pos == end) && (last < num))
- 			result << sep << num;
- 
-+		if ((pos == end) && (last != num))
-+		  result << sep << num;
-+	
- 		// Save new number
- 		inf_bound = last = num;
- 	}
-EOF
+  cd $srcdir/gnubiff-$pkgver
 
   ./configure --prefix=/usr --with-password --with-password-string="65423957eb027b94c9e661611c0e4271" \
 	--disable-fam --disable-gnome
   make
-  make DESTDIR=$startdir/pkg install
+  make DESTDIR=$pkgdir install
 
   rm -rf ${pkgdir}/usr/share/info/dir
 }