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

Modified Files:
        libzbar-py.info libzbar0-gtk.info libzbar0-qt.info 
        libzbar0.info 
Log Message:
dep ugprades


Index: libzbar0-qt.info
===================================================================
RCS file: /cvsroot/fink/dists/10.7/stable/main/finkinfo/utils/libzbar0-qt.info,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- libzbar0-qt.info    26 Jun 2013 17:27:19 -0000      1.1
+++ libzbar0-qt.info    20 Aug 2013 13:54:47 -0000      1.2
@@ -1,16 +1,15 @@
 Info2: <<
 Package: libzbar0-qt%type_pkg[qt]
 Version: 0.10
-Revision: 2
+Revision: 3
 Source: mirror:sourceforge:zbar/zbar-%v.tar.bz2
 Source-MD5: 0fd61eb590ac1bab62a77913c8b086a5
 
 Type: qt (-x11)
 BuildDepends: <<
-       fink (>= 0.24.12-1),
        fink-package-precedence,
        libzbar0 (>= %v-1),
-       libjpeg8,
+       libjpeg9,
        pkgconfig,
        qt4-base%type_pkg[qt] (>= 4.6.0-1),
        x11-dev,
@@ -62,7 +61,7 @@
        Files: lib/qt4%type_pkg[qt]/lib/libzbarqt.0.*
        Depends: <<
                libzbar0-shlibs (>= %v-1),
-               libjpeg8-shlibs,
+               libjpeg9-shlibs,
                qt4-base%type_pkg[qt]-qtgui-shlibs (>= 4.6.0-1),
                qt4-base%type_pkg[qt]-qtcore-shlibs (>= 4.6.0-1)
        <<

Index: libzbar0-gtk.info
===================================================================
RCS file: 
/cvsroot/fink/dists/10.7/stable/main/finkinfo/utils/libzbar0-gtk.info,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- libzbar0-gtk.info   26 Jun 2013 17:27:19 -0000      1.1
+++ libzbar0-gtk.info   20 Aug 2013 13:54:46 -0000      1.2
@@ -1,20 +1,18 @@
 Package: libzbar0-gtk
 Version: 0.10
-Revision: 1
+Revision: 2
 Source: mirror:sourceforge:zbar/zbar-%v.tar.bz2
 Source-MD5: 0fd61eb590ac1bab62a77913c8b086a5
 
 BuildDepends: <<
        atk1 (>= 1.28.0-1),
-       cairo (>= 1.8.8-3),
-       fink (>= 0.24.12-1),
+       cairo (>= 1.12.8-1),
        fink-package-precedence,
-       fontconfig2-dev (>= 2.8.0-4),
-       freetype219 (>= 2.3.12-1),
+       fontconfig2-dev (>= 2.10.0-1),
+       freetype219 (>= 2.4.11-1),
        glib2-dev (>= 2.22.0-1),
-       glitz,
        gtk+2-dev (>= 2.18.0-1),
-       libjpeg8,
+       libjpeg9,
        libzbar0 (>= %v-1),
        pango1-xft2-ft219-dev (>= 1.24.5-4),
        pixman (>= 0.18.0-1),
@@ -47,7 +45,7 @@
        LDFLAGS="$LDFLAGS $ZBAR_LIBS"
 
        # special stuff for gtk
-       export 
PKG_CONFIG_PATH="%p/lib/glib-2.0/pkgconfig-strict:%p/lib/fontconfig2/lib/pkgconfig:$PKG_CONFIG_PATH"
+       export 
PKG_CONFIG_PATH="%p/lib/glib-2.0/pkgconfig-strict:$PKG_CONFIG_PATH"
 
        ./configure %c
        make
@@ -67,15 +65,14 @@
        Files: lib/libzbargtk.0.*
        Depends: <<
                atk1-shlibs (>= 1.28.0-1),
-               cairo-shlibs (>= 1.8.8-3),
-               fontconfig2-shlibs (>= 2.8.0-4),
-               freetype219-shlibs (>= 2.3.12-1),
+               cairo-shlibs (>= 1.12.8-1),
+               fontconfig2-shlibs (>= 2.10.0-1),
+               freetype219-shlibs (>= 2.4.11-1),
                glib2-shlibs (>= 2.22.0-1),
                gtk+2-shlibs (>= 2.18.0-1),
-               libjpeg8-shlibs,
+               libjpeg9-shlibs,
                libzbar0-shlibs (>= %v-1),
-               pango1-xft2-ft219-shlibs (>= 1.24.5-4),
-               x11-shlibs
+               pango1-xft2-ft219-shlibs (>= 1.24.5-4)
        <<
        Shlibs: %p/lib/libzbargtk.0.dylib 1.0.0 %n (>= 0.10-1)
        DocFiles: COPYING ChangeLog HACKING NEWS README TODO

Index: libzbar0.info
===================================================================
RCS file: /cvsroot/fink/dists/10.7/stable/main/finkinfo/utils/libzbar0.info,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- libzbar0.info       16 Feb 2013 15:53:12 -0000      1.1
+++ libzbar0.info       20 Aug 2013 13:54:47 -0000      1.2
@@ -1,13 +1,13 @@
 Package: libzbar0
 Version: 0.10
-Revision: 1
+Revision: 2
 Source: mirror:sourceforge:zbar/zbar-%v.tar.bz2
 Source-MD5: 0fd61eb590ac1bab62a77913c8b086a5
 
 BuildDepends: <<
        fink-package-precedence,
        libiconv-dev,
-       libjpeg8,
+       libjpeg9,
        pkgconfig,
        x11-dev,
        xmlto
@@ -15,6 +15,9 @@
 Depends: %n-shlibs (= %v-%r)
 BuildDependsOnly: true
 
+PatchFile: %n.patch
+PatchFile-MD5: 06a476dec5e026808e58cbe7df5f517b
+
 ConfigureParams: --enable-dependency-tracking --disable-video 
--without-imagemagick --without-npapi --without-gtk --without-python 
--without-qt --disable-static
 CompileScript: <<
        %{default_script}
@@ -35,7 +38,7 @@
        Depends: <<
                dpkg-base-files,
                libiconv,
-               libjpeg8-shlibs,
+               libjpeg9-shlibs,
                x11-shlibs
        <<
        Shlibs: %p/lib/libzbar.0.dylib 3.0.0 %n (>= 0.10-1)
@@ -49,6 +52,8 @@
        This is just the basic lib; removing the should-be-empty bin
        dir without -f makes sure we didn't accidentally build any
        front-end programs. Likewise with man1 (pages for programs).
+
+       Fix zbar/jpeg.c fill_input_buffer() return-type for libjpeg9
 <<
 
 Description: Multiformat barcode scanning/decoding library

Index: libzbar-py.info
===================================================================
RCS file: /cvsroot/fink/dists/10.7/stable/main/finkinfo/utils/libzbar-py.info,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- libzbar-py.info     26 Jun 2013 17:27:19 -0000      1.1
+++ libzbar-py.info     20 Aug 2013 13:54:46 -0000      1.2
@@ -1,44 +1,40 @@
 Info2: <<
 Package: libzbar-py%type_pkg[python]
 Version: 0.10
-Revision: 1
+Revision: 2
 Source: mirror:sourceforge:zbar/zbar-%v.tar.bz2
 Source-MD5: 0fd61eb590ac1bab62a77913c8b086a5
 Type: python (2.6 2.7)
 
 BuildDepends: <<
        atk1 (>= 1.28.0-1),
-       cairo (>= 1.8.8-3),
-       expat1,
-       fink (>= 0.24.12-1),
-       fontconfig2-dev (>= 2.8.0-4),
-       freetype219 (>= 2.3.12-1),
+       cairo (>= 1.12.8-1),
+       fink-package-precedence,
+       fontconfig2-dev (>= 2.10.0-1),
+       freetype219 (>= 2.4.11-1),
        glib2-dev (>= 2.22.0-1),
-       glitz,
        gtk+2-dev (>= 2.18.0-1),
        libzbar0 (>= %v-1),
        libzbar0-gtk (>= %v-1),
-       libjpeg8,
+       libjpeg9,
        pango1-xft2-ft219-dev (>= 1.24.5-4),
-       pixman (>= 0.18.0-1),
        pkgconfig,
        python%type_pkg[python],
        pygtk2-gtk-py%type_pkg[python]-dev (>= 2.16.0-1),
        pygobject2-py%type_pkg[python]-dev (>= 2.20.0-1),
        x11-dev,
-       xft2-dev,
        xmlto
 <<
 Depends: <<
        atk1-shlibs (>= 1.28.0-1),
-       cairo-shlibs (>= 1.8.8-3),
-       fontconfig2-shlibs (>= 2.8.0-4),
-       freetype219-shlibs (>= 2.3.12-1),
+       cairo-shlibs (>= 1.12.8-1),
+       fontconfig2-shlibs (>= 2.10.0-1),
+       freetype219-shlibs (>= 2.4.11-1),
        glib2-shlibs (>= 2.22.0-1),
        gtk+2-shlibs (>= 2.18.0-1),
        libzbar0-shlibs (>= %v-1),
        libzbar0-gtk-shlibs (>= %v-1),
-       libjpeg8-shlibs,
+       libjpeg9-shlibs,
        pango1-xft2-ft219-shlibs (>= 1.24.5-4),
        python%type_pkg[python],
        pygtk2-gtk-py%type_pkg[python] (>= 2.16.0-1),
@@ -62,7 +58,7 @@
 CompileScript: <<
 #!/bin/sh -ex
        # special stuff for gtk
-       export 
PKG_CONFIG_PATH="%p/lib/glib-2.0/pkgconfig-strict:%p/lib/fontconfig2/lib/pkgconfig:$PKG_CONFIG_PATH"
+       export 
PKG_CONFIG_PATH="%p/lib/glib-2.0/pkgconfig-strict:$PKG_CONFIG_PATH"
 
        # gather flags for installed zebra & zebra-gtk
        ZBAR_CFLAGS=`%p/bin/pkg-config --cflags zbar-gtk`


------------------------------------------------------------------------------
Introducing Performance Central, a new site from SourceForge and 
AppDynamics. Performance Central is your source for news, insights, 
analysis and resources for efficient Application Performance Management. 
Visit us today!
http://pubads.g.doubleclick.net/gampad/clk?id=48897511&iu=/4140/ostg.clktrk
_______________________________________________
Fink-commits mailing list
Fink-commits@lists.sourceforge.net
http://news.gmane.org/gmane.os.apple.fink.cvs

Reply via email to