wok-current rev 14209
gnome-commander: patch
author | Aleksej Bobylev <al.bobylev@gmail.com> |
---|---|
date | Sat Mar 16 12:23:09 2013 +0000 (2013-03-16) |
parents | 382cc0c84e92 |
children | dbd41e6636de |
files | gnome-commander/receipt gnome-commander/stuff/gnome-commander-poppler.patch |
line diff
1.1 --- a/gnome-commander/receipt Fri Mar 15 18:54:44 2013 +0100 1.2 +++ b/gnome-commander/receipt Sat Mar 16 12:23:09 2013 +0000 1.3 @@ -5,18 +5,26 @@ 1.4 CATEGORY="utilities" 1.5 SHORT_DESC="A full featured, twin-panel file manager for Gnome2" 1.6 MAINTAINER="al.bobylev@gmail.com" 1.7 -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" 1.8 -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" 1.9 TARBALL="$PACKAGE-$VERSION.tar.xz" 1.10 WEB_SITE="http://www.nongnu.org/gcmd/" 1.11 WGET_URL="$GNOME_MIRROR/$PACKAGE/${VERSION%.*.*}/$TARBALL" 1.12 1.13 +DEPENDS="exiv2 lcms libgnome-keyring libgnomeui libgsf poppler taglib" 1.14 +BUILD_DEPENDS="gtk+-dev glib-dev gnome-doc-utils-dev libgnome-dev \ 1.15 +libgnomeui-dev gdk-pixbuf-dev cairo-dev pango-dev atk-dev libbonoboui-dev \ 1.16 +libgnomecanvas-dev libart_lgpl-dev xorg-libXinerama-dev xorg-libXrandr-dev \ 1.17 +xorg-dev libgnome-keyring-dev libgcrypt-dev rarian-dev rarian exiv2-dev \ 1.18 +taglib-dev libgsf-dev poppler-dev chmlib-dev lcms-dev flex python-dev" 1.19 + 1.20 # Rules to configure and make the package. 1.21 compile_rules() 1.22 { 1.23 - cd $src 1.24 - ./configure --disable-scrollkeeper $CONFIGURE_ARGS && 1.25 - make && make install 1.26 + patch -p1 < $stuff/gnome-commander-poppler.patch 1.27 + ./configure \ 1.28 + --disable-scrollkeeper \ 1.29 + $CONFIGURE_ARGS && 1.30 + make && 1.31 + make install 1.32 } 1.33 1.34 # Rules to gen a SliTaz package suitable for Tazpkg. 1.35 @@ -25,7 +33,7 @@ 1.36 mkdir -p $fs/usr/share 1.37 cp -a $install/usr/bin $fs/usr 1.38 cp -a $install/usr/lib $fs/usr 1.39 - cd $fs/usr/lib/gnome-commander; find . -name "*.*a" -exec rm -f {} \; 1.40 + find $fs/usr/lib/gnome-commander -name "*.*a" -delete 1.41 cp -a $install/usr/share/applications $fs/usr/share 1.42 cp -a $install/usr/share/pixmaps $fs/usr/share 1.43 }
2.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 2.2 +++ b/gnome-commander/stuff/gnome-commander-poppler.patch Sat Mar 16 12:23:09 2013 +0000 2.3 @@ -0,0 +1,21 @@ 2.4 +# http://permalink.gmane.org/gmane.os.netbsd.devel.pkgsrc.bugs/48446 2.5 +--- gnome-commander-1.2.8.15/src/tags/gnome-cmd-tags-poppler.cc 2.6 ++++ gnome-commander-1.2.8.15/src/tags/gnome-cmd-tags-poppler.cc 2.7 +@@ -41,7 +41,7 @@ 2.8 + static regex_t rxDate; 2.9 + static gboolean rxDate_OK; 2.10 + 2.11 +-static void noErrorReporting(int pos, char *msg, va_list args) 2.12 ++static void noErrorReporting(void *, ErrorCategory, int pos, char *msg) 2.13 + { 2.14 + } 2.15 + #endif 2.16 +@@ -52,7 +52,7 @@ 2.17 + #ifdef HAVE_PDF 2.18 + 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; 2.19 + 2.20 +- setErrorFunction(noErrorReporting); 2.21 ++ setErrorCallback(noErrorReporting, NULL); 2.22 + #endif 2.23 + } 2.24 +