Update of /cvsroot/fink/dists/10.4/stable/main/finkinfo/graphics
In directory vz-cvs-3.sog:/tmp/cvs-serv9255
Modified Files:
gd2.info gd2.patch
Log Message:
latest version to stable
Index: gd2.patch
===================================================================
RCS file: /cvsroot/fink/dists/10.4/stable/main/finkinfo/graphics/gd2.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- gd2.patch 11 Feb 2011 05:30:31 -0000 1.3
+++ gd2.patch 6 Oct 2011 05:24:15 -0000 1.4
@@ -1,3 +1,29 @@
+--- gd-2.0.35.orig/config/gdlib-config.in 2006-10-11 05:46:22.000000000
-0400
++++ gd-2.0.35/config/gdlib-config.in 2011-08-09 21:02:10.000000000 -0400
+@@ -68,10 +68,10 @@
+ echo @GDLIB_REVISION@
+ ;;
+ --ldflags)
+- echo @LDFLAGS@
++ echo -L@libdir@
+ ;;
+ --libs)
+- echo @LIBS@ @LIBICONV@
++ echo
+ ;;
+ --cflags|--includes)
+ echo -I@includedir@
+@@ -83,8 +83,8 @@
+ echo "GD library @VERSION@"
+ echo "includedir: $includedir"
+ echo "cflags: -I@includedir@"
+- echo "ldflags: @LDFLAGS@"
+- echo "libs: @LIBS@ @LIBICONV@"
++ echo "ldflags: -L@libdir@"
++ echo "libs: "
+ echo "libdir: $libdir"
+ echo "features: @FEATURES@"
+ ;;
--- ./configure.ac.orig 2007-04-25 07:48:41.000000000 -0500
+++ ./configure.ac 2010-02-12 01:37:29.000000000 -0600
@@ -342,20 +342,20 @@
@@ -6,8 +32,8 @@
-# libpng12.so is a nightmare. We have to test separately for
-# libpng12-config and libpng-config. If we find libpng12-config,
-+# libpng14.so is a nightmare. We have to test separately for
-+# libpng14-config and libpng-config. If we find libpng14-config,
++# libpng15.so is a nightmare. We have to test separately for
++# libpng15-config and libpng-config. If we find libpng15-config,
# we don't look for the other, which will just be a symlink to it,
# confusing autoconf into thinking the library itself will be named -lpng,
# which it won't be. Awful. This code will suffice unless the libpng
@@ -15,15 +41,15 @@
if test "$withval" != no; then
- AC_PATH_PROG([LIBPNG12_CONFIG], [libpng12-config])
-+ AC_PATH_PROG([LIBPNG14_CONFIG], [libpng14-config])
++ AC_PATH_PROG([LIBPNG15_CONFIG], [libpng15-config])
AC_PATH_PROG([LIBPNG_CONFIG], [libpng-config])
- if test -n "$LIBPNG12_CONFIG"; then
- libpng_CPPFLAGS=`libpng12-config --cflags`
-+ if test -n "$LIBPNG14_CONFIG"; then
-+ libpng_CPPFLAGS=`libpng14-config --cflags`
++ if test -n "$LIBPNG15_CONFIG"; then
++ libpng_CPPFLAGS=`libpng15-config --cflags`
# should be --ldopts, but it's currently broken
- libpng_LDFLAGS=`libpng12-config --ldflags`
-+ libpng_LDFLAGS=`libpng14-config --ldflags`
++ libpng_LDFLAGS=`libpng15-config --ldflags`
libpng_LDFLAGS=`echo " $libpng_LDFLAGS" | sed 's/ -l[[^ ]][[^ ]]*//g'`
elif test -n "$LIBPNG_CONFIG"; then
libpng_CPPFLAGS=`libpng-config --cflags`
@@ -34,9 +60,9 @@
- if test -n "$LIBPNG12_CONFIG"; then
- AC_CHECK_LIB(png12,png_create_read_struct,
- [LIBS="-lpng12 $LIBS"
-+ if test -n "$LIBPNG14_CONFIG"; then
-+ AC_CHECK_LIB(png14,png_create_read_struct,
-+ [LIBS="-lpng14 $LIBS"
++ if test -n "$LIBPNG15_CONFIG"; then
++ AC_CHECK_LIB(png15,png_create_read_struct,
++ [LIBS="-lpng15 $LIBS"
FEATURES="GD_PNG $FEATURES"
AC_DEFINE(HAVE_LIBPNG, 1, [ Define if you have the png library. ])],
[LDFLAGS="$_ldflags"
@@ -45,10 +71,10 @@
fi
-#TBB: png12's png_create_read_struct is just as good
-+#TBB: png14's png_create_read_struct is just as good
++#TBB: png15's png_create_read_struct is just as good
#2.0.23: should be = not ==
-if test "$ac_cv_lib_png12_png_create_read_struct" = yes; then
-+if test "$ac_cv_lib_png14_png_create_read_struct" = yes; then
++if test "$ac_cv_lib_png15_png_create_read_struct" = yes; then
ac_cv_lib_png_png_create_read_struct=yes
fi
Index: gd2.info
===================================================================
RCS file: /cvsroot/fink/dists/10.4/stable/main/finkinfo/graphics/gd2.info,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- gd2.info 11 Feb 2011 05:30:03 -0000 1.6
+++ gd2.info 6 Oct 2011 05:24:15 -0000 1.7
@@ -1,6 +1,6 @@
Package: gd2
Version: 2.0.35
-Revision: 9
+Revision: 11
Depends: %N-shlibs (= %v-%r)
BuildDepends: <<
autoconf2.6,
@@ -13,7 +13,7 @@
gettext-tools,
libiconv-dev,
libjpeg8 (>= 8-2),
- libpng14,
+ libpng15,
libtool2,
x11-dev
<<
@@ -23,9 +23,13 @@
Source-MD5: 6c6c3dbb7bf079e0bb5fbbfd3bb8a71c
SetCPPFLAGS: -I%p/lib/fontconfig2/include
SetLDFLAGS: -L%p/lib/fontconfig2/lib
-ConfigureParams: --with-fontconfig=%p/lib/fontconfig2
--x-includes=/usr/X11R6/include --x-libraries=/usr/X11R6/lib
--enable-dependency-tracking
+ConfigureParams: --with-fontconfig=%p/lib/fontconfig2
--x-includes=/usr/X11R6/include --x-libraries=/usr/X11R6/lib
--enable-dependency-tracking --disable-static
PatchFile: gd2.patch
-PatchFile-MD5: d32c3cb1afea7b094dbf0cae20594a98
+PatchFile-MD5: ee8b68f14a6d1bf0fb74b724461a9d4c
+PatchScript: <<
+ #!/bin/sh -ev
+ %{default_script}
+<<
CompileScript: <<
autoreconf -fi
./configure %c
@@ -41,7 +45,7 @@
freetype219-shlibs (>= 2.3.12-1),
libiconv,
libjpeg8-shlibs (>= 8-2),
- libpng14-shlibs,
+ libpng15-shlibs,
x11-shlibs
<<
Replaces: gd209-shlibs
@@ -59,7 +63,7 @@
libiconv,
libjpeg-bin (>= 8-2),
libjpeg8-shlibs (>= 8-2),
- libpng14-shlibs,
+ libpng15-shlibs,
x11
<<
Conflicts: gd-bin, gd2-nox-bin, gd209-bin
@@ -94,6 +98,11 @@
DescPackaging: <<
This package is based on previous work by Chris Pepper, Jeremy Higgs
and Peter O'Gorman. Previously maintained by Christoph Pfisterer.
+
+ dmacks removed static libs and cleared internal-use-only
+ dependencies' flags from gdlib-config (all .dylib symbols
+ resolved via dyld so no need to force InheritedBuildDepends)
+ as of 2.0.35-11
<<
License: OSI-Approved
Homepage: http://www.libgd.org/
------------------------------------------------------------------------------
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. Business sense. IT sense. Common sense.
http://p.sf.net/sfu/splunk-d2dcopy1
_______________________________________________
Fink-commits mailing list
[email protected]
http://news.gmane.org/gmane.os.apple.fink.cvs
