Update of /cvsroot/fink/dists/10.7/stable/main/finkinfo/graphics In directory vz-cvs-3.sog:/tmp/cvs-serv15637/graphics
Modified Files: cairo.info Log Message: sync png fixes from unstable Index: cairo.info =================================================================== RCS file: /cvsroot/fink/dists/10.7/stable/main/finkinfo/graphics/cairo.info,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- cairo.info 22 Jul 2011 16:48:03 -0000 1.2 +++ cairo.info 29 Jul 2011 00:00:48 -0000 1.3 @@ -1,6 +1,6 @@ Package: cairo Version: 1.8.10 -Revision: 34 +Revision: 35 Description: Vector graphics library License: BSD Maintainer: Benjamin Reed <ca...@fink.raccoonfink.com> @@ -12,6 +12,7 @@ BuildDepends: << fink (>= 0.30.2-1), fink-package-precedence (>= 0.7-1), + flag-sort (>= 0.4-1), fontconfig2-dev (>= 2.8.0-4), freetype219 (>= 2.3.12-1), glitz (>= 0.5.6-1), @@ -38,7 +39,7 @@ PatchScript: << patch -p1 < %{PatchFile} perl -pi -e 's,have_glitz_agl=yes,have_glitz_agl=no,g' configure - perl -pi -e 's,libpng12,libpng14,g' configure + perl -pi -e 's,libpng12,libpng,g' configure perl -pi -e 's,(POPPLER_VERSION_REQUIRED=).*,${1}99999.FORCE.NONDETECT,' configure perl -pi -e 's,(LIBRSVG_VERSION_REQUIRED=).*,${1}99999.FORCE.NONDETECT,' configure perl -pi -e 's,(SPECTRE_VERSION_REQUIRED=).*,${1}99999.FORCE.NONDETECT,' configure @@ -52,26 +53,31 @@ ConfigureParams: --build=%m-apple-darwin`uname -r|sed 's/\\..*//'` --disable-xcb --enable-dependency-tracking --disable-gtk-doc --enable-quartz --enable-quartz-font --disable-quartz-image --enable-png --enable-glitz --enable-ps --enable-pdf --disable-atsui --mandir=%p/share/man --disable-static CompileScript: << #!/bin/sh -ex - if [ -x /usr/bin/clang ]; then + if [[ $(sw_vers -productVersion | cut -d. -f1-2) > 10.6 ]]; then export CC="clang" elif [ -x /usr/bin/gcc-4.2 ]; then export CC="gcc-4.2" + else + export CC="gcc" fi export PKG_CONFIG_PATH="%p/lib/fontconfig2/lib/pkgconfig:`pwd`:$PKG_CONFIG_PATH" ac_cv_prog_GS= ./configure %c - # find . -name Makefile | xargs perl -pi -e 's,^CAIRO_CFLAGS = ,CAIRO_CFLAGS = -I%p/lib/fontconfig2/include ,' - make + + export CC="flag-sort -v -r $CC" + make CC="$CC" CPP="$CC -E" + fink-package-precedence --prohibit-bdep %n . << InstallScript: << #!/bin/sh -ex - make -j1 install DESTDIR=%d + make -j1 install DESTDIR="%d" perl -pi -e 's,xrender >= 0.6,,' %i/lib/pkgconfig/*.pc perl -pi -e 's,^(Libs.private:.*)$,$1 -lXrender -lXext,' %i/lib/pkgconfig/cairo.pc perl -pi -e 's,^(Cflags: .*)$,$1 -I/usr/X11R6/include -I/usr/X11/include,' %i/lib/pkgconfig/cairo.pc - perl -pi -e 's,libpng\d+,,; s,pixman-1 >= [\d\.]*,,' %i/lib/pkgconfig/*.pc + perl -pi -e 's,libpng,,g' %i/lib/pkgconfig/*.pc + perl -pi -e 's,pixman-1 >= [\d\.]+,,g' %i/lib/pkgconfig/*.pc << DocFiles: AUTHORS COPYING ChangeLog* INSTALL NEWS README SplitOff: << ------------------------------------------------------------------------------ Got Input? Slashdot Needs You. Take our quick survey online. Come on, we don't ask for help often. Plus, you'll get a chance to win $100 to spend on ThinkGeek. http://p.sf.net/sfu/slashdot-survey _______________________________________________ Fink-commits mailing list Fink-commits@lists.sourceforge.net http://news.gmane.org/gmane.os.apple.fink.cvs