Update of /cvsroot/fink/dists/10.7/stable/main/finkinfo/graphics
In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv3377/graphics

Modified Files:
        xsane.info 
Log Message:
clean up (B)Depends
bump lib(graphics) and lib(text) stacks to newer versions

Index: xsane.info
===================================================================
RCS file: /cvsroot/fink/dists/10.7/stable/main/finkinfo/graphics/xsane.info,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- xsane.info  20 Jun 2013 20:05:00 -0000      1.3
+++ xsane.info  25 Jun 2013 14:15:55 -0000      1.4
@@ -1,6 +1,6 @@
 Package: xsane
 Version: 0.998
-Revision: 4
+Revision: 6
 Source: mirror:custom:%n-%v.tar.gz
 Source-MD5: 936f1cc76b37caa8f285e1e15ac7e0aa
 CustomMirror: <<
@@ -11,71 +11,84 @@
   eur-DE: http://www.xsane.org/cgi-bin/sitexplorer.cgi?/download
 <<
 Description: Graphical frontend and gimp2 plugin for sane
-# first item is for a rotten test for gettext in configure;
-#  the -lintl in the LDFLAGS also (would be far better to just add this for 
the configure test)
-# second is for missing declarations _ would prefer not to use getopt.c 
altogether (and libgnugetopt instead ?)
 PatchScript: <<
   #!/bin/sh -ev
+  ### first item is for a rotten test for gettext in configure;
+  ###  the -lintl in the LDFLAGS also (would be far better to just add this 
for the configure test)
   sed -i.bak -e '/gettext in libintl/,/return/{ /^int$/i \
        #include <libintl.h>
   }' configure
+  ### second is for missing declarations _ would prefer not to use getopt.c 
altogether (and libgnugetopt instead ?)
   sed -i.bak -e '1i \
 #include <string.h>\
 #include <unistd.h>
   ' lib/getopt.c
+  ### fix for building with libpng15+
+  perl -pi -e 's|png_ptr->jmpbuf|png_jmpbuf(png_ptr)|g' src/xsane-save.c
 <<
 Depends: <<
+       atk1-shlibs,
+       cairo-shlibs (>= 1.12.8),
+       fontconfig2-shlibs (>= 2.10.2-1),
+       freetype219-shlibs (>= 2.4.11-1),
        gimp2-svg-shlibs | gimp2-shlibs,
        glib2-shlibs,
        gtk+2-shlibs,
+       libexif12-shlibs,
        lcms2-shlibs,
        libgettext8-shlibs,
+       libgphoto2-shlibs,
        libjpeg8-shlibs,
-       libpng14-shlibs,
-       libtiff-shlibs,
+       libpng16-shlibs,
+       libtiff5-shlibs,
+       libusb-shlibs (>= 0.1.8-1),
+       libusb1-shlibs,
+       pango1-xft2-ft219-shlibs (>= 1.24.5-7),
        sane-backends-shlibs,
        x11
 <<
-# former BuildDepends, adjusted for gnome2: gimp2-default (>= 2.4.5-1), 
gimp2-dev (>= 2.4.5-1), sane-backends-dev (>= 1.0.19-1), libusb (>= 
0.1.12-1013), libpng3, libjpeg, libtiff, libmpeg, glib2, gtk+2, netpbm10, 
orbit2-dev, giflib, imlib, aalib (>= 1.4rc5-2), gnome-libs-dev, 
libgettext8-dev, gettext-bin, gettext-tools, libiconv-dev, libexif12, libgphoto2
 BuildDepends: <<
        atk1,
-       cairo,
+       cairo (>= 1.12.8),
        fink (>=0.32),
-       fontconfig2-dev,
-       freetype219,
+       fink-package-precedence,
+       fontconfig2-dev (>= 2.10.2-1),
+       freetype219 (>= 2.4.11-1),
        gettext-tools,
        gimp2-svg-default | gimp2-default,
        gimp2-svg-dev | gimp2-dev,
        glib2-dev,
-       glitz,
        gtk+2,
        gtk+2-dev,
        lcms2,
        libexif12,
        libgettext8-dev,
        libgphoto2,
-       libiconv-dev,
        libjpeg8,
-       libpng14,
-       libtiff,
-       libusb,
-       pango1-xft2-ft219-dev,
+       libpng16,
+       libtiff5,
+       libusb (>= 0.1.8-1),
+       libusb1,
+       pango1-xft2-ft219-dev (>= 1.24.5-7),
        pixman,
        pkgconfig,
        sane-backends-dev,
+       system-openssl-dev,
        x11-dev
 <<
 RuntimeDepends: default-icon-theme
-SetCPPFlags: -DDEFAULT_BROWSER=open
-SetLDFLAGS: -L%p/lib/pango-ft219/lib -L%p/lib/freetype219/lib 
-L%p/lib/fontconfig2/lib -lintl
+SetCPPFlags: -DDEFAULT_BROWSER=open -MD
+SetLDFLAGS: -lintl
 CompileScript: <<
-PKG_CONFIG_PATH=%p/lib/pango-ft219/lib/pkgconfig:%p/lib/fontconfig2/lib/pkgconfig:%p/lib/freetype219/lib/pkgconfig:${PKG_CONFIG_PATH}
 \
-gt_cv_func_gettext_libc=no ./configure %c
-cd lib && make && ranlib liblib.a
-make
+       gt_cv_func_gettext_libc=no ./configure %c
+       cd lib && make && ranlib liblib.a
+       make
+       ### these directories are empty and have bad permissions that break 
f-p-p
+       chmod 755 backend-po/de po/IMPORT_PO_DIR src/cursor
+       fink-package-precedence --depfile-ext='\.d' .
 <<
 InstallScript: <<
-make install prefix=%i sane_prefix=%i mandir=%i/share/man
+       make install prefix=%i sane_prefix=%i mandir=%i/share/man
 <<
 DocFiles: xsane.COPYING xsane.TODO
 DescPort: <<


------------------------------------------------------------------------------
This SF.net email is sponsored by Windows:

Build for Windows Store.

http://p.sf.net/sfu/windows-dev2dev
_______________________________________________
Fink-commits mailing list
Fink-commits@lists.sourceforge.net
http://news.gmane.org/gmane.os.apple.fink.cvs

Reply via email to