Update of /cvsroot/fink/dists/10.4/stable/main/finkinfo/graphics
In directory vz-cvs-3.sog:/tmp/cvs-serv25788
Modified Files:
imlib.info
Log Message:
don't pull in png.h fro X11. can't handle png > png14
Index: imlib.info
===================================================================
RCS file: /cvsroot/fink/dists/10.4/stable/main/finkinfo/graphics/imlib.info,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- imlib.info 16 Apr 2009 12:38:01 -0000 1.5
+++ imlib.info 11 Jul 2012 19:49:20 -0000 1.6
@@ -1,21 +1,22 @@
Package: imlib
Version: 1.9.15
-Revision: 1026
+Revision: 1027
Description: Image handling library for X11 and Gtk
License: GPL/LGPL
Maintainer: Benjamin Reed <im...@fink.racoonfink.com>
Depends: %N-shlibs (>= %v-%r)
BuildDepends: <<
+ fink-package-precedence,
freetype219,
libjpeg,
libtiff,
- libpng3,
+ libpng14,
netpbm,
giflib,
glib,
gtk+ (>= 1.2.10-20),
- libgettext3-dev,
+ libgettext8-dev,
gettext-bin,
gettext-tools,
libiconv-dev,
@@ -28,8 +29,11 @@
PatchScript: <<
perl -pi -e 's,need_relink=yes,need_relink=no,g;
s,hardcode_direct=yes,hardcode_direct=no,g; s,-flat_namespace -undefined
suppress,-undefined dynamic_lookup,g;' ltmain.sh configure
perl -pi -e 's/(AC_DEFUN\()([^[]+)(,)/\1\[\2]\3/' imlib.m4
+ ### GTK_CFLAGS carries -I/usr/X11R6/include (via gdk.pc) and that gets
passed before
+ ### -I%p/include, so png.h (> png3) from Xquartz can get passed, and
this = failure.
+ ### so shove -I%p/include before any non-local -I flags.
+ perl -pi -e 's|\$\(GTK_CFLAGS\)|-I%p/include $&|g' gdk_imlib/Makefile.in
<<
-
SetCPPFLAGS: -w -I%p/lib/freetype219/include/freetype2
-I%p/lib/freetype219/include -I%p/include
SetLDFLAGS: -L%p/lib/freetype219/lib
SetLIBS: -L%p/lib -L/usr/X11R6/lib -lX11 -lXext
@@ -37,6 +41,10 @@
NoSetLDFLAGS: true
ConfigureParams: --disable-shm --mandir=%p/share/man --disable-mmx
+CompileScript: <<
+ %{default_script}
+ fink-package-precedence --prohibit-bdep=imlib,imlib2 .
+<<
InstallScript: <<
make install DESTDIR=%d
perl -pi -e 's,^target=.*,target=x11,; s,^Cflags: ,Cflags:
-I%p/lib/freetype219/include ,' %i/lib/pkgconfig/*.pc
@@ -47,12 +55,12 @@
Depends: <<
freetype219-shlibs,
gtk+-shlibs (>= 1.2.10-20),
- libgettext3-shlibs,
+ libgettext8-shlibs,
libiconv,
libjpeg-bin,
libtiff-bin,
giflib-bin,
- libpng3-shlibs,
+ libpng14-shlibs,
netpbm-bin,
x11-shlibs
<<
------------------------------------------------------------------------------
Live Security Virtual Conference
Exclusive live event will cover all the ways today's security and
threat landscape has changed and how IT managers can respond. Discussions
will include endpoint security, mobile security and the latest in malware
threats. http://www.accelacomm.com/jaw/sfrnl04242012/114/50122263/
_______________________________________________
Fink-commits mailing list
Fink-commits@lists.sourceforge.net
http://news.gmane.org/gmane.os.apple.fink.cvs
