From f4a0dbcec1684caf3ae17d4a94d6cc9e2c6a537c Mon Sep 17 00:00:00 2001 From: marcus Date: Sat, 5 Oct 2002 16:22:51 +0000 Subject: Update to 0.20.0. --- graphics/gdk-pixbuf/files/patch-ab | 32 ++++++++++++++++++++------------ graphics/gdk-pixbuf/files/patch-ac | 35 ++++++++++++++++------------------- 2 files changed, 36 insertions(+), 31 deletions(-) (limited to 'graphics/gdk-pixbuf/files') diff --git a/graphics/gdk-pixbuf/files/patch-ab b/graphics/gdk-pixbuf/files/patch-ab index e0f301e0928b..ae0c38ff325e 100644 --- a/graphics/gdk-pixbuf/files/patch-ab +++ b/graphics/gdk-pixbuf/files/patch-ab @@ -1,20 +1,28 @@ - -$FreeBSD$ - ---- Makefile.in.orig Fri May 18 16:16:44 2001 -+++ Makefile.in Fri May 18 16:20:28 2001 -@@ -111,11 +111,11 @@ +--- Makefile.in.orig Sat Oct 5 01:19:24 2002 ++++ Makefile.in Sat Oct 5 01:20:58 2002 +@@ -115,22 +115,10 @@ bin_SCRIPTS = gdk-pixbuf-config -confexecdir = $(libdir) --confexec_DATA = gdk_pixbufConf.sh gdk_pixbuf_xlibConf.sh gnomecanvaspixbufConf.sh +-confexec_DATA = \ +- gdk_pixbufConf.sh \ +- gdk_pixbuf_xlibConf.sh \ +- gnomecanvaspixbufConf.sh +- +- +-EXTRA_DIST = \ +- gdk_pixbufConf.sh.in \ +- gdk_pixbuf_xlibConf.sh.in \ +- gnomecanvaspixbufConf.sh.in \ +- gdk-pixbuf-config.in \ +- gdk-pixbuf.m4 \ +- gdk-pixbuf.spec \ +- gdk-pixbuf.spec.in +confexecdir = $(sysconfdir) -+confexec_DATA = gdk_pixbufConf.sh gdk_pixbuf_xlibConf.sh @BUILD_CANVAS_ITEM_TRUE@gnomecanvaspixbufConf.sh - - --EXTRA_DIST = gdk_pixbufConf.sh.in gdk_pixbuf_xlibConf.sh.in gnomecanvaspixbufConf.sh.in gdk-pixbuf-config.in gdk-pixbuf.m4 gdk-pixbuf.spec gdk-pixbuf.spec.in -+EXTRA_DIST = gdk_pixbufConf.sh.in gdk_pixbuf_xlibConf.sh.in gdk-pixbuf-config.in gdk-pixbuf.m4 gdk-pixbuf.spec gdk-pixbuf.spec.in @BUILD_CANVAS_ITEM_TRUE@gnomecanvaspixbufConf.sh.in ++confexec_DATA = gdk_pixbufConf.sh gdk_pixbuf_xlibConf.sh @BUILD_CANVAS_ITEM_TRUE@gnomecanvaspixbufConf.sh ++EXTRA_DIST = gdk_pixbufConf.sh.in gdk_pixbuf_xlibConf.sh.in gdk-pixbuf-config.in gdk-pixbuf.m4 gdk-pixbuf.spec gdk-pixbuf.spec.in @BUILD_CANVAS_ITEM_TRUE@gnomecanvaspixbufConf.sh.in m4datadir = $(prefix)/share/aclocal + m4data_DATA = gdk-pixbuf.m4 diff --git a/graphics/gdk-pixbuf/files/patch-ac b/graphics/gdk-pixbuf/files/patch-ac index 6b9f790e654e..830e4a77accb 100644 --- a/graphics/gdk-pixbuf/files/patch-ac +++ b/graphics/gdk-pixbuf/files/patch-ac @@ -1,13 +1,10 @@ - -$FreeBSD$ - ---- gdk-pixbuf/Makefile.in.orig Thu Jun 20 19:26:31 2002 -+++ gdk-pixbuf/Makefile.in Thu Jun 20 19:34:19 2002 -@@ -129,71 +129,71 @@ +--- gdk-pixbuf/Makefile.in.orig Sat Oct 5 01:29:29 2002 ++++ gdk-pixbuf/Makefile.in Sat Oct 5 01:32:30 2002 +@@ -132,71 +132,71 @@ # 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) +libpixbufloader_png_la_LDFLAGS = -avoid-version -module +libpixbufloader_png_la_LIBADD = $(LIBPNG) libgdk_pixbuf.la $(GTK_LIBS) $(STATIC_LIB_DEPS) @@ -16,7 +13,7 @@ $FreeBSD$ # 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) +libpixbufloader_jpeg_la_LDFLAGS = -avoid-version -module +libpixbufloader_jpeg_la_LIBADD = $(LIBJPEG) libgdk_pixbuf.la $(GTK_LIBS) $(STATIC_LIB_DEPS) @@ -25,7 +22,7 @@ $FreeBSD$ # 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) +libpixbufloader_xpm_la_LDFLAGS = -avoid-version -module +libpixbufloader_xpm_la_LIBADD = libgdk_pixbuf.la $(GTK_LIBS) $(STATIC_LIB_DEPS) @@ -34,7 +31,7 @@ $FreeBSD$ # 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) +libpixbufloader_gif_la_LDFLAGS = -avoid-version -module +libpixbufloader_gif_la_LIBADD = libgdk_pixbuf.la $(GTK_LIBS) $(STATIC_LIB_DEPS) @@ -43,7 +40,7 @@ $FreeBSD$ # 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) +libpixbufloader_ico_la_LDFLAGS = -avoid-version -module +libpixbufloader_ico_la_LIBADD = libgdk_pixbuf.la $(GTK_LIBS) $(STATIC_LIB_DEPS) @@ -52,7 +49,7 @@ $FreeBSD$ # 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) +libpixbufloader_ras_la_LDFLAGS = -avoid-version -module +libpixbufloader_ras_la_LIBADD = libgdk_pixbuf.la $(GTK_LIBS) $(STATIC_LIB_DEPS) @@ -61,7 +58,7 @@ $FreeBSD$ # 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) +libpixbufloader_tiff_la_LDFLAGS = -avoid-version -module +libpixbufloader_tiff_la_LIBADD = $(LIBTIFF) libgdk_pixbuf.la $(GTK_LIBS) $(STATIC_LIB_DEPS) @@ -70,7 +67,7 @@ $FreeBSD$ # 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) +libpixbufloader_pnm_la_LDFLAGS = -avoid-version -module +libpixbufloader_pnm_la_LIBADD = libgdk_pixbuf.la $(GTK_LIBS) $(STATIC_LIB_DEPS) @@ -79,7 +76,7 @@ $FreeBSD$ # 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) +libpixbufloader_bmp_la_LDFLAGS = -avoid-version -module +libpixbufloader_bmp_la_LIBADD = libgdk_pixbuf.la $(GTK_LIBS) $(STATIC_LIB_DEPS) @@ -88,14 +85,14 @@ $FreeBSD$ # 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) +libpixbufloader_xbm_la_LDFLAGS = -avoid-version -module +libpixbufloader_xbm_la_LIBADD = libgdk_pixbuf.la $(GTK_LIBS) $(STATIC_LIB_DEPS) - @HAVE_PNG_TRUE@PNG_LIB = libpixbufloader-png.la + @HAVE_PNG_TRUE@PNG_LIB = @HAVE_PNG_TRUE@libpixbufloader-png.la -@@ -234,11 +234,11 @@ +@@ -259,11 +259,11 @@ LDADDS = libgdk_pixbuf.la $(GLIB_LIBS) $(GTK_LIBS) $(STATIC_LIB_DEPS) @@ -110,7 +107,7 @@ $FreeBSD$ GDK_PIXBUF_LIBS = $(GLIB_LIBS) $(GTK_LIBS) -@@ -343,7 +343,7 @@ +@@ -400,7 +400,7 @@ libpixbufloader_bmp_la_OBJECTS = io-bmp.lo libpixbufloader_xbm_la_DEPENDENCIES = libgdk_pixbuf.la libpixbufloader_xbm_la_OBJECTS = io-xbm.lo -- cgit