Update to 0.22. Remove dependency on auto* by adding patches for the

generated files.

(Not portability) changes since 0.18:
* Made the GIF loader handle animations with frames whose bounds go outside
  of the base image's bounds (Federico).
* Made the GIF loader handle zero-sized frames that GifBuilder and
  similar crap spits sometimes (Federico).
* The PNM loader doesn't abort() anymore if it cannot allocate memory
  (Federico).
* Fixed a g_object_unref() -> gdk_pixbuf_unref() thinko (Federico).
* Merged the patch from Red Hat Linux 8.0 to fix the crash on
  corrupted/short GIFs - Ximian 29040 (patch by Elliot Lee).
* Fixed the RGB 565 LSB -> MSB case in gdk-pixbuf-drawable - 79463
  (Federico).
* Fixed the update region notification in the BMP loader (Federico).
* Merged the BMP loader changes from GTK+ HEAD -- check all reallocs,
  fix 16bpp BI_RGB thinko, properly handle BI_RLE4 and skips and jumps
  (changes by Matthias Clasen).
* Merged the ICO loader changes from GTK+ HEAD (changes by Matthias
  Clasen).
* Merged changes from gtk+/gdk-pixbuf HEAD into the JPEG loader --
  fixes CMYK JPEG problems (changes by Matthias Clasen).

6 files changed, 70 insertions, 118 deletions

diff --git a/graphics/gdk-pixbuf/Makefile b/graphics/gdk-pixbuf/Makefile
index 9f03d4abbd2..877dc92fa44 100644
--- a/graphics/gdk-pixbuf/Makefile
+++ b/graphics/gdk-pixbuf/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.24 2002/09/11 10:12:38 jlam Exp $
+# $NetBSD: Makefile,v 1.25 2003/01/15 21:03:25 wiz Exp $
 #
 
 .include "Makefile.common"
@@ -9,8 +9,9 @@ COMMENT=	the GNOME image loading library
 # XXX hopefully there is no x.gnome-config.x in PATH
 post-patch:
 	${SED} -e 's/gnome-config/x.gnome-config.x/g' \
-	  ${WRKSRC}/configure.in >${WRKSRC}/.tmp && \
-	${MV} ${WRKSRC}/.tmp ${WRKSRC}/configure.in
+	  ${WRKSRC}/configure >${WRKSRC}/.tmp && \
+	${MV} ${WRKSRC}/.tmp ${WRKSRC}/configure
+	${CHMOD} a+x ${WRKSRC}/configure
 
 post-configure:
 	${SED} -e 's/ doc$$//' ${WRKSRC}/Makefile >${WRKSRC}/.tmp && \
diff --git a/graphics/gdk-pixbuf/Makefile.common b/graphics/gdk-pixbuf/Makefile.common
index e3885e3f135..e5e89e678ad 100644
--- a/graphics/gdk-pixbuf/Makefile.common
+++ b/graphics/gdk-pixbuf/Makefile.common
@@ -1,20 +1,21 @@
-# $NetBSD: Makefile.common,v 1.28 2002/10/02 22:08:44 wiz Exp $
+# $NetBSD: Makefile.common,v 1.29 2003/01/15 21:03:25 wiz Exp $
 #
 
-DISTNAME=		gdk-pixbuf-0.18.0
+DISTNAME=		gdk-pixbuf-${VER}.0
 CATEGORIES=		graphics devel
-MASTER_SITES=		${MASTER_SITE_GNOME:=unstable/sources/gdk-pixbuf/}
+MASTER_SITES=		${MASTER_SITE_GNOME:=sources/gdk-pixbuf/${VER}/}
+EXTRACT_SUFX=		.tar.bz2
 
 MAINTAINER=		packages@netbsd.org
 HOMEPAGE=		http://www.gnome.org/
 
-AUTOCONF_REQD=		2.13
-AUTOMAKE_REQD=		1.4
+VER=			0.22
+
 USE_BUILDLINK2=		YES
 USE_GMAKE=		YES
 USE_X11BASE=		YES
 USE_LIBTOOL=		YES
-LTCONFIG_OVERRIDE=	${WRKSRC}/ltconfig
+LIBTOOL_OVERRIDE=	${WRKSRC}/libtool
 
 GNU_CONFIGURE=		YES
 CONFIGURE_ENV+=		path_rgb_txt="${X11BASE}/lib/X11/rgb.txt"
@@ -25,15 +26,7 @@ PLIST_SUBST+=		LOCALBASE=${LOCALBASE}
 DISTINFO_FILE=		${.CURDIR}/../gdk-pixbuf/distinfo
 PATCHDIR=		${.CURDIR}/../gdk-pixbuf/patches
 
-pre-configure:
-	cd ${WRKSRC};							\
-	${ACLOCAL};							\
-	${AUTOHEADER};							\
-	${AUTOMAKE} -a --foreign -i;					\
-	${AUTOCONF}
-
 .include "../../graphics/jpeg/buildlink2.mk"
 .include "../../graphics/png/buildlink2.mk"
 .include "../../graphics/tiff/buildlink2.mk"
 .include "../../x11/gtk/buildlink2.mk"
-.include "../../mk/automake.mk"
diff --git a/graphics/gdk-pixbuf/distinfo b/graphics/gdk-pixbuf/distinfo
index 603cdb0dffd..542dd37e101 100644
--- a/graphics/gdk-pixbuf/distinfo
+++ b/graphics/gdk-pixbuf/distinfo
@@ -1,8 +1,9 @@
-$NetBSD: distinfo,v 1.11 2002/10/20 22:37:36 bouyer Exp $
+$NetBSD: distinfo,v 1.12 2003/01/15 21:03:25 wiz Exp $
 
-SHA1 (gdk-pixbuf-0.18.0.tar.gz) = 203b022878d1b8cca1197711ee80cd3d916a980e
-Size (gdk-pixbuf-0.18.0.tar.gz) = 546229 bytes
+SHA1 (gdk-pixbuf-0.22.0.tar.bz2) = 495324afb5abebc14567ffd5a6cd72333bcc7f5b
+Size (gdk-pixbuf-0.22.0.tar.bz2) = 398208 bytes
 SHA1 (patch-aa) = 484feb3482c6832a33f428ce0db26719452dd274
+SHA1 (patch-ab) = 2edd8fdd72d5dfaecc92974c6930e5d175e3b69f
 SHA1 (patch-ac) = 16fc33898fc1cb10b3e11ee26e7ea046d1f68032
-SHA1 (patch-ad) = 4a16e30eda46b55f51f87785e5f76ea33d3bd8ed
-SHA1 (patch-ae) = 2edd8fdd72d5dfaecc92974c6930e5d175e3b69f
+SHA1 (patch-ad) = 5c834eceaea7cef2ae964bba586c1e90ea4d0684
+SHA1 (patch-ae) = 515ae7a1946db5b8959287f0db101d64a97ab628
diff --git a/graphics/gdk-pixbuf/patches/patch-ab b/graphics/gdk-pixbuf/patches/patch-ab
new file mode 100644
index 00000000000..5a6629778ce
--- /dev/null
+++ b/graphics/gdk-pixbuf/patches/patch-ab
@@ -0,0 +1,20 @@
+$NetBSD: patch-ab,v 1.3 2003/01/15 21:03:26 wiz Exp $
+
+--- configure.in.orig	Thu Apr 18 18:48:40 2002
++++ configure.in
+@@ -128,6 +128,7 @@
+ dnl Check for location of rgb.txt file (works without, but better with)
+ AC_MSG_CHECKING([for location of rgb.txt database])
+ 
++if test -z "$path_rgb_txt"; then
+ dnl default to this..
+ path_rgb_txt=/usr/lib/X11/rgb.txt
+ 
+@@ -140,6 +141,7 @@
+       break
+     fi
+   done
++fi
+ fi
+ AC_MSG_RESULT([$path_rgb_txt])
+ AC_DEFINE_UNQUOTED(PATH_RGB_TXT,"$path_rgb_txt")
diff --git a/graphics/gdk-pixbuf/patches/patch-ad b/graphics/gdk-pixbuf/patches/patch-ad
index ce8954572f2..5cc2563e41d 100644
--- a/graphics/gdk-pixbuf/patches/patch-ad
+++ b/graphics/gdk-pixbuf/patches/patch-ad
@@ -1,85 +1,20 @@
-$NetBSD: patch-ad,v 1.4 2002/08/25 18:39:05 jlam Exp $
+$NetBSD: patch-ad,v 1.5 2003/01/15 21:03:26 wiz Exp $
 
---- gdk-pixbuf/Makefile.am.orig	Fri Jan  4 12:54:48 2002
-+++ gdk-pixbuf/Makefile.am
-@@ -24,70 +24,70 @@
- # The PNG plugin.
- #
- libpixbufloader_png_la_SOURCES = io-png.c
--libpixbufloader_png_la_LDFLAGS = -version-info 1:0:0 -module
-+libpixbufloader_png_la_LDFLAGS = -module -avoid-version
- libpixbufloader_png_la_LIBADD = $(LIBPNG) libgdk_pixbuf.la $(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_LDFLAGS = -module -avoid-version
- libpixbufloader_jpeg_la_LIBADD = $(LIBJPEG) libgdk_pixbuf.la $(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_LDFLAGS = -module -avoid-version
- libpixbufloader_xpm_la_LIBADD = libgdk_pixbuf.la $(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_LDFLAGS = -module -avoid-version
- libpixbufloader_gif_la_LIBADD = libgdk_pixbuf.la $(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_LDFLAGS = -module -avoid-version
- libpixbufloader_ico_la_LIBADD = libgdk_pixbuf.la $(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_LDFLAGS = -module -avoid-version
- libpixbufloader_ras_la_LIBADD = libgdk_pixbuf.la $(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_LDFLAGS = -module -avoid-version
- libpixbufloader_tiff_la_LIBADD = $(LIBTIFF) libgdk_pixbuf.la $(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_LDFLAGS = -module -avoid-version
- libpixbufloader_pnm_la_LIBADD = libgdk_pixbuf.la $(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_LDFLAGS = -module -avoid-version
- libpixbufloader_bmp_la_LIBADD = libgdk_pixbuf.la $(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_LDFLAGS = -module -avoid-version
- libpixbufloader_xbm_la_LIBADD = libgdk_pixbuf.la $(GTK_LIBS)
- 
- if HAVE_PNG
+--- gdk-pixbuf/pixops/Makefile.in.orig	Wed Dec 18 23:19:33 2002
++++ gdk-pixbuf/pixops/Makefile.in
+@@ -381,6 +372,15 @@ all-redirect all-am all installdirs most
+ distclean-generic clean-generic maintainer-clean-generic clean \
+ mostlyclean distclean maintainer-clean
+ 
++
++ifeq (m68k,$(findstring m68k,$(host_alias)))
++pixops.o: pixops.c
++	$(COMPILE) -O -c $<
++
++pixops.lo: pixops.c
++	$(LIBTOOL) --mode=compile $(COMPILE) -O -c $<
++
++ endif
+ 
+ # Tell versions [3.59,3.63) of GNU make to not export all variables.
+ # Otherwise a system limit (for SysV at least) may be exceeded.
diff --git a/graphics/gdk-pixbuf/patches/patch-ae b/graphics/gdk-pixbuf/patches/patch-ae
index c58d7425943..65d7e00fae1 100644
--- a/graphics/gdk-pixbuf/patches/patch-ae
+++ b/graphics/gdk-pixbuf/patches/patch-ae
@@ -1,20 +1,22 @@
-$NetBSD: patch-ae,v 1.3 2002/08/25 18:39:06 jlam Exp $
+$NetBSD: patch-ae,v 1.4 2003/01/15 21:03:26 wiz Exp $
 
---- configure.in.orig	Thu Apr 18 18:48:40 2002
-+++ configure.in
-@@ -128,6 +128,7 @@
- dnl Check for location of rgb.txt file (works without, but better with)
- AC_MSG_CHECKING([for location of rgb.txt database])
+--- configure.orig	Wed Dec 18 23:18:48 2002
++++ configure
+@@ -9214,6 +9214,7 @@ fi
+ echo "$as_me:9214: checking for location of rgb.txt database" >&5
+ echo $ECHO_N "checking for location of rgb.txt database... $ECHO_C" >&6
  
 +if test -z "$path_rgb_txt"; then
- dnl default to this..
  path_rgb_txt=/usr/lib/X11/rgb.txt
  
-@@ -140,6 +141,7 @@
-       break
+ if test -r ${x_libraries}/X11/rgb.txt; then
+@@ -9226,7 +9227,8 @@ else
      fi
    done
-+fi
  fi
- AC_MSG_RESULT([$path_rgb_txt])
- AC_DEFINE_UNQUOTED(PATH_RGB_TXT,"$path_rgb_txt")
+-echo "$as_me:9229: result: $path_rgb_txt" >&5
++fi
++echo "$as_me:$LINENO: result: $path_rgb_txt" >&5
+ echo "${ECHO_T}$path_rgb_txt" >&6
+ cat >>confdefs.h <<EOF
+ #define PATH_RGB_TXT "$path_rgb_txt"