1 files changed, 19 insertions, 84 deletions
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.