# HG changeset patch
# User Aleksej Bobylev <al.bobylev@gmail.com>
# Date 1363436589 0
# Node ID 556064456fb80c0bb44da3f74f8978aed71c7d24
# Parent  382cc0c84e9260a064b9ab1431058194bb5272bb
gnome-commander: patch

diff -r 382cc0c84e92 -r 556064456fb8 gnome-commander/receipt
--- a/gnome-commander/receipt	Fri Mar 15 18:54:44 2013 +0100
+++ b/gnome-commander/receipt	Sat Mar 16 12:23:09 2013 +0000
@@ -5,18 +5,26 @@
 CATEGORY="utilities"
 SHORT_DESC="A full featured, twin-panel file manager for Gnome2"
 MAINTAINER="al.bobylev@gmail.com"
-DEPENDS="alsa-lib atk audiofile bzlib cairo dbus dbus-glib esound exiv2 expat fontconfig freetype gcc-lib-base GConf gdk-pixbuf glib glibc-base gnome-vfs gtk+ lcms libart_lgpl libbonobo libbonoboui libffi libgcrypt libgio libgnome libgnomecanvas libgnome-keyring libgnomeui libgpg-error libgsf libjpeg libpng libxcb libxml2 ORBit2 pango pixman poppler popt taglib tiff util-linux-ng-uuid xorg-libICE xorg-libSM xorg-libX11 xorg-libXau xorg-libXcomposite xorg-libXcursor xorg-libXdamage xorg-libXdmcp xorg-libXext xorg-libXfixes xorg-libXinerama xorg-libXrandr xorg-libXrender zlib"
-BUILD_DEPENDS="gtk+-dev glib-dev gnome-doc-utils-dev libgnome-dev libgnomeui-dev gdk-pixbuf-dev cairo-dev pango-dev atk-dev libbonoboui-dev libgnomecanvas-dev libart_lgpl-dev xorg-libXinerama-dev xorg-libXrandr-dev xorg-dev libgnome-keyring-dev libgcrypt-dev rarian-dev rarian exiv2-dev taglib-dev libgsf-dev poppler-dev chmlib-dev lcms-dev"
 TARBALL="$PACKAGE-$VERSION.tar.xz"
 WEB_SITE="http://www.nongnu.org/gcmd/"
 WGET_URL="$GNOME_MIRROR/$PACKAGE/${VERSION%.*.*}/$TARBALL"
 
+DEPENDS="exiv2 lcms libgnome-keyring libgnomeui libgsf poppler taglib"
+BUILD_DEPENDS="gtk+-dev glib-dev gnome-doc-utils-dev libgnome-dev \
+libgnomeui-dev gdk-pixbuf-dev cairo-dev pango-dev atk-dev libbonoboui-dev \
+libgnomecanvas-dev libart_lgpl-dev xorg-libXinerama-dev xorg-libXrandr-dev \
+xorg-dev libgnome-keyring-dev libgcrypt-dev rarian-dev rarian exiv2-dev \
+taglib-dev libgsf-dev poppler-dev chmlib-dev lcms-dev flex python-dev"
+
 # Rules to configure and make the package.
 compile_rules()
 {
-	cd $src
-	./configure --disable-scrollkeeper $CONFIGURE_ARGS &&
-	make && make install
+	patch -p1 < $stuff/gnome-commander-poppler.patch
+	./configure \
+		--disable-scrollkeeper \
+		$CONFIGURE_ARGS &&
+	make &&
+	make install
 }
 
 # Rules to gen a SliTaz package suitable for Tazpkg.
@@ -25,7 +33,7 @@
 	mkdir -p $fs/usr/share
 	cp -a $install/usr/bin $fs/usr
 	cp -a $install/usr/lib $fs/usr
-	cd $fs/usr/lib/gnome-commander; find . -name "*.*a" -exec rm -f {} \;
+	find $fs/usr/lib/gnome-commander -name "*.*a" -delete
 	cp -a $install/usr/share/applications $fs/usr/share
 	cp -a $install/usr/share/pixmaps $fs/usr/share
 }
diff -r 382cc0c84e92 -r 556064456fb8 gnome-commander/stuff/gnome-commander-poppler.patch
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/gnome-commander/stuff/gnome-commander-poppler.patch	Sat Mar 16 12:23:09 2013 +0000
@@ -0,0 +1,21 @@
+# http://permalink.gmane.org/gmane.os.netbsd.devel.pkgsrc.bugs/48446
+--- gnome-commander-1.2.8.15/src/tags/gnome-cmd-tags-poppler.cc
++++ gnome-commander-1.2.8.15/src/tags/gnome-cmd-tags-poppler.cc
+@@ -41,7 +41,7 @@
+ static regex_t rxDate;
+ static gboolean rxDate_OK;
+ 
+-static void noErrorReporting(int pos, char *msg, va_list args)
++static void noErrorReporting(void *, ErrorCategory, int pos, char *msg)
+ {
+ }
+ #endif
+@@ -52,7 +52,7 @@
+ #ifdef HAVE_PDF
+     rxDate_OK = regcomp (&rxDate, "^(D:)?([12][019][0-9][0-9]([01][0-9]([0-3][0-9]([012][0-9]([0-5][0-9]([0-5][0-9])?)?)?)?)?)", REG_EXTENDED)==0;
+ 
+-    setErrorFunction(noErrorReporting);
++    setErrorCallback(noErrorReporting, NULL);
+ #endif
+ }
+