Update of /cvsroot/fink/dists/10.4/stable/main/finkinfo/gnome
In directory sc8-pr-cvs17:/tmp/cvs-serv16002
Modified Files:
gdk-pixbuf.info gdk-pixbuf.patch
Log Message:
latest version to stable
Index: gdk-pixbuf.info
===================================================================
RCS file: /cvsroot/fink/dists/10.4/stable/main/finkinfo/gnome/gdk-pixbuf.info,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- gdk-pixbuf.info 14 Mar 2007 23:43:48 -0000 1.4
+++ gdk-pixbuf.info 6 Oct 2007 16:13:02 -0000 1.5
@@ -1,18 +1,36 @@
Package: gdk-pixbuf
-Version: 0.18.0
-Revision: 12
+Version: 0.22.0
+Revision: 13
Depends: %N-shlibs (= %v-%r)
-BuildDepends: libtiff, libjpeg, libpng3, glib, gtk+ (>= 1.2.10-20),
gnome-libs-dev, orbit-dev, imlib (>= 1.9.14-2), esound, gettext-dev,
gettext-bin, gettext-tools, audiofile, 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,
automake1.9
BuildDependsOnly: True
-Source: mirror:gnome:sources/%n/0.18/%n-%v.tar.bz2
-Source-MD5: 104053625e0344fe9a464905043e950c
+Source: mirror:gnome:sources/%n/0.22/%n-%v.tar.bz2
+Source-MD5: 05fcb68ceaa338614ab650c775efc2f2
Patch: %n.patch
-ConfigureParams: --disable-gtk-doc
+PatchScript: <<
+ # 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
+<<
+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: libpng3-shlibs, gnome-libs-shlibs
+ 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
@@ -39,7 +57,11 @@
<<
License: GPL/LGPL
Homepage: http://www.gnome.org/
-Maintainer: None <[EMAIL PROTECTED]>
+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.
<<
Index: gdk-pixbuf.patch
===================================================================
RCS file: /cvsroot/fink/dists/10.4/stable/main/finkinfo/gnome/gdk-pixbuf.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- gdk-pixbuf.patch 20 Jan 2006 20:12:53 -0000 1.1
+++ gdk-pixbuf.patch 6 Oct 2007 16:13:02 -0000 1.2
@@ -1,190 +1,62 @@
-diff -Naur gdk-pixbuf-0.18.0.old/Makefile.in gdk-pixbuf-0.18.0.tmp/Makefile.in
---- gdk-pixbuf-0.18.0.old/Makefile.in Wed Jun 19 03:17:00 2002
-+++ gdk-pixbuf-0.18.0.tmp/Makefile.in Sat Jun 22 05:58:21 2002
-@@ -111,7 +111,7 @@
- STRIP_END = @STRIP_END@
- VERSION = @VERSION@
-
--SUBDIRS = gdk-pixbuf demo doc
-+SUBDIRS = gdk-pixbuf doc
-
- bin_SCRIPTS = gdk-pixbuf-config
-
-diff -Naur gdk-pixbuf-0.18.0.old/configure gdk-pixbuf-0.18.0.tmp/configure
---- gdk-pixbuf-0.18.0.old/configure Wed Jun 19 03:11:21 2002
-+++ gdk-pixbuf-0.18.0.tmp/configure Sat Jun 22 05:58:58 2002
-@@ -4392,7 +4392,7 @@
- # FIXME: Relying on posixy $() will cause problems for
- # cross-compilation, but unfortunately the echo tests do not
- # yet detect zsh echo's removal of \ escapes.
-- archive_cmds='$nonopt $(test "x$module" = xyes && echo -bundle || echo
-dynamiclib) $allow_undefined_flag -o $lib $libobjs $deplibs$linker_flags
-install_name $rpath/$soname $verstring'
-+ archive_cmds='$nonopt $(test "x$module" = xyes && echo -bundle || echo
-dynamiclib) $allow_undefined_flag -o $lib $libobjs $deplibs$linker_flags
-install_name $rpath/$soname $tmp_verstring'
- # We need to add '_' to the symbols in $export_symbols first
- #archive_expsym_cmds="$archive_cmds"' && strip -s $export_symbols'
- hardcode_direct=yes
-diff -Naur gdk-pixbuf-0.18.0.old/gdk-pixbuf/Makefile.in
gdk-pixbuf-0.18.0.tmp/gdk-pixbuf/Makefile.in
---- gdk-pixbuf-0.18.0.old/gdk-pixbuf/Makefile.in Wed Jun 19 03:17:03 2002
-+++ gdk-pixbuf-0.18.0.tmp/gdk-pixbuf/Makefile.in Sat Jun 22 06:00:52 2002
-@@ -130,70 +130,70 @@
- #
- libpixbufloader_png_la_SOURCES = io-png.c
- libpixbufloader_png_la_LDFLAGS = -version-info 1:0:0 -module
--libpixbufloader_png_la_LIBADD = $(LIBPNG) libgdk_pixbuf.la $(GTK_LIBS)
-+libpixbufloader_png_la_LIBADD = $(LIBPNG) $(GTK_LIBS)
-
- #
- # The JPEG loader
- #
- libpixbufloader_jpeg_la_SOURCES = io-jpeg.c
- libpixbufloader_jpeg_la_LDFLAGS = -version-info 1:0:0 -module
--libpixbufloader_jpeg_la_LIBADD = $(LIBJPEG) libgdk_pixbuf.la $(GTK_LIBS)
-+libpixbufloader_jpeg_la_LIBADD = $(LIBJPEG) $(GTK_LIBS)
-
- #
- # The XPM loader
- #
- libpixbufloader_xpm_la_SOURCES = io-xpm.c
- libpixbufloader_xpm_la_LDFLAGS = -version-info 1:0:0 -module
--libpixbufloader_xpm_la_LIBADD = libgdk_pixbuf.la $(GTK_LIBS)
-+libpixbufloader_xpm_la_LIBADD = $(GTK_LIBS)
-
- #
- # The GIF loader
- #
- libpixbufloader_gif_la_SOURCES = io-gif.c
- libpixbufloader_gif_la_LDFLAGS = -version-info 1:0:0 -module
--libpixbufloader_gif_la_LIBADD = libgdk_pixbuf.la $(GTK_LIBS)
-+libpixbufloader_gif_la_LIBADD = $(GTK_LIBS)
-
- #
- # The ICO loader
- #
- libpixbufloader_ico_la_SOURCES = io-ico.c
- libpixbufloader_ico_la_LDFLAGS = -version-info 1:0:0 -module
--libpixbufloader_ico_la_LIBADD = libgdk_pixbuf.la $(GTK_LIBS)
-+libpixbufloader_ico_la_LIBADD = $(GTK_LIBS)
-
- #
- # The RAS loader
- #
- libpixbufloader_ras_la_SOURCES = io-ras.c
- libpixbufloader_ras_la_LDFLAGS = -version-info 1:0:0 -module
--libpixbufloader_ras_la_LIBADD = libgdk_pixbuf.la $(GTK_LIBS)
-+libpixbufloader_ras_la_LIBADD = $(GTK_LIBS)
-
- #
- # The TIFF loader
- #
- libpixbufloader_tiff_la_SOURCES = io-tiff.c
- libpixbufloader_tiff_la_LDFLAGS = -version-info 1:0:0 -module
--libpixbufloader_tiff_la_LIBADD = $(LIBTIFF) libgdk_pixbuf.la $(GTK_LIBS)
-+libpixbufloader_tiff_la_LIBADD = $(LIBTIFF) $(GTK_LIBS)
-
- #
- # The PNM loader
- #
- libpixbufloader_pnm_la_SOURCES = io-pnm.c
- libpixbufloader_pnm_la_LDFLAGS = -version-info 1:0:0 -module
--libpixbufloader_pnm_la_LIBADD = libgdk_pixbuf.la $(GTK_LIBS)
-+libpixbufloader_pnm_la_LIBADD = $(GTK_LIBS)
-
- #
- # The BMP loader
- #
- libpixbufloader_bmp_la_SOURCES = io-bmp.c
- libpixbufloader_bmp_la_LDFLAGS = -version-info 1:0:0 -module
--libpixbufloader_bmp_la_LIBADD = libgdk_pixbuf.la $(GTK_LIBS)
-+libpixbufloader_bmp_la_LIBADD = $(GTK_LIBS)
-
- #
- # The XBM loader
- #
- libpixbufloader_xbm_la_SOURCES = io-xbm.c
- libpixbufloader_xbm_la_LDFLAGS = -version-info 1:0:0 -module
--libpixbufloader_xbm_la_LIBADD = libgdk_pixbuf.la $(GTK_LIBS)
-+libpixbufloader_xbm_la_LIBADD = $(GTK_LIBS)
-
- @[EMAIL PROTECTED] = libpixbufloader-png.la
+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
-@@ -262,7 +262,7 @@
+ 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)
- libgdk_pixbuf_xlib_la_LDFLAGS = -version-info 2:0:0 -export-dynamic
$(GLIB_LIBS) $(X11_LIBS)
--libgdk_pixbuf_xlib_la_LIBADD = pixops/libpixops.la libgdk_pixbuf.la
$(GTK_LIBS)
-+libgdk_pixbuf_xlib_la_LIBADD = pixops/libpixops.la $(GTK_LIBS)
+ libgnomecanvaspixbuf_la_LDFLAGS = -version-info 1:0:0 $(EXTRA_GNOME_LIBS)
++libgnomecanvaspixbuf_la_LIBADD = libgdk_pixbuf.la
- libgdk_pixbufinclude_HEADERS = gdk-pixbuf.h
gdk-pixbuf-loader.h gdk-pixbuf-features.h
gdk-pixbuf-xlib.h gdk-pixbuf-xlibrgb.h
$(CANVAS_PIXBUF_HEADERFILES)
+ libexecdir = $(libdir)/gdk-pixbuf/loaders
-@@ -299,8 +299,7 @@
- @[EMAIL PROTECTED] gdk-pixbuf-render.lo \
- @[EMAIL PROTECTED] gdk-pixbuf-util.lo \
- @[EMAIL PROTECTED]
--libgdk_pixbuf_xlib_la_DEPENDENCIES = pixops/libpixops.la \
--libgdk_pixbuf.la
-+libgdk_pixbuf_xlib_la_DEPENDENCIES = pixops/libpixops.la
- @[EMAIL PROTECTED] = \
- @[EMAIL PROTECTED] gdk-pixbuf-xlib.lo \
- @[EMAIL PROTECTED] gdk-pixbuf-data.lo \
-@@ -323,25 +322,25 @@
- libgnomecanvaspixbuf_la_LIBADD =
- @[EMAIL PROTECTED] = \
- @[EMAIL PROTECTED]
--libpixbufloader_png_la_DEPENDENCIES = libgdk_pixbuf.la
-+libpixbufloader_png_la_DEPENDENCIES =
- libpixbufloader_png_la_OBJECTS = io-png.lo
--libpixbufloader_jpeg_la_DEPENDENCIES = libgdk_pixbuf.la
-+libpixbufloader_jpeg_la_DEPENDENCIES =
- libpixbufloader_jpeg_la_OBJECTS = io-jpeg.lo
--libpixbufloader_gif_la_DEPENDENCIES = libgdk_pixbuf.la
-+libpixbufloader_gif_la_DEPENDENCIES =
- libpixbufloader_gif_la_OBJECTS = io-gif.lo
--libpixbufloader_ico_la_DEPENDENCIES = libgdk_pixbuf.la
-+libpixbufloader_ico_la_DEPENDENCIES =
- libpixbufloader_ico_la_OBJECTS = io-ico.lo
--libpixbufloader_ras_la_DEPENDENCIES = libgdk_pixbuf.la
-+libpixbufloader_ras_la_DEPENDENCIES =
- libpixbufloader_ras_la_OBJECTS = io-ras.lo
--libpixbufloader_xpm_la_DEPENDENCIES = libgdk_pixbuf.la
-+libpixbufloader_xpm_la_DEPENDENCIES =
- libpixbufloader_xpm_la_OBJECTS = io-xpm.lo
--libpixbufloader_tiff_la_DEPENDENCIES = libgdk_pixbuf.la
-+libpixbufloader_tiff_la_DEPENDENCIES =
- libpixbufloader_tiff_la_OBJECTS = io-tiff.lo
--libpixbufloader_pnm_la_DEPENDENCIES = libgdk_pixbuf.la
-+libpixbufloader_pnm_la_DEPENDENCIES =
- libpixbufloader_pnm_la_OBJECTS = io-pnm.lo
--libpixbufloader_bmp_la_DEPENDENCIES = libgdk_pixbuf.la
-+libpixbufloader_bmp_la_DEPENDENCIES =
- libpixbufloader_bmp_la_OBJECTS = io-bmp.lo
--libpixbufloader_xbm_la_DEPENDENCIES = libgdk_pixbuf.la
-+libpixbufloader_xbm_la_DEPENDENCIES =
- libpixbufloader_xbm_la_OBJECTS = io-xbm.lo
- noinst_PROGRAMS = test-gdk-pixbuf$(EXEEXT) testpixbuf$(EXEEXT) \
- testpixbuf-drawable$(EXEEXT) testanimation$(EXEEXT) \
-diff -Naur gdk-pixbuf-0.18.0.old/ltmain.sh gdk-pixbuf-0.18.0.tmp/ltmain.sh
---- gdk-pixbuf-0.18.0.old/ltmain.sh Wed Jun 19 03:11:09 2002
-+++ gdk-pixbuf-0.18.0.tmp/ltmain.sh Sat Jun 22 05:58:22 2002
-@@ -2924,7 +2924,23 @@
- if test -n "$export_symbols" && test -n "$archive_expsym_cmds"; then
- eval cmds=\"$archive_expsym_cmds\"
- else
-+ if test "x$verstring" = "x0.0"; then
-+ tmp_verstring=
-+ else
-+ tmp_verstring="$verstring"
-+ fi
-+ save_deplibs="$deplibs"
-+ for conv in $convenience; do
-+ tmp_deplibs=
-+ for test_deplib in $deplibs; do
-+ if test "$test_deplib" != "$conv"; then
-+ tmp_deplibs="$tmp_deplibs $test_deplib"
-+ fi
-+ done
-+ deplibs="$tmp_deplibs"
-+ done
- eval cmds=\"$archive_cmds\"
-+ deplibs="$save_deplibs"
- fi
- save_ifs="$IFS"; IFS='~'
- for cmd in $cmds; do
-------------------------------------------------------------------------
This SF.net email is sponsored by: Splunk Inc.
Still grepping through log files to find problems? Stop.
Now Search log events and configuration files using AJAX and a browser.
Download your FREE copy of Splunk now >> http://get.splunk.com/
_______________________________________________
Fink-commits mailing list
Fink-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/fink-commits
