Hello community,
here is the log from the commit of package librsvg
checked in at Mon Feb 19 23:35:17 CET 2007.
--------
--- GNOME/librsvg/librsvg.changes 2007-02-18 18:12:03.000000000 +0100
+++ librsvg/librsvg.changes 2007-02-19 22:25:37.873113000 +0100
@@ -1,0 +2,6 @@
+Mon Feb 19 12:47:49 CST 2007 - maw@suse.de
+
+- Update to version 2.16.1
+- Remove librsvg-xulrunner.patch which is now upstream.
+
+-------------------------------------------------------------------
Old:
----
librsvg-2.16.0.tar.bz2
librsvg-xulrunner.patch
New:
----
librsvg-2.16.1.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ librsvg.spec ++++++
--- /var/tmp/diff_new_pack.h26347/_old 2007-02-19 23:34:37.000000000 +0100
+++ /var/tmp/diff_new_pack.h26347/_new 2007-02-19 23:34:37.000000000 +0100
@@ -1,5 +1,5 @@
#
-# spec file for package librsvg (Version 2.16.0)
+# spec file for package librsvg (Version 2.16.1)
#
# Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany.
# This file and all modifications and additions to the pristine
@@ -24,11 +24,10 @@
BuildRequires: gecko-sdk
%endif
PreReq: coreutils
-Version: 2.16.0
-Release: 44
+Version: 2.16.1
+Release: 1
Summary: A Library for Rendering SVG Data
Source: ftp://ftp.gnome.org/pub/GNOME/sources/librsvg/2.16/%{name}-%{version}.tar.bz2
-Patch: librsvg-xulrunner.patch
URL: http://librsvg.sourceforge.net/
BuildRoot: %{_tmppath}/%{name}-%{version}-build
@@ -78,7 +77,6 @@
%prep
%setup -q
-%patch
%build
autoreconf -f -i
@@ -136,6 +134,9 @@
%{_libdir}/browser-plugins/*.so
%changelog
+* Mon Feb 19 2007 - maw@suse.de
+- Update to version 2.16.1
+- Remove librsvg-xulrunner.patch which is now upstream.
* Sun Feb 18 2007 - aj@suse.de
- Cleanup BuildRequires.
* Tue Feb 13 2007 - sbrabec@suse.cz
++++++ librsvg-2.16.0.tar.bz2 -> librsvg-2.16.1.tar.bz2 ++++++
++++ 2760 lines of diff (skipped)
++++ retrying with extended exclude list
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/librsvg-2.16.0/ChangeLog new/librsvg-2.16.1/ChangeLog
--- old/librsvg-2.16.0/ChangeLog 2006-08-31 16:04:25.000000000 +0200
+++ new/librsvg-2.16.1/ChangeLog 2006-11-03 02:51:18.000000000 +0100
@@ -1,3 +1,38 @@
+2006-11-02 Dom Lachowicz
+
+ * configure.in: 2.16.1
+
+2006-11-02 Dom Lachowicz
+
+ * rsvg-structure.c: Bug 361267 - SVGs with duplicate IDs cause Nautilus/eog to
+ crash. Basically, a <use> used itself, causing infinite drawing recursion.
+
+2006-11-02 Dom Lachowicz
+
+ * rsvg-gobject.c: Introduce PRIVATE API to get around bugs 357406 and 362217.
+ IMHO, gobject's type registration and quark/error system is fundamentally
+ broken with respect to (un)loadable modules such as GTK+ theme engines. This
+ is the best I can do for now without breaking librsvg's API. This may cause
+ as many headaches as it fixes, though.
+ * rsvg-private.h: Declare new _rsvg_register_types() function
+ * gtk-engine/svg-main.c: Invoke new type registration function
+ * librsvg.def: export this function
+
+2006-11-02 Dom Lachowicz
+
+ * rsvg-base.c: Use g_quark_from_string() because librsvg might be used
+ in a plugin that gets unloaded
+
+2006-10-13 Kouhei Sutou
+
+ * rsvg-cairo-clip.c: Fix bug with scaling + clipping reported on
+ cairo-devel.
+
+2006-09-08 Wouter Bolsterlee
+
+ * configure.in: Build the mozilla plugin using libxul in
+ addition to mozilla and firefox.
+
2006-08-31 Dom Lachowicz
* configure.in: 2.16.0
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/librsvg-2.16.0/configure.in new/librsvg-2.16.1/configure.in
--- old/librsvg-2.16.0/configure.in 2006-08-31 16:55:47.000000000 +0200
+++ new/librsvg-2.16.1/configure.in 2006-11-03 02:32:21.000000000 +0100
@@ -4,7 +4,7 @@
FONTCONFIG_REQUIRED=1.0.1 dnl Same as in Pango, ???
GDK_PIXBUF_REQUIRED=1.3.7
-GLIB_REQUIRED=2.11.0
+GLIB_REQUIRED=2.12.0
LIBXML_REQUIRED=2.4.7
CAIRO_REQUIRED=1.2.0
PANGOFT2_REQUIRED=1.2.0
@@ -20,7 +20,7 @@
LIBRSVG_MAJOR_VERSION=2
LIBRSVG_MINOR_VERSION=16
-LIBRSVG_MICRO_VERSION=0
+LIBRSVG_MICRO_VERSION=1
AC_SUBST(LIBRSVG_MAJOR_VERSION)
AC_SUBST(LIBRSVG_MINOR_VERSION)
AC_SUBST(LIBRSVG_MICRO_VERSION)
@@ -307,7 +307,7 @@
if test "x$test_mozilla_plugin" != "xno"; then
if test -z "$MOZILLA_CONFIG"; then
- AC_PATH_PROGS(MOZILLA_CONFIG, mozilla-config firefox-config, no)
+ AC_PATH_PROGS(MOZILLA_CONFIG, mozilla-config firefox-config xulrunner-config, no)
fi
if test "x$MOZILLA_CONFIG" != "xno"; then
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/librsvg-2.16.0/gtk-engine/svg-main.c new/librsvg-2.16.1/gtk-engine/svg-main.c
--- old/librsvg-2.16.0/gtk-engine/svg-main.c 2002-09-25 20:23:12.000000000 +0200
+++ new/librsvg-2.16.1/gtk-engine/svg-main.c 2006-11-03 02:25:31.000000000 +0100
@@ -24,6 +24,7 @@
#include "svg.h"
#include "svg-style.h"
#include "svg-rc-style.h"
+#include "rsvg-private.h"
#include
G_MODULE_EXPORT const gchar* g_module_check_init (GModule *module);
@@ -34,6 +35,7 @@
void
theme_init (GTypeModule *module)
{
+ _rsvg_register_types (module); /* HACK to get around bugs 357406 and 362217 */
rsvg_rc_style_register_type (module);
rsvg_style_register_type (module);
}
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/librsvg-2.16.0/librsvg-features.h new/librsvg-2.16.1/librsvg-features.h
--- old/librsvg-2.16.0/librsvg-features.h 2006-08-31 16:56:47.000000000 +0200
+++ new/librsvg-2.16.1/librsvg-features.h 2006-11-03 02:58:15.000000000 +0100
@@ -3,7 +3,7 @@
#define LIBRSVG_MAJOR_VERSION (2)
#define LIBRSVG_MINOR_VERSION (16)
-#define LIBRSVG_MICRO_VERSION (0)
+#define LIBRSVG_MICRO_VERSION (1)
#define LIBRSVG_VERSION ""
extern const unsigned int librsvg_major_version, librsvg_minor_version, librsvg_micro_version;
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/librsvg-2.16.0/librsvg.def new/librsvg-2.16.1/librsvg.def
--- old/librsvg-2.16.0/librsvg.def 2006-08-23 14:07:56.000000000 +0200
+++ new/librsvg-2.16.1/librsvg.def 2006-11-03 02:21:24.000000000 +0100
@@ -31,4 +31,5 @@
rsvg_handle_get_type
_rsvg_size_callback
_rsvg_acquire_xlink_href_resource
+_rsvg_register_types
rsvg_pixbuf_from_data_with_size_data
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/librsvg-2.16.0/librsvg.spec new/librsvg-2.16.1/librsvg.spec
--- old/librsvg-2.16.0/librsvg.spec 2006-08-31 16:56:58.000000000 +0200
+++ new/librsvg-2.16.1/librsvg.spec 2006-11-03 02:58:23.000000000 +0100
@@ -2,7 +2,7 @@
%define __spec_install_post /usr/lib/rpm/brp-compress
Name: librsvg2
Summary: An SVG library based on cairo.
-Version: 2.16.0
+Version: 2.16.1
Release: 2
License: LGPL
Group: System Environment/Libraries
@@ -10,12 +10,12 @@
URL: http://librsvg.sourceforge.net/
BuildRoot: %{_tmppath}/%{name}-%{version}-root
BuildRequires: pkgconfig >= 0.8
-Requires: glib2 >= 2.11.0
+Requires: glib2 >= 2.12.0
Requires: cairo >= 1.2.0
Requires: libxml2 >= 2.4.7
Requires: pango >= 1.2.0
Requires: libgsf >= 1.6.0
-BuildRequires: glib2-devel >= 2.11.0
+BuildRequires: glib2-devel >= 2.12.0
BuildRequires: cairo-devel >= 1.2.0
BuildRequires: libxml2-devel >= 2.4.7
BuildRequires: pango-devel >= 1.2.0
@@ -30,8 +30,8 @@
Group: Development/Libraries
Requires: %{name} = %{version}
Requires: pkgconfig >= 0.8
-Requires: glib2 >= 2.11.0
-Requires: glib2-devel >= 2.11.0
+Requires: glib2 >= 2.12.0
+Requires: glib2-devel >= 2.12.0
Requires: cairo >= 1.2.0
Requires: cairo-devel >= 1.2.0
Requires: libxml2 >= 2.4.7
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/librsvg-2.16.0/rsvg-base.c new/librsvg-2.16.1/rsvg-base.c
--- old/librsvg-2.16.0/rsvg-base.c 2006-08-22 14:39:00.000000000 +0200
+++ new/librsvg-2.16.1/rsvg-base.c 2006-11-02 13:42:33.000000000 +0100
@@ -987,11 +987,9 @@
GQuark
rsvg_error_quark (void)
{
- static GQuark q = 0;
- if (q == 0)
- q = g_quark_from_static_string ("rsvg-error-quark");
-
- return q;
+ /* don't use from_static_string(), since librsvg might be used in a module
+ that's ultimately unloaded */
+ return g_quark_from_string ("rsvg-error-quark");
}
static gboolean
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/librsvg-2.16.0/rsvg-cairo-clip.c new/librsvg-2.16.1/rsvg-cairo-clip.c
--- old/librsvg-2.16.0/rsvg-cairo-clip.c 2005-10-19 11:08:23.000000000 +0200
+++ new/librsvg-2.16.1/rsvg-cairo-clip.c 2006-10-13 14:17:03.000000000 +0200
@@ -44,33 +44,15 @@
};
static void
-_set_rsvg_affine (cairo_t *cr, const double affine[6])
-{
- cairo_matrix_t matrix;
-
- cairo_matrix_init (&matrix,
- affine[0], affine[1],
- affine[2], affine[3],
- affine[4], affine[5]);
- cairo_set_matrix (cr, &matrix);
-}
-
-static void
rsvg_cairo_clip_render_path (RsvgDrawingCtx *ctx, const RsvgBpathDef *bpath_def)
{
RsvgCairoClipRender *render = (RsvgCairoClipRender *)ctx->render;
- RsvgState *state = rsvg_state_current (ctx);
cairo_t *cr;
RsvgBpath *bpath;
- cairo_matrix_t save;
int i;
cr = render->cr;
- cairo_get_matrix (cr, &save);
-
- _set_rsvg_affine (cr, state->affine);
-
if (rsvg_state_current(ctx)->clip_rule == FILL_RULE_EVENODD)
cairo_set_fill_rule (((RsvgCairoRender *)ctx->render)->cr, CAIRO_FILL_RULE_EVEN_ODD);
else /* state->fill_rule == FILL_RULE_NONZERO */
@@ -99,7 +81,6 @@
break;
}
}
- cairo_set_matrix (cr, &save);
}
static void rsvg_cairo_clip_render_image (RsvgDrawingCtx *ctx,
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/librsvg-2.16.0/rsvg-convert.c new/librsvg-2.16.1/rsvg-convert.c
--- old/librsvg-2.16.0/rsvg-convert.c 2006-05-03 19:05:40.000000000 +0200
+++ new/librsvg-2.16.1/rsvg-convert.c 2006-09-16 21:10:45.000000000 +0200
@@ -227,7 +227,7 @@
if (base_uri)
rsvg_handle_set_base_uri (rsvg, base_uri);
- /* in the case of multi-page output, all subsequent SVS are scaled to the first's size */
+ /* in the case of multi-page output, all subsequent SVGs are scaled to the first's size */
rsvg_handle_set_size_callback (rsvg, rsvg_cairo_size_callback, &dimensions, NULL);
if (i == 0)
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/librsvg-2.16.0/rsvg-gobject.c new/librsvg-2.16.1/rsvg-gobject.c
--- old/librsvg-2.16.0/rsvg-gobject.c 2006-04-30 16:58:04.000000000 +0200
+++ new/librsvg-2.16.1/rsvg-gobject.c 2006-11-03 02:33:45.000000000 +0100
@@ -266,26 +266,39 @@
rsvg_SAX_handler_struct_init ();
}
+static const GTypeInfo rsvg_type_info = {
+ sizeof (RsvgHandleClass),
+ NULL, /* base_init */
+ NULL, /* base_finalize */
+ (GClassInitFunc) class_init,
+ NULL, /* class_finalize */
+ NULL, /* class_data */
+ sizeof (RsvgHandle),
+ 0, /* n_preallocs */
+ (GInstanceInitFunc) instance_init,
+};
+
+static GType rsvg_type = 0;
+
+/* HACK to get around bugs 357406 and 362217. private API for now. */
GType
-rsvg_handle_get_type (void)
+_rsvg_register_types(GTypeModule *module)
{
- static GType type = 0;
- if (!type) {
- static const GTypeInfo info = {
- sizeof (RsvgHandleClass),
- NULL, /* base_init */
- NULL, /* base_finalize */
- (GClassInitFunc) class_init,
- NULL, /* class_finalize */
- NULL, /* class_data */
- sizeof (RsvgHandle),
- 0, /* n_preallocs */
- (GInstanceInitFunc) instance_init,
- };
+ rsvg_type = g_type_module_register_type (module,
+ G_TYPE_OBJECT,
+ "RsvgHandle",
+ &rsvg_type_info,
+ (GTypeFlags)0);
+ return rsvg_type;
+}
- type = g_type_register_static (G_TYPE_OBJECT, "RsvgHandle", &info, (GTypeFlags)0);
+GType
+rsvg_handle_get_type (void)
+{
+ if (!rsvg_type) {
+ rsvg_type = g_type_register_static (G_TYPE_OBJECT, "RsvgHandle", &rsvg_type_info, (GTypeFlags)0);
}
- return type;
+ return rsvg_type;
}
/**
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/librsvg-2.16.0/rsvg-private.h new/librsvg-2.16.1/rsvg-private.h
--- old/librsvg-2.16.0/rsvg-private.h 2006-08-22 15:08:19.000000000 +0200
+++ new/librsvg-2.16.1/rsvg-private.h 2006-11-03 02:20:52.000000000 +0100
@@ -114,6 +114,8 @@
*/
#define RSVG_ONE_MINUS_EPSILON (1.0 - DBL_EPSILON)
+GType _rsvg_register_types(GTypeModule *module);
+
struct RsvgSaxHandler {
void (*free) (RsvgSaxHandler *self);
void (*start_element) (RsvgSaxHandler *self, const char *name, RsvgPropertyBag *atts);
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/librsvg-2.16.0/rsvg-structure.c new/librsvg-2.16.1/rsvg-structure.c
--- old/librsvg-2.16.0/rsvg-structure.c 2006-02-27 18:36:20.000000000 +0100
+++ new/librsvg-2.16.1/rsvg-structure.c 2006-11-03 02:47:26.000000000 +0100
@@ -168,6 +168,33 @@
child->parent = self;
}
+static gboolean
+rsvg_node_is_ancestor (RsvgNode * potential_ancestor,
+ RsvgNode * potential_descendant)
+{
+ if(!potential_ancestor)
+ return FALSE;
+ else if(potential_descendant == potential_ancestor)
+ return TRUE;
+ else if(potential_ancestor->children) {
+ GPtrArray *children;
+ guint i, len;
+
+ children = potential_ancestor->children;
+ len = children->len;
+
+ for(i = 0; i < len; i++) {
+ RsvgNode * child;
+
+ child = (RsvgNode *)g_ptr_array_index (children, i);
+ if(rsvg_node_is_ancestor (child, potential_descendant))
+ return TRUE;
+ }
+ }
+
+ return FALSE;
+}
+
static void
rsvg_node_use_draw (RsvgNode * self, RsvgDrawingCtx *ctx,
int dominate)
@@ -187,8 +214,11 @@
child = use->link;
/* If it can find nothing to draw... draw nothing */
- if (!use->link)
+ if (!child)
return;
+ else if(rsvg_node_is_ancestor (child, self)) /* or, if we're <use>'ing ourself */
+ return;
+
state = rsvg_state_current(ctx);
if (strcmp(child->type->str, "symbol"))
{
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
---------------------------------------------------------------------
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org