Update of /cvsroot/fink/dists/10.4/unstable/main/finkinfo/gnome In directory sc8-pr-cvs5.sourceforge.net:/tmp/cvs-serv29170/10.4/unstable/main/finkinfo/gnome
Modified Files: gdk-pixbuf.info Added Files: gdk-pixbuf.patch Log Message: Overhaul the ancient build system; fix linking issues Index: gdk-pixbuf.info =================================================================== RCS file: /cvsroot/fink/dists/10.4/unstable/main/finkinfo/gnome/gdk-pixbuf.info,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- gdk-pixbuf.info 2 Feb 2006 05:39:18 -0000 1.2 +++ gdk-pixbuf.info 9 Aug 2006 00:02:49 -0000 1.3 @@ -1,29 +1,37 @@ Package: gdk-pixbuf Version: 0.22.0 -Revision: 12 +Revision: 13 Depends: %N-shlibs (= %v-%r) -BuildDepends: libtiff, libjpeg, libpng3, glib, gtk+ (>= 1.2.10-20), gnome-libs-dev, imlib (>= 1.9.14-2), esound, audiofile, libgettext3-dev, gettext-bin, gettext-tools, x11-dev, libiconv-dev +BuildDepends: libtiff, libjpeg, libpng3, glib, gtk+ (>= 1.2.10-20), gnome-libs-dev, imlib (>= 1.9.14-2), esound, audiofile, libgettext3-dev, gettext-bin, gettext-tools, x11-dev, libiconv-dev, autoconf, libtool14 BuildDependsOnly: True Source: mirror:gnome:sources/%n/0.22/%n-%v.tar.bz2 Source-MD5: 05fcb68ceaa338614ab650c775efc2f2 +Patch: %n.patch PatchScript: << - perl -pi -e 's,gdk-pixbuf demo doc,gdk-pixbuf doc,g' Makefile.in - perl -pi -e 's,libgdk_pixbuf.la \$\(GTK_LIBS\),\$\(GTK_LIBS\),g' gdk-pixbuf/Makefile.in - perl -pi -e 's,DEPENDENCIES = libgdk_pixbuf.la,DEPENDENCIES =,g' gdk-pixbuf/Makefile.in - perl -pi -e 's,^libgdk_pixbuf.la\n,,g' gdk-pixbuf/Makefile.in - perl -pi -e 's,libgdk_pixbuf_xlib_la_DEPENDENCIES = pixops/libpixops.la \\,libgdk_pixbuf_xlib_la_DEPENDENCIES = pixops/libpixops.la,g' gdk-pixbuf/Makefile.in - perl -pi -e 's,LIBADD = pixops/libpixops.la,LIBADD = pixops/pixops.lo,g' gdk-pixbuf/Makefile.in - perl -pi -e 's,-flat_namespace -undefined suppress,-undefined dynamic_lookup,g' configure - perl -pi -e 's,need_relink=yes,need_relink=no,g' ltmain.sh + # disable demos + perl -pi -e 's,demo\S*,,,g' Makefile.am configure.in + + # clean up syntax weirdness + perl -ni -e 'print unless /^#.*\\/' doc/Makefile.am + + # "libexec" appears to be a reserved or magical name in new automake + perl -pi -e 's/libexec/loader/g' gdk-pixbuf/Makefile.am + + # fix .m4 syntax for use by modern automake in other packages perl -pi -e 's/(AC_DEFUN\()(\S+)(,)/\1\[\2]\3/' gdk-pixbuf.m4 << SetCPPFLAGS: -no-cpp-precomp ConfigureParams: --disable-gtk-doc +CompileScript: << + autoreconf -f -i + ./configure %c + make +<< InstallScript: make install DESTDIR=%d SplitOff: << Package: %N-shlibs Replaces: gdk-pixbuf (<< 0.16.0-2) - Depends: libtiff-shlibs, libjpeg-shlibs, libpng3-shlibs, glib-shlibs, gtk+-shlibs (>= 1.2.10-20), gnome-libs-shlibs, imlib-shlibs (>= 1.9.14-2), esound-shlibs, audiofile-shlibs, libgettext3-shlibs, x11 + Depends: libtiff-shlibs, libjpeg-shlibs, libpng3-shlibs, glib-shlibs, gtk+-shlibs (>= 1.2.10-20), gnome-libs-shlibs, imlib-shlibs (>= 1.9.14-2), esound-shlibs, audiofile-shlibs, libgettext3-shlibs, x11, libiconv Files: << lib/gdk-pixbuf/loaders/*.so lib/libgdk_pixbuf.2.0.0.dylib @@ -50,7 +58,11 @@ << License: GPL/LGPL Homepage: http://www.gnome.org/ -Maintainer: None <fink-devel@lists.sourceforge.net> +Maintainer: The Gnome Core Team <[EMAIL PROTECTED]> DescPackaging: << Originally packaged by Masanori Sekino. + + Easier to just modernize the autotool template files and rerun + autoconf than to patch a lot of flags in the distributed files + generated by an ancient autotools. << --- NEW FILE: gdk-pixbuf.patch --- diff -Nurd -x'*~' gdk-pixbuf-0.22.0.orig/configure.in gdk-pixbuf-0.22.0/configure.in --- gdk-pixbuf-0.22.0.orig/configure.in 2002-12-18 17:18:18.000000000 -0500 +++ gdk-pixbuf-0.22.0/configure.in 2006-08-08 19:10:45.000000000 -0400 @@ -26,6 +26,7 @@ AC_PROG_MAKE_SET AC_PROG_CPP AC_PATH_XTRA +AM_PROG_AS dnl Initialize maintainer mode AM_MAINTAINER_MODE @@ -147,18 +148,18 @@ dnl Test for libtiff if test -z "$LIBTIFF"; then AC_CHECK_LIB(tiff, TIFFReadScanline, - AC_CHECK_HEADER(tiffio.h, + [AC_CHECK_HEADER(tiffio.h, TIFF='tiff'; LIBTIFF='-ltiff', - AC_MSG_WARN(*** TIFF loader will not be built (TIFF header files not found) ***)), - AC_CHECK_LIB(tiff, TIFFWriteScanline, - AC_CHECK_HEADER(tiffio.h, + AC_MSG_WARN(*** TIFF loader will not be built (TIFF header files not found) ***))], + [AC_CHECK_LIB(tiff, TIFFWriteScanline, + [AC_CHECK_HEADER(tiffio.h, TIFF='tiff'; LIBTIFF='-ltiff -ljpeg -lz', - AC_MSG_WARN(*** TIFF loader will not be built (TIFF header files not found) ***)), - AC_CHECK_LIB(tiff34, TIFFFlushData, - AC_CHECK_HEADER(tiffio.h, + AC_MSG_WARN(*** TIFF loader will not be built (TIFF header files not found) ***))], + [AC_CHECK_LIB(tiff34, TIFFFlushData, + [AC_CHECK_HEADER(tiffio.h, TIFF='tiff'; LIBTIFF='-ltiff34 -ljpeg -lz', - AC_MSG_WARN(*** TIFF loader will not be built (TIFF header files not found) ***)), - AC_MSG_WARN(*** TIFF plug-in will not be built (TIFF library not found) ***), -ljpeg -lz -lm), -ljpeg -lz -lm), -lm) + AC_MSG_WARN(*** TIFF loader will not be built (TIFF header files not found) ***))], + AC_MSG_WARN(*** TIFF plug-in will not be built (TIFF library not found) ***), -ljpeg -lz -lm)], -ljpeg -lz -lm)], -lm) fi dnl Test for libjpeg @@ -191,9 +192,9 @@ dnl Test for libpng if test -z "$LIBPNG"; then AC_CHECK_LIB(png, png_read_info, - AC_CHECK_HEADER(png.h, + [AC_CHECK_HEADER(png.h, png_ok=yes, - png_ok=no), + png_ok=no)], AC_MSG_WARN(*** PNG loader will not be built (PNG library not found) ***), -lz -lm) if test "$png_ok" = yes; then AC_MSG_CHECKING([for png_structp in png.h]) diff -Nurd -x'*~' gdk-pixbuf-0.22.0.orig/gdk-pixbuf/Makefile.am gdk-pixbuf-0.22.0/gdk-pixbuf/Makefile.am --- gdk-pixbuf-0.22.0.orig/gdk-pixbuf/Makefile.am 2002-09-11 11:55:52.000000000 -0400 +++ gdk-pixbuf-0.22.0/gdk-pixbuf/Makefile.am 2006-08-08 19:43:25.000000000 -0400 @@ -17,6 +17,7 @@ $(CANVAS_PIXBUF_LIB) libgnomecanvaspixbuf_la_LDFLAGS = -version-info 1:0:0 $(EXTRA_GNOME_LIBS) +libgnomecanvaspixbuf_la_LIBADD = libgdk_pixbuf.la libexecdir = $(libdir)/gdk-pixbuf/loaders ------------------------------------------------------------------------- Using Tomcat but need to do more? Need to support web services, security? Get stuff done quickly with pre-integrated technology to make your job easier Download IBM WebSphere Application Server v.1.0.1 based on Apache Geronimo http://sel.as-us.falkag.net/sel?cmd=lnk&kid=120709&bid=263057&dat=121642 _______________________________________________ Fink-commits mailing list Fink-commits@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/fink-commits