diff --git a/0001-Don-t-accidentally-return-NULL-from-parse_style_valu.patch b/0001-Don-t-accidentally-return-NULL-from-parse_style_valu.patch
deleted file mode 100644
index 781c957..0000000
--- a/0001-Don-t-accidentally-return-NULL-from-parse_style_valu.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-From 197a8fe3b15d01893ab0d1cd64e23dfeb7ca75a9 Mon Sep 17 00:00:00 2001
-From: Matthias Clasen <mclasen@redhat.com>
-Date: Fri, 18 Feb 2011 17:27:26 -0500
-Subject: [PATCH] Don't accidentally return NULL from parse_style_value()
-
-Callers don't expect it and things go bad...
-https://bugzilla.gnome.org/show_bug.cgi?id=626802
----
- rsvg-styles.c |    5 ++++-
- 1 files changed, 4 insertions(+), 1 deletions(-)
-
-diff --git a/rsvg-styles.c b/rsvg-styles.c
-index bd59a10..7498ec9 100644
---- a/rsvg-styles.c
-+++ b/rsvg-styles.c
-@@ -887,7 +887,10 @@ parse_style_value (const gchar *string, gchar **value, gboolean *important)
-     } else {
-         *important = FALSE;
-     }
--    *value = g_strdup (g_strstrip (strings[0]));
-+    if (strings[0])
-+        *value = g_strdup (g_strstrip (strings[0]));
-+    else
-+        *value = g_strdup ("");
- 
-     g_strfreev (strings);
- 
--- 
-1.7.4.1
-
diff --git a/0001-Fix-compilation-of-GTK-theme-engine-for-GTK-3.0.patch b/0001-Fix-compilation-of-GTK-theme-engine-for-GTK-3.0.patch
deleted file mode 100644
index 6ce19d7..0000000
--- a/0001-Fix-compilation-of-GTK-theme-engine-for-GTK-3.0.patch
+++ /dev/null
@@ -1,43 +0,0 @@
-From 0cc1279c5033a30cb715735fab0af54813b11c45 Mon Sep 17 00:00:00 2001
-From: Bastien Nocera <hadess@hadess.net>
-Date: Fri, 11 Jun 2010 14:02:49 +0100
-Subject: [PATCH] Fix compilation of GTK+ theme engine for GTK+ 3.0
-
-->draw_string() has been removed in GTK+ 3.x.
----
- gtk-engine/svg-draw.c |    4 ++++
- 1 files changed, 4 insertions(+), 0 deletions(-)
-
-diff --git a/gtk-engine/svg-draw.c b/gtk-engine/svg-draw.c
-index 3602a9b..8363546 100644
---- a/gtk-engine/svg-draw.c
-+++ b/gtk-engine/svg-draw.c
-@@ -583,6 +583,7 @@ draw_diamond (GtkStyle     *style,
- 				x, y, width, height);
- }
- 
-+#if ! (GTK_CHECK_VERSION(2,90,0))
- static void
- draw_string (GtkStyle * style,
- 	     GdkWindow * window,
-@@ -624,6 +625,7 @@ draw_string (GtkStyle * style,
-       gdk_gc_set_clip_rectangle(style->fg_gc[state], NULL);
-     }
- }
-+#endif /* ! (GTK_CHECK_VERSION(2,90,0)) */
- 
- static void
- draw_box (GtkStyle     *style,
-@@ -1024,7 +1026,9 @@ rsvg_style_class_init (RsvgStyleClass *klass)
-   style_class->draw_shadow = draw_shadow;
-   style_class->draw_arrow = draw_arrow;
-   style_class->draw_diamond = draw_diamond;
-+#if ! (GTK_CHECK_VERSION(2,90,0))
-   style_class->draw_string = draw_string;
-+#endif
-   style_class->draw_box = draw_box;
-   style_class->draw_flat_box = draw_flat_box;
-   style_class->draw_check = draw_check;
--- 
-1.7.0.1
-
diff --git a/0001-rsvg-gobject.c-g_free-object-after-we-free-all-it-s-.patch b/0001-rsvg-gobject.c-g_free-object-after-we-free-all-it-s-.patch
deleted file mode 100644
index b639c68..0000000
--- a/0001-rsvg-gobject.c-g_free-object-after-we-free-all-it-s-.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-From f1ef3c88012778fe13fed466fcb2cee1eac351fd Mon Sep 17 00:00:00 2001
-From: Adam Tkac <atkac@redhat.com>
-Date: Fri, 2 Jul 2010 14:47:07 +0200
-Subject: [PATCH] rsvg-gobject.c: g_free object after we free all it's attributes, not before
- (in instance_dispose() function)
-
-Signed-off-by: Adam Tkac <atkac@redhat.com>
----
- rsvg-gobject.c |    4 ++--
- 1 files changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/rsvg-gobject.c b/rsvg-gobject.c
-index 61b7cb8..43fb5a8 100644
---- a/rsvg-gobject.c
-+++ b/rsvg-gobject.c
-@@ -134,8 +134,6 @@ instance_dispose (GObject * instance)
-     if (self->priv->base_uri)
-         g_free (self->priv->base_uri);
- 
--    g_free (self->priv);
--
- #if GLIB_CHECK_VERSION (2, 24, 0)
-     if (self->priv->base_gfile) {
-         g_object_unref (self->priv->base_gfile);
-@@ -152,6 +150,8 @@ instance_dispose (GObject * instance)
-     }
- #endif
- 
-+    g_free (self->priv);
-+
-     rsvg_parent_class->dispose (instance);
- }
- 
--- 
-1.7.1
-
diff --git a/filter-leak.patch b/filter-leak.patch
deleted file mode 100644
index 9b5c594..0000000
--- a/filter-leak.patch
+++ /dev/null
@@ -1,43 +0,0 @@
-diff -up librsvg-2.18.2/rsvg-filter.c.filter-leak librsvg-2.18.2/rsvg-filter.c
---- librsvg-2.18.2/rsvg-filter.c.filter-leak	2007-09-11 10:03:39.000000000 -0400
-+++ librsvg-2.18.2/rsvg-filter.c	2007-09-11 10:04:24.000000000 -0400
-@@ -703,7 +703,6 @@ rsvg_new_filter (void)
-     filter->y = _rsvg_css_parse_length ("-10%");
-     filter->width = _rsvg_css_parse_length ("120%");
-     filter->height = _rsvg_css_parse_length ("120%");
--    filter->super.children = g_ptr_array_new ();
-     filter->super.set_atts = rsvg_filter_set_args;
-     return (RsvgNode *) filter;
- }
-@@ -1702,7 +1701,6 @@ rsvg_new_filter_primitive_merge (void)
-     filter->super.super.free = &rsvg_filter_primitive_merge_free;
- 
-     filter->super.super.set_atts = rsvg_filter_primitive_merge_set_atts;
--    filter->super.super.children = g_ptr_array_new ();
-     return (RsvgNode *) filter;
- }
- 
-@@ -2201,7 +2199,6 @@ rsvg_new_filter_primitive_component_tran
- 
-     filter->super.super.set_atts = rsvg_filter_primitive_component_transfer_set_atts;
- 
--    filter->super.super.children = g_ptr_array_new ();
-     return (RsvgNode *) filter;
- }
- 
-@@ -4088,7 +4085,6 @@ rsvg_new_filter_primitive_diffuse_lighti
-     filter->super.render = &rsvg_filter_primitive_diffuse_lighting_render;
-     filter->super.super.free = &rsvg_filter_primitive_diffuse_lighting_free;
-     filter->super.super.set_atts = rsvg_filter_primitive_diffuse_lighting_set_atts;
--    filter->super.super.children = g_ptr_array_new ();
-     return (RsvgNode *) filter;
- }
- 
-@@ -4267,7 +4263,6 @@ rsvg_new_filter_primitive_specular_light
-     filter->super.render = &rsvg_filter_primitive_specular_lighting_render;
-     filter->super.super.free = &rsvg_filter_primitive_specular_lighting_free;
-     filter->super.super.set_atts = rsvg_filter_primitive_specular_lighting_set_atts;
--    filter->super.super.children = g_ptr_array_new ();
-     return (RsvgNode *) filter;
- }
- 
diff --git a/gtk3-port.patch b/gtk3-port.patch
deleted file mode 100644
index 51c815e..0000000
--- a/gtk3-port.patch
+++ /dev/null
@@ -1,477 +0,0 @@
-diff -upr librsvg-2.26.3/configure.in librsvg-2.26.3.new/configure.in
---- librsvg-2.26.3/configure.in	2010-04-29 12:28:16.000000000 +0100
-+++ librsvg-2.26.3.new/configure.in	2010-06-11 13:08:36.000000000 +0100
-@@ -1,10 +1,23 @@
--AC_INIT(rsvg.h)
-+m4_define([rsvg_major_version],[2])
-+m4_define([rsvg_minor_version],[26])
-+m4_define([rsvg_micro_version],[4])
-+m4_define([rsvg_extra_version],[])
-+m4_define([rsvg_version],[rsvg_major_version.rsvg_minor_version.rsvg_micro_version()rsvg_extra_version])
-+m4_define([rsvg_lt_version_info],m4_eval(rsvg_major_version + rsvg_minor_version):rsvg_micro_version:rsvg_minor_version)
-+
-+AC_INIT([RSVG],[rsvg_version],[https://bugzilla.gnome.org/enter_bug.cgi?product=librsvg],[rsvg])
-+
-+AC_CONFIG_HEADERS([config.h])
-+AC_CONFIG_SRCDIR([rsvg.h])
-+
-+AM_INIT_AUTOMAKE([1.9 foreign no-dist-gzip dist-bzip2])
- m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])])
- 
-+AM_MAINTAINER_MODE([enable])
-+
- dnl ===========================================================================
- 
- FONTCONFIG_REQUIRED=1.0.1	dnl Same as in Pango, ???
--GDK_PIXBUF_REQUIRED=1.3.7
- GLIB_REQUIRED=2.12.0
- GIO_REQUIRED=2.15.4
- LIBXML_REQUIRED=2.4.7
-@@ -12,34 +25,50 @@ CAIRO_REQUIRED=1.2.0
- PANGOFT2_REQUIRED=1.2.0
- PANGOCAIRO_REQUIRED=1.10.0
- 
--AC_SUBST(GDK_PIXBUF_REQUIRED)
--AC_SUBST(GLIB_REQUIRED)
--AC_SUBST(GIO_REQUIRED)
--AC_SUBST(CAIRO_REQUIRED)
--AC_SUBST(LIBXML_REQUIRED)
--AC_SUBST(PANGOFT2_REQUIRED)
-+# ===========================================================================
- 
--dnl ===========================================================================
-+AC_MSG_CHECKING([which gtk+ version to compile against])
-+AC_ARG_WITH([gtk],
-+  [AS_HELP_STRING([--with-gtk=2.0|3.0],[which gtk+ version to compile against (default: 2.0)])],
-+  [case "$with_gtk" in
-+     2.0|3.0) ;;
-+     *) AC_MSG_ERROR([invalid gtk version specified]) ;;
-+   esac],
-+  [with_gtk=2.0])
-+AC_MSG_RESULT([$with_gtk])
-+
-+case "$with_gtk" in
-+  2.0) RSVG_API_VERSION=2.0
-+       RSVG_API_MAJOR_VERSION=2
-+       GTK_API_VERSION=2.0
-+       GDK_PIXBUF_REQUIRED=1.3.7
-+       GTK_REQUIRED=2.16.0
-+       GTK_X11_REQUIRED=2.0.0
-+       ;;
-+  3.0) RSVG_API_VERSION=3.0
-+       RSVG_API_MAJOR_VERSION=3
-+       GTK_API_VERSION=3.0
-+       GDK_PIXBUF_REQUIRED=2.90.0
-+       GTK_REQUIRED=2.90.0
-+       GTK_X11_REQUIRED=2.90.0
-+       ;;
-+esac
- 
--LIBRSVG_MAJOR_VERSION=2
--LIBRSVG_MINOR_VERSION=26
--LIBRSVG_MICRO_VERSION=3
--AC_SUBST(LIBRSVG_MAJOR_VERSION)
--AC_SUBST(LIBRSVG_MINOR_VERSION)
--AC_SUBST(LIBRSVG_MICRO_VERSION)
-+AC_SUBST([RSVG_API_VERSION])
-+AC_SUBST([RSVG_API_MAJOR_VERSION])
-+AC_SUBST([GTK_API_VERSION])
- 
--LIBRSVG_VERSION=$LIBRSVG_MAJOR_VERSION.$LIBRSVG_MINOR_VERSION.$LIBRSVG_MICRO_VERSION
-+AC_SUBST([RSVG_LT_VERSION_INFO],[rsvg_lt_version_info])
-+AC_SUBST([LIBRSVG_MAJOR_VERSION],[rsvg_major_version])
-+AC_SUBST([LIBRSVG_MINOR_VERSION],[rsvg_minor_version])
-+AC_SUBST([LIBRSVG_MICRO_VERSION],[rsvg_micro_version])
- 
--VERSION_INFO=`expr $LIBRSVG_MAJOR_VERSION + $LIBRSVG_MINOR_VERSION`:$LIBRSVG_MICRO_VERSION:$LIBRSVG_MINOR_VERSION
--AC_SUBST(VERSION_INFO)
-+AM_CONDITIONAL([GTK_API_VERSION_2],[test "$GTK_API_VERSION" = "2.0"])
-+AM_CONDITIONAL([GTK_API_VERSION_3],[test "$GTK_API_VERSION" = "3.0"])
- 
- dnl ===========================================================================
- 
--AM_INIT_AUTOMAKE(librsvg, $LIBRSVG_VERSION)
--AM_CONFIG_HEADER(config.h)
--
--AM_MAINTAINER_MODE
--
-+AC_PROG_LN_S
- AC_ISC_POSIX
- AC_PROG_CC
- AC_PROG_CPP
-@@ -91,7 +120,7 @@ GLIB_MKENUMS=`$PKG_CONFIG --variable=gli
- AC_SUBST(GLIB_MKENUMS)
- 
- PKG_CHECK_MODULES(LIBRSVG, \
--	gdk-pixbuf-2.0 >= $GDK_PIXBUF_REQUIRED \
-+	gdk-pixbuf-$GTK_API_VERSION >= $GDK_PIXBUF_REQUIRED \
- 	glib-2.0 >= $GLIB_REQUIRED \
- 	libxml-2.0 >= $LIBXML_REQUIRED \
- 	pangoft2 >= $PANGOFT2_REQUIRED \
-@@ -216,20 +245,20 @@ else
- fi
- 
- have_gtk=no
--PKG_CHECK_MODULES(GTK, gtk+-2.0 >= 2.16.0, have_gtk=yes,
-+PKG_CHECK_MODULES(GTK, gtk+-$GTK_API_VERSION >= $GTK_REQUIRED, have_gtk=yes,
- 		       have_gtk=no)
- 
- GTK_VERSION=
- if test "x$have_gtk" = "xyes"; then
--   GTK_VERSION=`$PKG_CONFIG --variable=gtk_binary_version gtk+-2.0`
-+   GTK_BINARY_VERSION=`$PKG_CONFIG --variable=gtk_binary_version gtk+-$GTK_API_VERSION`
- fi
- AC_SUBST(GTK_CFLAGS)
- AC_SUBST(GTK_LIBS)
--AC_SUBST(GTK_VERSION)
-+AC_SUBST(GTK_BINARY_VERSION)
- AM_CONDITIONAL(HAVE_GTK, test "x$have_gtk" = "xyes")
- 
- have_gdk_x11=no
--PKG_CHECK_MODULES(GDK_X11, gdk-x11-2.0 >= 2.0.0, have_gdk_x11=yes, have_gdk_x11=no)
-+PKG_CHECK_MODULES(GDK_X11, gdk-x11-$GTK_API_VERSION >= $GTK_X11_REQUIRED, have_gdk_x11=yes, have_gdk_x11=no)
- 
- if test "x$have_gdk_x11" = "xyes"; then
- 	AC_PATH_XTRA
-@@ -259,14 +288,17 @@ fi
- 
- AM_CONDITIONAL(ENABLE_GTK_ENGINE, test "x$enable_gtk_theme" = "xyes")
- 
--AC_PATH_PROG(QUERYLOADERS, gdk-pixbuf-query-loaders, true)
-+case "$with_gtk" in
-+  2.0) AC_PATH_PROG([GDK_PIXBUF_QUERYLOADERS],[gdk-pixbuf-query-loaders],[true]) ;;
-+  3.0) AC_PATH_PROG([GDK_PIXBUF_QUERYLOADERS],[gdk-pixbuf-query-loaders-3],[true]) ;;
-+esac
- 
- AC_ARG_ENABLE(pixbuf-loader,
-     [  --enable-pixbuf-loader  Enable a RSVG based GdkPixbuf loader [default=auto]],
-     enable_pixbuf_loader="$enableval", enable_pixbuf_loader=auto)
- 
- if test "x$enable_pixbuf_loader" = xauto ; then
--    if test x$QUERYLOADERS != x ; then 
-+    if test "x$GDK_PIXBUF_QUERYLOADERS" != x ; then
-         enable_pixbuf_loader=yes
-     else
-         enable_pixbuf_loader=no
-@@ -325,15 +357,11 @@ AC_CONFIG_FILES([
- librsvg.spec
- librsvg-features.h
- Makefile
--librsvg-2.0.pc
--librsvg-2.0-uninstalled.pc
- librsvg-zip
--rsvg
- data/Makefile
- gtk-engine/Makefile
- gtk-engine/examples/Makefile
- gtk-engine/examples/bubble/Makefile
--gtk-engine/examples/bubble/gtk-2.0/Makefile
- gdk-pixbuf-loader/Makefile
- tests/Makefile
- tests/pdiff/Makefile
-@@ -341,11 +369,18 @@ tools/Makefile
- doc/Makefile
- ])
- 
-+AC_CONFIG_FILES([librsvg-${RSVG_API_VERSION}.pc:librsvg.pc.in],[RSVG_API_VERSION=$RSVG_API_VERSION])
-+AC_CONFIG_FILES([librsvg-${RSVG_API_VERSION}-uninstalled.pc:librsvg-uninstalled.pc.in],[RSVG_API_VERSION=$RSVG_API_VERSION])
-+
-+if test "$with_gtk" = "2.0"; then
-+  AC_CONFIG_FILES([rsvg])
-+fi
-+
- AC_OUTPUT
- 
- dnl =============================================================================================
- echo "
--librsvg-$LIBRSVG_VERSION
-+librsvg-$VERSION for gtk+-$GTK_API_VERSION
- 
- 	prefix:                         ${prefix}
- 	compiler:                       ${CC}
-diff -upr librsvg-2.26.3/doc/Makefile.am librsvg-2.26.3.new/doc/Makefile.am
---- librsvg-2.26.3/doc/Makefile.am	2010-04-14 04:31:39.000000000 +0100
-+++ librsvg-2.26.3.new/doc/Makefile.am	2010-06-11 13:05:42.000000000 +0100
-@@ -3,6 +3,9 @@
- # The name of the module.
- DOC_MODULE=rsvg
- 
-+# Uncomment for versioned docs and specify the version of the module, e.g. '2'.
-+DOC_MODULE_VERSION = $(RSVG_API_VERSION)
-+
- # The top-level SGML file.
- DOC_MAIN_SGML_FILE=rsvg-docs.sgml
- 
-@@ -57,7 +60,7 @@ extra_files=
- # if $(DOC_MODULE).types is non-empty.
- GTKDOC_CFLAGS = -I$(top_srcdir) $(LIBRSVG_CFLAGS)
- 
--GTKDOC_LIBS = $(top_builddir)/librsvg-2.la $(LIBRSVG_LIBS)
-+GTKDOC_LIBS = $(top_builddir)/librsvg-@RSVG_API_MAJOR_VERSION@.la $(LIBRSVG_LIBS)
- 
- if GTK_DOC_INSTALLED
- include $(top_srcdir)/gtk-doc.make
-diff -upr librsvg-2.26.3/gdk-pixbuf-loader/Makefile.am librsvg-2.26.3.new/gdk-pixbuf-loader/Makefile.am
---- librsvg-2.26.3/gdk-pixbuf-loader/Makefile.am	2010-04-14 04:31:39.000000000 +0100
-+++ librsvg-2.26.3.new/gdk-pixbuf-loader/Makefile.am	2010-06-11 13:05:42.000000000 +0100
-@@ -1,5 +1,4 @@
--
--loaderdir = $(libdir)/gtk-2.0/$(GTK_VERSION)/loaders
-+loaderdir = $(libdir)/gtk-$(GTK_API_VERSION)/$(GTK_BINARY_VERSION)/loaders
- 
- if PLATFORM_WIN32
- no_undefined = -no-undefined
-@@ -21,7 +20,7 @@ endif
- svg_loader_la_SOURCES = io-svg.c
- svg_loader_la_LDFLAGS = -avoid-version -module $(no_undefined)
- svg_loader_la_LIBADD = \
--	$(top_builddir)/librsvg-2.la	\
-+	$(top_builddir)/librsvg-@RSVG_API_MAJOR_VERSION@.la	\
- 	$(LIBRSVG_LIBS) 	\
- 	$(LIBGSF_LIBS) $(LIBCROCO_LIBS)
- 
-@@ -29,7 +28,7 @@ loader_LTLIBRARIES = $(target_pixbuf_loa
- 
- install-data-hook: 
- 	if [ -z "$(DESTDIR)" ] ; then \
--	  $(mkinstalldirs) $(DESTDIR)$(sysconfdir)/gtk-2.0 ; \
--	  $(QUERYLOADERS) > $(DESTDIR)$(sysconfdir)/gtk-2.0/gdk-pixbuf.loaders ; \
-+	  $(mkinstalldirs) $(DESTDIR)$(sysconfdir)/gtk-$(GTK_API_VERSION) ; \
-+	  $(GDK_PIXBUF_QUERYLOADERS) > $(DESTDIR)$(sysconfdir)/gtk-$(GTK_API_VERSION)/gdk-pixbuf.loaders ; \
- 	fi
- 
-diff -upr librsvg-2.26.3/gtk-engine/examples/bubble/Makefile.am librsvg-2.26.3.new/gtk-engine/examples/bubble/Makefile.am
---- librsvg-2.26.3/gtk-engine/examples/bubble/Makefile.am	2010-03-19 00:06:24.000000000 +0000
-+++ librsvg-2.26.3.new/gtk-engine/examples/bubble/Makefile.am	2010-06-11 13:05:42.000000000 +0100
-@@ -1,4 +1,12 @@
--SUBDIRS=gtk-2.0
-+themedir = $(datadir)/themes/bubble/gtk-$(GTK_API_VERSION)
-+theme_DATA = \
-+	gtkrc		\
-+	blue.svg	\
-+	green.svg	\
-+	orange.svg	\
-+	purple.svg	\
-+	red.svg
- 
--themedir = $(datadir)/themes/bubble
--theme_DATA = README
-+EXTRA_DIST = \
-+	$(theme_DATA)	\
-+	README
-diff -upr librsvg-2.26.3/gtk-engine/Makefile.am librsvg-2.26.3.new/gtk-engine/Makefile.am
---- librsvg-2.26.3/gtk-engine/Makefile.am	2010-04-14 04:31:39.000000000 +0100
-+++ librsvg-2.26.3.new/gtk-engine/Makefile.am	2010-06-11 13:05:42.000000000 +0100
-@@ -6,7 +6,7 @@ endif
- 
- INCLUDES = -I$(top_srcdir) $(GTK_CFLAGS) $(LIBGSF_CFLAGS) $(LIBCROCO_CFLAGS) $(LIBRSVG_CFLAGS)
- 
--enginedir = $(libdir)/gtk-2.0/$(GTK_VERSION)/engines
-+enginedir = $(libdir)/gtk-$(GTK_API_VERSION)/$(GTK_BINARY_VERSION)/engines
- themedir = $(datadir)/themes
- 
- if ENABLE_GTK_ENGINE
-@@ -29,6 +29,6 @@ libsvg_la_SOURCES = 		\
- 	svg.h
- 
- libsvg_la_LDFLAGS =  -avoid-version -module $(no_undefined)
--libsvg_la_LIBADD = $(top_builddir)/librsvg-2.la $(GTK_LIBS) $(LIBRSVG_LIBS) $(LIBCROCO_LIBS)
-+libsvg_la_LIBADD = $(top_builddir)/librsvg-@RSVG_API_MAJOR_VERSION@.la $(GTK_LIBS) $(LIBRSVG_LIBS) $(LIBCROCO_LIBS)
- 
- EXTRA_DIST = $(libsvg_la_SOURCES)
-diff -upr librsvg-2.26.3/Makefile.am librsvg-2.26.3.new/Makefile.am
---- librsvg-2.26.3/Makefile.am	2010-04-30 12:45:33.000000000 +0100
-+++ librsvg-2.26.3.new/Makefile.am	2010-06-11 13:05:42.000000000 +0100
-@@ -1,15 +1,11 @@
--if HAVE_GTK
--target_rsvg_view = rsvg-view
--else
--target_rsvg_view =
--endif
--
- SUBDIRS = . gdk-pixbuf-loader gtk-engine data tests tools doc
- 
--lib_LTLIBRARIES = librsvg-2.la
--bin_PROGRAMS = rsvg-convert $(target_rsvg_view)
-+lib_LTLIBRARIES = librsvg-@RSVG_API_MAJOR_VERSION@.la
- 
--man_MANS = rsvg.1
-+bin_PROGRAMS = rsvg-convert-@RSVG_API_MAJOR_VERSION@
-+if HAVE_GTK
-+bin_PROGRAMS += rsvg-view-@RSVG_API_MAJOR_VERSION@
-+endif
- 
- if OS_WIN32
- else
-@@ -24,7 +20,7 @@ enum_sources = \
- 	librsvg-enum-types.h	\
- 	librsvg-enum-types.c
- 
--librsvg_2_la_SOURCES = 		\
-+librsvg_@RSVG_API_MAJOR_VERSION@_la_SOURCES = 		\
- 	rsvg-affine.c		\
- 	librsvg-features.c 	\
- 	rsvg-bpath-util.c 	\
-@@ -68,10 +64,10 @@ librsvg_2_la_SOURCES = 		\
- 	rsvg-gobject.c		\
- 	rsvg-file-util.c
- 
--librsvg_2_la_LDFLAGS = -version-info @VERSION_INFO@ -export-dynamic -no-undefined -export-symbols $(srcdir)/librsvg.def
--librsvg_2_la_LIBADD = $(LIBGSF_LIBS) $(LIBCROCO_LIBS) $(LIBRSVG_LIBS) -lm
-+librsvg_@RSVG_API_MAJOR_VERSION@_la_LDFLAGS = -version-info @RSVG_LT_VERSION_INFO@ -export-dynamic -no-undefined -export-symbols $(srcdir)/librsvg.def
-+librsvg_@RSVG_API_MAJOR_VERSION@_la_LIBADD = $(LIBGSF_LIBS) $(LIBCROCO_LIBS) $(LIBRSVG_LIBS) -lm
- 
--librsvgincdir = $(includedir)/librsvg-2/librsvg
-+librsvgincdir = $(includedir)/librsvg-$(RSVG_API_VERSION)/librsvg
- librsvginc_HEADERS = 	\
- 	$(headers)	\
- 	librsvg-features.h \
-@@ -88,26 +84,29 @@ INCLUDES =				\
- 	-DG_LOG_DOMAIN=\"librsvg\" 	\
- 	-DLIBRSVG_DATADIR="\"$(datadir)\""
- 
--DEPS = $(top_builddir)/librsvg-2.la
-+DEPS = $(top_builddir)/librsvg-@RSVG_API_MAJOR_VERSION@.la
- LDADDS =				\
- 	$(LIBGSF_LIBS)			\
- 	$(GLIB_LIBS)			\
- 	$(LIBCROCO_LIBS)		\
- 	$(LIBRSVG_LIBS) 		\
--	$(top_builddir)/librsvg-2.la
-+	$(top_builddir)/librsvg-@RSVG_API_MAJOR_VERSION@.la
- 
--bin_SCRIPTS=rsvg
-+if GTK_API_VERSION_2
-+nodist_bin_SCRIPTS = rsvg
-+man_MANS = rsvg.1
-+endif
- 
--rsvg_convert_SOURCES=rsvg-convert.c
--rsvg_convert_LDFLAGS =
--rsvg_convert_DEPENDENCIES = $(DEPS)
--rsvg_convert_LDADD = $(LDADDS) $(libm)
-+rsvg_convert_@RSVG_API_MAJOR_VERSION@_SOURCES=rsvg-convert.c
-+rsvg_convert_@RSVG_API_MAJOR_VERSION@_LDFLAGS =
-+rsvg_convert_@RSVG_API_MAJOR_VERSION@_DEPENDENCIES = $(DEPS)
-+rsvg_convert_@RSVG_API_MAJOR_VERSION@_LDADD = $(LDADDS) $(libm)
- 
--rsvg_view_SOURCES = 		\
-+rsvg_view_@RSVG_API_MAJOR_VERSION@_SOURCES = 		\
- 	test-display.c
--rsvg_view_LDFLAGS =
--rsvg_view_DEPENDENCIES = $(DEPS)
--rsvg_view_LDADD = $(GTK_LIBS) $(GDK_X11_LIBS) $(libm) $(LDADDS)
-+rsvg_view_@RSVG_API_MAJOR_VERSION@_LDFLAGS =
-+rsvg_view_@RSVG_API_MAJOR_VERSION@_DEPENDENCIES = $(DEPS)
-+rsvg_view_@RSVG_API_MAJOR_VERSION@_LDADD = $(GTK_LIBS) $(GDK_X11_LIBS) $(libm) $(LDADDS)
- 
- EXTRA_DIST =				\
- 	MAINTAINERS			\
-@@ -116,13 +115,10 @@ EXTRA_DIST =				\
- 	TODO				\
- 	COPYING.LIB 			\
- 	librsvg.spec.in 		\
--	librsvg-2.0.pc.in 		\
--	librsvg-2.0-uninstalled.pc.in 	\
- 	librsvg-zip.in 			\
- 	rsvg.in				\
- 	librsvg.def			\
- 	$(man_MANS)			\
--	$(rsvg_view_SOURCES)		\
- 	gtk-doc.make
- 
- CLEANFILES = \
-@@ -133,7 +129,7 @@ CLEANFILES = \
- ## `install-exec', not `install-data'.
- 
- pkgconfigdir = $(libdir)/pkgconfig
--pkgconfig_DATA = librsvg-2.0.pc
-+pkgconfig_DATA = librsvg-$(RSVG_API_VERSION).pc
- 
- dist-hook: librsvg.spec
- 	cp librsvg.spec $(distdir)
-@@ -142,7 +138,7 @@ librsvg-enum-types.h: s-enum-types-h
- 	@true
- 
- s-enum-types-h: $(headers) Makefile
--	( cd $(srcdir) && $(GLIB_MKENUMS) \
-+	$(AM_V_GEN) ( cd $(srcdir) && $(GLIB_MKENUMS) \
- 			--fhead "#ifndef __LIBRSVG_ENUM_TYPES_H__\n#define __LIBRSVG_ENUM_TYPES_H__\n\n#include <glib-object.h>\n\nG_BEGIN_DECLS\n" \
- 			--fprod "/* enumerations from \"@filename@\" */\n" \
- 			--vhead "GType @enum_name@_get_type (void);\n#define RSVG_TYPE_@ENUMSHORT@ (@enum_name@_get_type())\n" 	\
-@@ -156,7 +152,7 @@ librsvg-enum-types.c: s-enum-types-c lib
- 	@true
- 
- s-enum-types-c: $(headers) Makefile
--	( cd $(srcdir) && $(GLIB_MKENUMS) \
-+	$(AM_V_GEN) ( cd $(srcdir) && $(GLIB_MKENUMS) \
- 			--fhead "#include \"librsvg-enum-types.h\"\n#include \"rsvg.h\"" \
- 			--fprod "\n/* enumerations from \"@filename@\" */" \
- 			--vhead "GType\n@enum_name@_get_type (void)\n{\n  static GType etype = 0;\n  if (etype == 0) {\n    static const G@Type@Value values[] = {" 	\
-@@ -168,3 +164,9 @@ s-enum-types-c: $(headers) Makefile
- 	&& echo timestamp > $(@F)
- 
- DISTCHECK_CONFIGURE_FLAGS = --enable-gtk-doc
-+
-+if GTK_API_VERSION_2
-+install-exec-hook:
-+	(cd $(DESTDIR)$(bindir) && $(LN_S) rsvg-convert-2 rsvg-convert)
-+	(cd $(DESTDIR)$(bindir) && $(LN_S) rsvg-view-2 rsvg-view)
-+endif
-diff -upr librsvg-2.26.3/tests/Makefile.am librsvg-2.26.3.new/tests/Makefile.am
---- librsvg-2.26.3/tests/Makefile.am	2010-05-01 02:15:48.000000000 +0100
-+++ librsvg-2.26.3.new/tests/Makefile.am	2010-06-11 13:05:49.000000000 +0100
-@@ -8,7 +8,7 @@ TESTS = 		\
- noinst_LTLIBRARIES = 			\
- 	libtest-utils.la
- 
--LDADD = $(top_builddir)/librsvg-2.la		\
-+LDADD = $(top_builddir)/librsvg-@RSVG_API_MAJOR_VERSION@.la		\
- 	$(top_builddir)/tests/libtest-utils.la	\
- 	$(top_builddir)/tests/pdiff/libpdiff.la
- 
-diff -upr librsvg-2.26.3/tools/Makefile.am librsvg-2.26.3.new/tools/Makefile.am
---- librsvg-2.26.3/tools/Makefile.am	2010-04-29 12:28:16.000000000 +0100
-+++ librsvg-2.26.3.new/tools/Makefile.am	2010-06-11 13:06:52.000000000 +0100
-@@ -13,13 +13,13 @@ INCLUDES =				\
- 	-DG_LOG_DOMAIN=\"librsvg\" 	\
- 	-DLIBRSVG_DATADIR="\"$(datadir)\""
- 
--DEPS = $(top_builddir)/librsvg-2.la
-+DEPS = $(top_builddir)/librsvg-@RSVG_API_MAJOR_VERSION@.la
- LDADDS =				\
- 	$(LIBGSF_LIBS)			\
- 	$(GLIB_LIBS)			\
- 	$(LIBCROCO_LIBS)		\
- 	$(LIBRSVG_LIBS) 		\
--	$(top_builddir)/librsvg-2.la
-+	$(top_builddir)/librsvg-@RSVG_API_MAJOR_VERSION@.la
- 
- test_performance_SOURCES = test-performance.c
- test_performance_LDFLAGS =
-diff -upr a/librsvg-2.0.pc.in b/librsvg-2.0.pc.in
---- a/librsvg-2.0.pc.in	2010-04-29 12:28:16.000000000 +0100
-+++ b/librsvg-2.0.pc.in	2010-06-11 13:06:52.000000000 +0100
-@@ -9,7 +9,7 @@ css_supported=@CSS_SUPPORTED@
- Name: librsvg
- Description: library that renders svg files
- Version: @VERSION@
--Requires: glib-2.0 gdk-pixbuf-2.0 cairo
-+Requires: glib-2.0 gdk-pixbuf-@GTK_API_VERSION@ cairo
- Requires.private:
--Libs: -L${libdir} -lrsvg-2 -lm
--Cflags: -I${includedir}/librsvg-2
-+Libs: -L${libdir} -lrsvg-@RSVG_API_MAJOR_VERSION@ -lm
-+Cflags: -I${includedir}/librsvg-@RSVG_API_VERSION@
-diff --git a/librsvg-2.0-uninstalled.pc.in b/librsvg-2.0-uninstalled.pc.in
---- a/librsvg-2.0-uninstalled.pc.in
-+++ b/librsvg-2.0-uninstalled.pc.in
-@@ -9,6 +9,6 @@ css_supported=@CSS_SUPPORTED@
- Name: librsvg
- Description: library that renders svg files
- Version: @VERSION@
--Requires: glib-2.0 gdk-pixbuf-2.0
--Libs: ${pc_top_builddir}/${pcfiledir}/librsvg-2.la
-+Requires: glib-2.0 gdk-pixbuf-@GTK_API_VERSION@
-+Libs: ${pc_top_builddir}/${pcfiledir}/librsvg-@RSVG_API_MAJOR_VERSION@.la
- Cflags: -I${pc_top_builddir}/${pcfiledir}
diff --git a/librsvg-2.35.0-fix-depcr-warning.patch b/librsvg-2.35.0-fix-depcr-warning.patch
deleted file mode 100644
index d4b2b94..0000000
--- a/librsvg-2.35.0-fix-depcr-warning.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-Fix rsvg.h causing an "internal" deprated warning
-
-Before this patch rsvg.h marks the RsvgSizeFunc *type* as deprecated, and
-then uses it to declare other deprecated functions, causing gcc to always
-emit a depecrated warning as soon as rsvg.h is included. This breaks
-compilation of apps which compile with -Werror.
-
-Fix this by not making the RsvgSizeFunc type deprecated, but leaving
-the function prototypes using it as deprecated.
-
-Signed-off-by: Hans de Goede <hdegoede@redhat.com>
---- librsvg-2.35.0/rsvg.h~	2011-11-10 19:22:34.000000000 +0100
-+++ librsvg-2.35.0/rsvg.h	2011-12-10 09:11:30.525804670 +0100
-@@ -203,7 +203,7 @@ void rsvg_handle_free (RsvgHandle * hand
-  *
-  * Deprecated: Set up a cairo matrix and use rsvg_handle_render_cairo() instead.
-  */
--typedef RSVG_DEPRECATED void (*RsvgSizeFunc) (gint * width, gint * height, gpointer user_data);
-+typedef void (*RsvgSizeFunc) (gint * width, gint * height, gpointer user_data);
- 
- RSVG_DEPRECATED
- void rsvg_handle_set_size_callback (RsvgHandle * handle,
diff --git a/librsvg-libs.patch b/librsvg-libs.patch
deleted file mode 100644
index 334dc66..0000000
--- a/librsvg-libs.patch
+++ /dev/null
@@ -1,10 +0,0 @@
-diff -up librsvg-2.26.0/Makefile.am.libs librsvg-2.26.0/Makefile.am
-diff -up librsvg-2.26.0/tests/pdiff/Makefile.am.libs librsvg-2.26.0/tests/pdiff/Makefile.am
---- librsvg-2.26.0/tests/pdiff/Makefile.am.libs	2010-02-14 14:09:53.701154808 -0500
-+++ librsvg-2.26.0/tests/pdiff/Makefile.am	2010-02-14 14:10:08.450903872 -0500
-@@ -13,4 +13,4 @@ perceptualdiff_SOURCES =	\
- 	perceptualdiff.c
- 
- INCLUDES = $(LIBRSVG_CFLAGS)
--LDADD = libpdiff.la $(LIBRSVG_LIBS)
-+LDADD = libpdiff.la $(LIBRSVG_LIBS) -lm
diff --git a/librsvg2-build-gir.patch b/librsvg2-build-gir.patch
deleted file mode 100644
index 7aa4e6a..0000000
--- a/librsvg2-build-gir.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-From 154dcd5f4366dc5080a6582b51b0769c51c0b068 Mon Sep 17 00:00:00 2001
-From: Alexandre Rostovtsev <tetromino@gentoo.org>
-Date: Wed, 23 Nov 2011 22:41:12 +0000
-Subject: Use RSVG_API_VERSION in the .gir filename
-
-RSVG_API_VERSION == "2.0"
-RSVG_API_VERSION_U == "2_0"
-
-We want to use 2.0 when referring to the .gir filename, and 2_0 when
-referring to the automake targets derived from the filename. Otherwise,
-parallel make fails.
-
-Thanks to Rafał Mużyło <galtgendo@o2.pl> for pointing this out in
-https://bugs.gentoo.org/show_bug.cgi?id=391215#c10
-
-https://bugzilla.gnome.org/show_bug.cgi?id=664684
----
-diff --git a/Makefile.am b/Makefile.am
-index 511df68..5a8dda3 100644
---- a/Makefile.am
-+++ b/Makefile.am
-@@ -235,7 +235,7 @@ INTROSPECTION_GIRS = Rsvg-@RSVG_API_VERSION@.gir
- INTROSPECTION_SCANNER_ARGS = --add-include-path=$(srcdir)
- INTROSPECTION_COMPILER_ARGS = --includedir=$(srcdir)
- 
--Rsvg-@RSVG_API_VERSION_U@.gir: librsvg-@RSVG_API_MAJOR_VERSION@.la
-+Rsvg-@RSVG_API_VERSION@.gir: librsvg-@RSVG_API_MAJOR_VERSION@.la
- 
- Rsvg_@RSVG_API_VERSION_U@_gir_NAMESPACE = Rsvg
- Rsvg_@RSVG_API_VERSION_U@_gir_EXPORT_PACKAGES = librsvg-$(RSVG_API_VERSION)
---
-cgit v0.9.0.2
diff --git a/rsvg-better-free.patch b/rsvg-better-free.patch
deleted file mode 100644
index e32de43..0000000
--- a/rsvg-better-free.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-Index: rsvg-image.c
-===================================================================
---- rsvg-image.c	(revision 1176)
-+++ rsvg-image.c	(working copy)
-@@ -472,9 +472,10 @@
-     RsvgNodeImage *z = (RsvgNodeImage *) self;
-     rsvg_state_finalize (z->super.state);
-     g_free (z->super.state);
-+    z->super.state = NULL;
-     if (z->img)
-         g_object_unref (G_OBJECT (z->img));
--    g_free (z);
-+    _rsvg_node_free(self);
- }
- 
- static void
diff --git a/rsvg-pixbuf.patch b/rsvg-pixbuf.patch
deleted file mode 100644
index ad60095..0000000
--- a/rsvg-pixbuf.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -up librsvg-2.31.0/librsvg.pc.in.pixbuf librsvg-2.31.0/librsvg.pc.in
---- librsvg-2.31.0/librsvg.pc.in.pixbuf	2010-06-30 21:25:28.641806068 -0400
-+++ librsvg-2.31.0/librsvg.pc.in	2010-06-30 21:25:53.882811376 -0400
-@@ -9,7 +9,7 @@ css_supported=@CSS_SUPPORTED@
- Name: librsvg
- Description: library that renders svg files
- Version: @VERSION@
--Requires: glib-2.0 gio-2.0 gdk-pixbuf-@GTK_API_VERSION@ cairo
-+Requires: glib-2.0 gio-2.0 gdk-pixbuf-2.0 cairo
- Requires.private:
- Libs: -L${libdir} -lrsvg-@RSVG_API_MAJOR_VERSION@ -lm
- Cflags: -I${includedir}/librsvg-@RSVG_API_VERSION@