diff options
Diffstat (limited to 'graphics')
-rw-r--r-- | graphics/gdk-pixbuf/Makefile | 3 | ||||
-rw-r--r-- | graphics/gdk-pixbuf/distinfo | 2 | ||||
-rw-r--r-- | graphics/gdk-pixbuf/files/patch-aa | 15 | ||||
-rw-r--r-- | graphics/gdk-pixbuf/files/patch-ac | 56 | ||||
-rw-r--r-- | graphics/gdk-pixbuf/pkg-plist | 9 | ||||
-rw-r--r-- | graphics/imlib/Makefile | 2 | ||||
-rw-r--r-- | graphics/imlib/distinfo | 2 | ||||
-rw-r--r-- | graphics/imlib/files/patch-Imlib_Makefile.in | 12 | ||||
-rw-r--r-- | graphics/imlib/files/patch-Makefile.in | 24 | ||||
-rw-r--r-- | graphics/imlib/files/patch-gdk__imlib_Makefile.in | 12 |
10 files changed, 65 insertions, 72 deletions
diff --git a/graphics/gdk-pixbuf/Makefile b/graphics/gdk-pixbuf/Makefile index 13e424472868..37f463134815 100644 --- a/graphics/gdk-pixbuf/Makefile +++ b/graphics/gdk-pixbuf/Makefile @@ -6,8 +6,7 @@ # PORTNAME= gdk-pixbuf -PORTVERSION= 0.9.0 -PORTREVISION= 1 +PORTVERSION= 0.11.0 CATEGORIES= graphics gnome MASTER_SITES= ${MASTER_SITE_GNOME} MASTER_SITE_SUBDIR= unstable/sources/gdk-pixbuf diff --git a/graphics/gdk-pixbuf/distinfo b/graphics/gdk-pixbuf/distinfo index 983f2546f476..d15e5386d632 100644 --- a/graphics/gdk-pixbuf/distinfo +++ b/graphics/gdk-pixbuf/distinfo @@ -1 +1 @@ -MD5 (gdk-pixbuf-0.9.0.tar.gz) = 7cdb44cfc573fb492f203fdf1d69908c +MD5 (gdk-pixbuf-0.11.0.tar.gz) = a4a61cadff79b27c0b1e1ab6e93baf79 diff --git a/graphics/gdk-pixbuf/files/patch-aa b/graphics/gdk-pixbuf/files/patch-aa index 07fb9e2237e9..be2a0e43badc 100644 --- a/graphics/gdk-pixbuf/files/patch-aa +++ b/graphics/gdk-pixbuf/files/patch-aa @@ -1,13 +1,14 @@ ---- configure.orig Tue Nov 9 15:22:08 1999 -+++ configure Mon Nov 15 14:07:02 1999 -@@ -3078,8 +3078,8 @@ - #define USE_GMODULE 1 - EOF +--- configure.orig Thu Apr 26 18:41:47 2001 ++++ configure Fri Apr 27 16:39:52 2001 +@@ -3593,4 +3593,4 @@ - GMODULE_LIBS="`glib-config --libs gmodule`" - GMODULE_FLAGS="`glib-config --cflags gmodule`" + GMODULE_LIBS="`$GLIB_CONFIG --libs gmodule`" + GMODULE_FLAGS="`$GLIB_CONFIG --cflags gmodule`" - - echo "$ac_t""yes" 1>&6 +@@ -4470,3 +4470,3 @@ + if test "x$with_html_dir" = "x" ; then +- HTML_DIR='${datadir}/gnome/html' ++ HTML_DIR='${datadir}/html' + else 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) - diff --git a/graphics/gdk-pixbuf/pkg-plist b/graphics/gdk-pixbuf/pkg-plist index a6162edd75cc..ea0265e42bd5 100644 --- a/graphics/gdk-pixbuf/pkg-plist +++ b/graphics/gdk-pixbuf/pkg-plist @@ -16,6 +16,7 @@ lib/gdk-pixbuf/loaders/libpixbufloader-png.so lib/gdk-pixbuf/loaders/libpixbufloader-pnm.so lib/gdk-pixbuf/loaders/libpixbufloader-ras.so lib/gdk-pixbuf/loaders/libpixbufloader-tiff.so +lib/gdk-pixbuf/loaders/libpixbufloader-xbm.so lib/gdk-pixbuf/loaders/libpixbufloader-xpm.so lib/libgdk_pixbuf.a lib/libgdk_pixbuf.so @@ -27,11 +28,6 @@ lib/libgnomecanvaspixbuf.a lib/libgnomecanvaspixbuf.so lib/libgnomecanvaspixbuf.so.1 share/aclocal/gdk-pixbuf.m4 -share/gnome/html/gdk-pixbuf-decl.txt -share/gnome/html/gdk-pixbuf-sections.txt -share/gnome/html/gdk-pixbuf.hierarchy -share/gnome/html/gdk-pixbuf.html -share/gnome/html/gdk-pixbuf.types share/gnome/html/gdk-pixbuf/a2605.html share/gnome/html/gdk-pixbuf/a3640.html share/gnome/html/gdk-pixbuf/a3652.html @@ -56,6 +52,7 @@ share/gnome/html/gdk-pixbuf/gdk-pixbuf-util.html share/gnome/html/gdk-pixbuf/gdkpixbufloader.html share/gnome/html/gdk-pixbuf/gnomecanvaspixbuf.html share/gnome/html/gdk-pixbuf/index.html +share/gnome/html/gdk-pixbuf/index.sgml share/gnome/html/gdk-pixbuf/license.html share/gnome/html/gdk-pixbuf/r15.html share/gnome/html/gdk-pixbuf/r27.html @@ -70,6 +67,6 @@ share/gnome/html/gdk-pixbuf/x3735.html share/gnome/html/gdk-pixbuf/x3765.html share/gnome/html/gdk-pixbuf/x3787.html @dirrm share/gnome/html/gdk-pixbuf -@dirrm include/gdk-pixbuf @dirrm lib/gdk-pixbuf/loaders @dirrm lib/gdk-pixbuf +@dirrm include/gdk-pixbuf diff --git a/graphics/imlib/Makefile b/graphics/imlib/Makefile index 197e5eb9e8f5..277ff03411f5 100644 --- a/graphics/imlib/Makefile +++ b/graphics/imlib/Makefile @@ -6,7 +6,7 @@ # PORTNAME= imlib -PORTVERSION= 1.9.9 +PORTVERSION= 1.9.10 CATEGORIES= graphics MASTER_SITES= ${MASTER_SITE_GNOME} MASTER_SITE_SUBDIR= stable/sources/imlib diff --git a/graphics/imlib/distinfo b/graphics/imlib/distinfo index f4c4847e6294..bb81fe7a4cf4 100644 --- a/graphics/imlib/distinfo +++ b/graphics/imlib/distinfo @@ -1 +1 @@ -MD5 (imlib-1.9.9.tar.gz) = 19debabef3175e36d33bc3e357ed3f9b +MD5 (imlib-1.9.10.tar.gz) = 47323fff0f9209abd2fc0f738d63424e diff --git a/graphics/imlib/files/patch-Imlib_Makefile.in b/graphics/imlib/files/patch-Imlib_Makefile.in index 93ecfd6dbb7e..dfb4091a2bed 100644 --- a/graphics/imlib/files/patch-Imlib_Makefile.in +++ b/graphics/imlib/files/patch-Imlib_Makefile.in @@ -1,11 +1,7 @@ ---- Imlib/Makefile.in.orig Thu Feb 15 12:46:40 2001 -+++ Imlib/Makefile.in Thu Mar 22 14:57:27 2001 -@@ -124,7 +124,7 @@ - libImlib_la_SOURCES = cache.c colors.c load.c misc.c rend.c utils.c save.c snprintf.c +--- Imlib/Makefile.in.orig Tue Mar 27 22:21:27 2001 ++++ Imlib/Makefile.in Tue Apr 3 13:12:00 2001 +@@ -126,3 +126,3 @@ - --libImlib_la_LDFLAGS = -version-info 10:9:9 +-libImlib_la_LDFLAGS = -version-info 10:10:9 +libImlib_la_LDFLAGS = -version-info 5:0:0 #libImlib_la_LDDADD = $(SUPPORT_LIBS) - libImlib_la_LIBADD = $(SUPPORT_LIBS) - diff --git a/graphics/imlib/files/patch-Makefile.in b/graphics/imlib/files/patch-Makefile.in new file mode 100644 index 000000000000..77878954f2a7 --- /dev/null +++ b/graphics/imlib/files/patch-Makefile.in @@ -0,0 +1,24 @@ +--- Makefile.in.orig Tue Mar 27 22:21:26 2001 ++++ Makefile.in Tue Apr 3 13:22:57 2001 +@@ -109,4 +109,2 @@ + +-pkgconfigdir = $(libdir)/pkgconfig +-pkgconfig_DATA = imlib.pc imlibgdk.pc + ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 +@@ -117,3 +115,3 @@ + +-DATA = $(m4data_DATA) $(pkgconfig_DATA) ++DATA = $(m4data_DATA) + +@@ -402,3 +400,3 @@ + +-install-data-am: install-m4dataDATA install-pkgconfigDATA ++install-data-am: install-m4dataDATA + install-data: install-data-recursive +@@ -417,4 +415,4 @@ + installdirs-am: +- $(mkinstalldirs) $(DESTDIR)$(bindir) $(DESTDIR)$(m4datadir) \ +- $(DESTDIR)$(pkgconfigdir) ++ $(mkinstalldirs) $(DESTDIR)$(bindir) $(DESTDIR)$(m4datadir) ++ + diff --git a/graphics/imlib/files/patch-gdk__imlib_Makefile.in b/graphics/imlib/files/patch-gdk__imlib_Makefile.in index c36ef0a8b1c0..4e28d8e1926f 100644 --- a/graphics/imlib/files/patch-gdk__imlib_Makefile.in +++ b/graphics/imlib/files/patch-gdk__imlib_Makefile.in @@ -1,13 +1,9 @@ ---- gdk_imlib/Makefile.in.orig Thu Feb 15 12:46:34 2001 -+++ gdk_imlib/Makefile.in Thu Mar 22 14:58:49 2001 -@@ -151,8 +151,8 @@ - libgdk_imlib_la_SOURCES = cache.c colors.c globals.c load.c misc.c rend.c utils.c save.c modules.c +--- gdk_imlib/Makefile.in.orig Tue Mar 27 22:21:26 2001 ++++ gdk_imlib/Makefile.in Tue Apr 3 13:14:15 2001 +@@ -153,4 +153,4 @@ - --libgdk_imlib_la_LDFLAGS = -version-info 10:9:9 +-libgdk_imlib_la_LDFLAGS = -version-info 10:10:9 -libgdk_imlib_la_LIBADD = $(GMODULE_LIBS) +libgdk_imlib_la_LDFLAGS = -export-dynamic -version-info 5:0:0 +libgdk_imlib_la_LIBADD = $(GTK_LIBS) $(SUPPORT_LIBS) - include_HEADERS = gdk_imlib.h gdk_imlib_private.h gdk_imlib_types.h - |