Update of /cvsroot/fink/dists/10.4/stable/main/finkinfo/10.4-EOL/graphics In directory vz-cvs-3.sog:/tmp/cvs-serv9752
Modified Files: cairo.info cairomm1.info Log Message: sync. w/ 10.!4/stable, validated on powerpc-darwin8 Index: cairo.info =================================================================== RCS file: /cvsroot/fink/dists/10.4/stable/main/finkinfo/10.4-EOL/graphics/cairo.info,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- cairo.info 11 Jul 2011 04:08:32 -0000 1.1 +++ cairo.info 18 Nov 2011 20:24:57 -0000 1.2 @@ -1,6 +1,6 @@ Package: cairo Version: 1.8.10 -Revision: 3 +Revision: 5 Description: Vector graphics library License: BSD Maintainer: Benjamin Reed <ca...@fink.raccoonfink.com> @@ -10,16 +10,17 @@ pkgconfig (>= 0.23-1) << BuildDepends: << - fink (>= 0.29.7-1), - fink-package-precedence, + 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), - gtk-doc (>= 1.13-5), + gtk-doc (>= 1.17-2), pixman (>= 0.16.0-1), pkgconfig (>= 0.23-1), libgl-dev, - libpng14, + libpng15, x11-dev << BuildDependsOnly: true @@ -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 @@ -47,29 +48,36 @@ PatchFile: %n.patch PatchFile-MD5: c0035b1abb5c8a39fd0d111e3e1f4aff -SetCFLAGS: -Os +SetCFLAGS: -Os -isystem /usr/include UseMaxBuildJobs: true -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 +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 --mandir=%p/share/man --disable-static CompileScript: << -#!/bin/sh -ex - if [ -x /usr/bin/gcc-4.2 ]; then - export CC="gcc-4.2" + #!/bin/sh -ex + 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: << @@ -79,7 +87,7 @@ freetype219-shlibs (>= 2.3.12-1), glitz-shlibs (>= 0.5.6-1), libgl-shlibs, - libpng14-shlibs, + libpng15-shlibs, pixman-shlibs (>= 0.16.0-1), x11-shlibs << Index: cairomm1.info =================================================================== RCS file: /cvsroot/fink/dists/10.4/stable/main/finkinfo/10.4-EOL/graphics/cairomm1.info,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- cairomm1.info 11 Jul 2011 04:08:32 -0000 1.1 +++ cairomm1.info 18 Nov 2011 20:24:57 -0000 1.2 @@ -27,7 +27,6 @@ Source-MD5: 559afbc47484ba3fad265e38a3dafe90 PatchScript: << %{default_script} - perl -pi -e 's/-version-info/-no-undefined -version-info/' libxml++/Makefile.in << PatchFile: %n.patch PatchFile-MD5: e055c751895d45a8e3e151364b46c1fa ------------------------------------------------------------------------------ All the data continuously generated in your IT infrastructure contains a definitive record of customers, application performance, security threats, fraudulent activity, and more. Splunk takes this data and makes sense of it. IT sense. And common sense. http://p.sf.net/sfu/splunk-novd2d _______________________________________________ Fink-commits mailing list Fink-commits@lists.sourceforge.net http://news.gmane.org/gmane.os.apple.fink.cvs