summaryrefslogtreecommitdiff
path: root/graphics/gdk-pixbuf/files/patch-ac
diff options
context:
space:
mode:
Diffstat (limited to 'graphics/gdk-pixbuf/files/patch-ac')
-rw-r--r--graphics/gdk-pixbuf/files/patch-ac56
1 files changed, 18 insertions, 38 deletions
diff --git a/graphics/gdk-pixbuf/files/patch-ac b/graphics/gdk-pixbuf/files/patch-ac
index 5f4cee332a2a..17e89e54d7ee 100644
--- a/graphics/gdk-pixbuf/files/patch-ac
+++ b/graphics/gdk-pixbuf/files/patch-ac
@@ -1,91 +1,74 @@
---- gdk-pixbuf/Makefile.in.orig Sun Aug 27 18:48:25 2000
-+++ gdk-pixbuf/Makefile.in Mon Aug 28 10:23:26 2000
-@@ -121,64 +121,64 @@
- # The PNG plugin.
- #
+--- gdk-pixbuf/Makefile.in.orig Thu Mar 1 18:19:34 2001
++++ gdk-pixbuf/Makefile.in Wed Mar 7 18:34:01 2001
+@@ -123,4 +123,4 @@
libpixbufloader_png_la_SOURCES = io-png.c
-libpixbufloader_png_la_LDFLAGS = -version-info 1:0:0 -module
-libpixbufloader_png_la_LIBADD = $(LIBPNG)
+libpixbufloader_png_la_LDFLAGS = -avoid-version -module
+libpixbufloader_png_la_LIBADD = $(LIBPNG) libgdk_pixbuf.la $(GLIB_LIBS) $(GTK_LIBS) $(STATIC_LIB_DEPS)
- #
- # The JPEG loader
- #
+@@ -130,4 +130,4 @@
libpixbufloader_jpeg_la_SOURCES = io-jpeg.c
-libpixbufloader_jpeg_la_LDFLAGS = -version-info 1:0:0 -module
-libpixbufloader_jpeg_la_LIBADD = $(LIBJPEG)
+libpixbufloader_jpeg_la_LDFLAGS = -avoid-version -module
+libpixbufloader_jpeg_la_LIBADD = $(LIBJPEG) libgdk_pixbuf.la $(GLIB_LIBS) $(GTK_LIBS) $(STATIC_LIB_DEPS)
- #
- # The XPM loader
- #
+@@ -137,4 +137,4 @@
libpixbufloader_xpm_la_SOURCES = io-xpm.c
-libpixbufloader_xpm_la_LDFLAGS = -version-info 1:0:0 -module
-libpixbufloader_xpm_la_LIBADD =
+libpixbufloader_xpm_la_LDFLAGS = -avoid-version -module
+libpixbufloader_xpm_la_LIBADD = libgdk_pixbuf.la $(GLIB_LIBS) $(GTK_LIBS) $(STATIC_LIB_DEPS)
- #
- # The GIF loader
- #
+@@ -144,4 +144,4 @@
libpixbufloader_gif_la_SOURCES = io-gif.c
-libpixbufloader_gif_la_LDFLAGS = -version-info 1:0:0 -module
-libpixbufloader_gif_la_LIBADD =
+libpixbufloader_gif_la_LDFLAGS = -avoid-version -module
+libpixbufloader_gif_la_LIBADD = libgdk_pixbuf.la $(GLIB_LIBS) $(GTK_LIBS) $(STATIC_LIB_DEPS)
- #
- # The ICO loader
- #
+@@ -151,4 +151,4 @@
libpixbufloader_ico_la_SOURCES = io-ico.c
-libpixbufloader_ico_la_LDFLAGS = -version-info 1:0:0 -module
-libpixbufloader_ico_la_LIBADD =
+libpixbufloader_ico_la_LDFLAGS = -avoid-version -module
+libpixbufloader_ico_la_LIBADD = libgdk_pixbuf.la $(GLIB_LIBS) $(GTK_LIBS) $(STATIC_LIB_DEPS)
- #
- # The RAS loader
- #
+@@ -158,4 +158,4 @@
libpixbufloader_ras_la_SOURCES = io-ras.c
-libpixbufloader_ras_la_LDFLAGS = -version-info 1:0:0 -module
-libpixbufloader_ras_la_LIBADD =
+libpixbufloader_ras_la_LDFLAGS = -avoid-version -module
+libpixbufloader_ras_la_LIBADD = libgdk_pixbuf.la $(GLIB_LIBS) $(GTK_LIBS) $(STATIC_LIB_DEPS)
- #
- # The TIFF loader
- #
+@@ -165,4 +165,4 @@
libpixbufloader_tiff_la_SOURCES = io-tiff.c
-libpixbufloader_tiff_la_LDFLAGS = -version-info 1:0:0 -module
-libpixbufloader_tiff_la_LIBADD = $(LIBTIFF)
+libpixbufloader_tiff_la_LDFLAGS = -avoid-version -module
+libpixbufloader_tiff_la_LIBADD = $(LIBTIFF) libgdk_pixbuf.la $(GLIB_LIBS) $(GTK_LIBS) $(STATIC_LIB_DEPS)
- #
- # The PNM loader
- #
+@@ -172,4 +172,4 @@
libpixbufloader_pnm_la_SOURCES = io-pnm.c
-libpixbufloader_pnm_la_LDFLAGS = -version-info 1:0:0 -module
-libpixbufloader_pnm_la_LIBADD =
+libpixbufloader_pnm_la_LDFLAGS = -avoid-version -module
+libpixbufloader_pnm_la_LIBADD = libgdk_pixbuf.la $(GLIB_LIBS) $(GTK_LIBS) $(STATIC_LIB_DEPS)
- #
- # The BMP loader
- #
+@@ -179,4 +179,4 @@
libpixbufloader_bmp_la_SOURCES = io-bmp.c
-libpixbufloader_bmp_la_LDFLAGS = -version-info 1:0:0 -module
-libpixbufloader_bmp_la_LIBADD =
+libpixbufloader_bmp_la_LDFLAGS = -avoid-version -module
+libpixbufloader_bmp_la_LIBADD = libgdk_pixbuf.la $(GLIB_LIBS) $(GTK_LIBS) $(STATIC_LIB_DEPS)
- @HAVE_PNG_TRUE@PNG_LIB = libpixbufloader-png.la
-
-@@ -216,16 +216,16 @@
- AM_CPPFLAGS = "-DPIXBUF_LIBDIR=\"$(libexecdir)\""
-
+@@ -186,3 +186,3 @@
+ libpixbufloader_xbm_la_SOURCES = io-xbm.c
+-libpixbufloader_xbm_la_LDFLAGS = -version-info 1:0:0 -module
++libpixbufloader_xbm_la_LDFLAGS = -avoid-version -module
+ libpixbufloader_xbm_la_LIBADD =
+@@ -227,6 +227,6 @@
LDADDS = libgdk_pixbuf.la $(GLIB_LIBS) $(GTK_LIBS) $(STATIC_LIB_DEPS)
-@INSIDE_GNOME_LIBS_TRUE@test_gdk_pixbuf_LDADD = $(LDADDS) -lgmodule
-@INSIDE_GNOME_LIBS_FALSE@test_gdk_pixbuf_LDADD = $(LDADDS) $(GNOME_LIBS) -lgmodule
@@ -96,13 +79,10 @@
+@INSIDE_GNOME_LIBS_TRUE@testpixbuf_LDADD = $(LDADDS) `$(GLIB_CONFIG) --libs gmodule`
+@INSIDE_GNOME_LIBS_FALSE@testpixbuf_LDADD = $(LDADDS) $(GNOME_LIBS) `$(GLIB_CONFIG) --libs gmodule`
@INSIDE_GNOME_LIBS_TRUE@testpixbuf_drawable_LDADD = $(LDADDS)
- @INSIDE_GNOME_LIBS_FALSE@testpixbuf_drawable_LDADD = $(LDADDS) $(GNOME_LIBS)
- @INSIDE_GNOME_LIBS_TRUE@testpixbuf_scale_LDADD = $(LDADDS)
+@@ -235,4 +235,4 @@
@INSIDE_GNOME_LIBS_FALSE@testpixbuf_scale_LDADD = $(LDADDS) $(GNOME_LIBS)
-@INSIDE_GNOME_LIBS_TRUE@testanimation_LDADD = $(LDADDS) -lgmodule
-@INSIDE_GNOME_LIBS_FALSE@testanimation_LDADD = $(LDADDS) $(GNOME_LIBS) -lgmodule
+@INSIDE_GNOME_LIBS_TRUE@testanimation_LDADD = $(LDADDS) `$(GLIB_CONFIG) --libs gmodule`
+@INSIDE_GNOME_LIBS_FALSE@testanimation_LDADD = $(LDADDS) $(GNOME_LIBS) `$(GLIB_CONFIG) --libs gmodule`
- GDK_PIXBUF_LIBS = $(GLIB_LIBS) $(GTK_LIBS)
-