Update to 2.11.1. This fixes the API breakage which was breaking the Gimp

build.


git-svn-id: svn://creme-brulee.marcuscom.com/ports/trunk@4659 df743ca5-7f9a-e211-a948-0013205c9059

5 files changed, 20 insertions, 70 deletions

diff --git a/graphics/librsvg2/Makefile b/graphics/librsvg2/Makefile
index f7d849ad0..cb29e6f53 100644
--- a/graphics/librsvg2/Makefile
+++ b/graphics/librsvg2/Makefile
@@ -3,12 +3,11 @@
 # Whom:                 		Ade Lovett <ade@FreeBSD.org>
 #
 # $FreeBSD$
-#    $MCom: ports/graphics/librsvg2/Makefile,v 1.60 2005/08/26 06:06:36 marcus Exp $
+#    $MCom: ports/graphics/librsvg2/Makefile,v 1.61 2005/08/27 04:13:22 marcus Exp $
 #
 
 PORTNAME=	librsvg2
-PORTVERSION=	2.11.0
-PORTREVISION=	1
+PORTVERSION=	2.11.1
 CATEGORIES=	graphics gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	sources/${PORTNAME:S/2$//}/2.11
diff --git a/graphics/librsvg2/distinfo b/graphics/librsvg2/distinfo
index 56c5283be..e901f05d9 100644
--- a/graphics/librsvg2/distinfo
+++ b/graphics/librsvg2/distinfo
@@ -1,2 +1,2 @@
-MD5 (gnome2/librsvg-2.11.0.tar.bz2) = d64df7603785440c8af39a338753bdf4
-SIZE (gnome2/librsvg-2.11.0.tar.bz2) = 379647
+MD5 (gnome2/librsvg-2.11.1.tar.bz2) = 28400811169e8ed3cc31b5bb0e9555af
+SIZE (gnome2/librsvg-2.11.1.tar.bz2) = 385534
diff --git a/graphics/librsvg2/files/extra-patch-Makefile.in b/graphics/librsvg2/files/extra-patch-Makefile.in
index 06c980541..083095a54 100644
--- a/graphics/librsvg2/files/extra-patch-Makefile.in
+++ b/graphics/librsvg2/files/extra-patch-Makefile.in
@@ -1,11 +1,11 @@
---- Makefile.in.orig	Thu Aug 25 23:14:04 2005
-+++ Makefile.in	Thu Aug 25 23:14:40 2005
-@@ -325,7 +325,7 @@
+--- Makefile.in.orig	Mon Aug 29 12:07:45 2005
++++ Makefile.in	Mon Aug 29 12:08:15 2005
+@@ -204,7 +204,7 @@
  sharedstatedir = @sharedstatedir@
  sysconfdir = @sysconfdir@
  target_alias = @target_alias@
 -SUBDIRS = . gtk-engine gdk-pixbuf-loader moz-plugin doc data
 +SUBDIRS = . gtk-engine gdk-pixbuf-loader doc data
- @HAVE_GTK_FALSE@target_rsvg_view = 
+ 
  @HAVE_GTK_TRUE@target_rsvg_view = rsvg-view
- man_MANS = rsvg.1
+ @HAVE_GTK_FALSE@target_rsvg_view = 
diff --git a/graphics/librsvg2/files/patch-gdk-pixbuf-loader_io-svg.c b/graphics/librsvg2/files/patch-gdk-pixbuf-loader_io-svg.c
deleted file mode 100644
index c96a594fd..000000000
--- a/graphics/librsvg2/files/patch-gdk-pixbuf-loader_io-svg.c
+++ /dev/null
@@ -1,49 +0,0 @@
-===================================================================
-RCS file: /cvs/gnome/librsvg/gdk-pixbuf-loader/io-svg.c,v
-retrieving revision 1.26
-retrieving revision 1.26.2.1
-diff -u -r1.26 -r1.26.2.1
---- gdk-pixbuf-loader/io-svg.c	2005/06/24 12:14:56	1.26
-+++ gdk-pixbuf-loader/io-svg.c	2005/08/27 03:31:44	1.26.2.1
-@@ -191,12 +191,25 @@
- #define GDK_PIXBUF_FORMAT_THREADSAFE (1 << 2)
- #endif
- 
-+#ifndef GDK_PIXBUF_CHECK_VERSION
-+#define GDK_PIXBUF_CHECK_VERSION(major,minor,micro)    \
-+    (GDK_PIXBUF_MAJOR > (major) || \
-+     (GDK_PIXBUF_MAJOR == (major) && GDK_PIXBUF_MINOR > (minor)) || \
-+     (GDK_PIXBUF_MAJOR == (major) && GDK_PIXBUF_MINOR == (minor) && \
-+      GDK_PIXBUF_MICRO >= (micro)))
-+#endif
-+
- void
- fill_info (GdkPixbufFormat *info)
- {
--        static GdkPixbufModulePattern signature[] = {
--                { "<svg", NULL, 100 },
--                { "<!DOCTYPE svg", NULL, 100 },
-+        static GdkPixbufModulePattern signature_old[] = {
-+                { (unsigned char*) "<svg", NULL, 100 },
-+                { (unsigned char*) "<!DOCTYPE svg", NULL, 100 },
-+                { NULL, NULL, 0 }
-+        };
-+        static GdkPixbufModulePattern signature_new[] = {
-+                { (unsigned char*) " <svg", (unsigned char*) "*    ", 100 },
-+                { (unsigned char*) " <!DOCTYPE svg", (unsigned char*) "*             ", 100 },
-                 { NULL, NULL, 0 }
-         };
-         static gchar *mime_types[] = { /* yes folks, i actually have run into all of these in the wild... */
-@@ -215,7 +228,11 @@
-         };
- 
-         info->name        = "svg";
--        info->signature   = signature;
-+        if (GDK_PIXBUF_CHECK_VERSION (2, 7, 4)) {
-+                info->signature = signature_new;
-+        } else {
-+                info->signature = signature_old;
-+        }
-         info->description = _("Scalable Vector Graphics");
-         info->mime_types  = mime_types;
-         info->extensions  = extensions;
diff --git a/graphics/librsvg2/files/patch-moz-plugin_Makefile.in b/graphics/librsvg2/files/patch-moz-plugin_Makefile.in
index 9855a82fa..bd552e7f1 100644
--- a/graphics/librsvg2/files/patch-moz-plugin_Makefile.in
+++ b/graphics/librsvg2/files/patch-moz-plugin_Makefile.in
@@ -1,25 +1,25 @@
---- moz-plugin/Makefile.in.orig	Thu Aug 25 22:29:28 2005
-+++ moz-plugin/Makefile.in	Thu Aug 25 22:30:43 2005
-@@ -281,15 +281,15 @@
- $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
- 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+--- moz-plugin/Makefile.in.orig	Mon Aug 29 12:08:38 2005
++++ moz-plugin/Makefile.in	Mon Aug 29 12:09:20 2005
+@@ -252,15 +252,15 @@
+ 	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)
+ pluginLTLIBRARIES_INSTALL = $(INSTALL)
  install-pluginLTLIBRARIES: $(plugin_LTLIBRARIES)
 -	@$(NORMAL_INSTALL)
--	test -z "$(plugindir)" || $(mkdir_p) "$(DESTDIR)$(plugindir)"
+-	$(mkinstalldirs) $(DESTDIR)$(plugindir)
 -	@list='$(plugin_LTLIBRARIES)'; for p in $$list; do \
 -	  if test -f $$p; then \
 -	    f="`echo $$p | sed -e 's|^.*/||'`"; \
--	    echo " $(LIBTOOL) --mode=install $(pluginLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(plugindir)/$$f'"; \
--	    $(LIBTOOL) --mode=install $(pluginLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(plugindir)/$$f"; \
+-	    echo " $(LIBTOOL) --mode=install $(pluginLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) $$p $(DESTDIR)$(plugindir)/$$f"; \
+-	    $(LIBTOOL) --mode=install $(pluginLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) $$p $(DESTDIR)$(plugindir)/$$f; \
 -	  else :; fi; \
 -	done
 +#	@$(NORMAL_INSTALL)
-+#	test -z "$(plugindir)" || $(mkdir_p) "$(DESTDIR)$(plugindir)"
++#	$(mkinstalldirs) $(DESTDIR)$(plugindir)
 +#	@list='$(plugin_LTLIBRARIES)'; for p in $$list; do \
 +#	  if test -f $$p; then \
 +#	    f="`echo $$p | sed -e 's|^.*/||'`"; \
-+#	    echo " $(LIBTOOL) --mode=install $(pluginLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(plugindir)/$$f'"; \
-+#	    $(LIBTOOL) --mode=install $(pluginLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(plugindir)/$$f"; \
++#	    echo " $(LIBTOOL) --mode=install $(pluginLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) $$p $(DESTDIR)$(plugindir)/$$f"; \
++#	    $(LIBTOOL) --mode=install $(pluginLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) $$p $(DESTDIR)$(plugindir)/$$f; \
 +#	  else :; fi; \
 +#	done