From f932704944988875699b073fb318fcd520f7a47cc52671c01558d98befe4a9be Mon Sep 17 00:00:00 2001 From: OBS User autobuild Date: Mon, 13 Sep 2010 09:45:39 +0000 Subject: [PATCH] Accepting request 47790 from GNOME:Factory checked in (request 47790) OBS-URL: https://build.opensuse.org/request/show/47790 OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/librsvg?expand=0&rev=27 --- librsvg-gdk-pixbuf-render-gtk3.patch | 107 --------------------------- librsvg.changes | 9 --- librsvg.spec | 3 - 3 files changed, 119 deletions(-) delete mode 100644 librsvg-gdk-pixbuf-render-gtk3.patch diff --git a/librsvg-gdk-pixbuf-render-gtk3.patch b/librsvg-gdk-pixbuf-render-gtk3.patch deleted file mode 100644 index 6c7f76a..0000000 --- a/librsvg-gdk-pixbuf-render-gtk3.patch +++ /dev/null @@ -1,107 +0,0 @@ -From 18bbb79af0c798db6099dbe0dd6fff5b43f030be Mon Sep 17 00:00:00 2001 -From: Jasper St. Pierre -Date: Thu, 12 Aug 2010 04:44:36 -0400 -Subject: [PATCH] Apply Company's changes on the internal librsvg pixbuf engine to remove the gdk calls and move over to cairo. - -https://bugzilla.gnome.org/show_bug.cgi?id=626605 ---- - gtk-engine/svg-render.c | 70 +++++++++++++++++++++-------------------------- - 1 files changed, 31 insertions(+), 39 deletions(-) - -diff --git a/gtk-engine/svg-render.c b/gtk-engine/svg-render.c -index ebe2f22..15440cc 100644 ---- a/gtk-engine/svg-render.c -+++ b/gtk-engine/svg-render.c -@@ -418,21 +418,30 @@ pixbuf_render (GdkPixbuf *src, - y_offset = 0; - } - -+ cairo_t *cr; -+ - if (mask) - { -- gdk_pixbuf_render_threshold_alpha (tmp_pixbuf, mask, -- x_offset, y_offset, -- rect.x, rect.y, -- rect.width, rect.height, -- 128); -+ cr = gdk_cairo_create (mask); -+ -+ gdk_cairo_set_source_pixbuf (cr, tmp_pixbuf, -+ -x_offset + rect.x, -+ -y_offset + rect.y); -+ gdk_cairo_rectangle (cr, &rect); -+ cairo_fill (cr); -+ -+ cairo_destroy (cr); - } - -- gdk_draw_pixbuf (window, NULL, tmp_pixbuf, -- x_offset, y_offset, -- rect.x, rect.y, -- rect.width, rect.height, -- GDK_RGB_DITHER_NORMAL, -- 0, 0); -+ cr = gdk_cairo_create (window); -+ gdk_cairo_set_source_pixbuf (cr, -+ tmp_pixbuf, -+ -x_offset + rect.x, -+ -y_offset + rect.y); -+ gdk_cairo_rectangle (cr, &rect); -+ cairo_fill (cr); -+ -+ cairo_destroy (cr); - g_object_unref (tmp_pixbuf); - } - -@@ -827,37 +836,20 @@ theme_pixbuf_render (ThemePixbuf *theme_pb, - } - else - { -- GdkPixmap *tmp_pixmap; -- GdkGC *tmp_gc; -- GdkGCValues gc_values; -- -- tmp_pixmap = gdk_pixmap_new (window, -- pixbuf_width, -- pixbuf_height, -- -1); -- tmp_gc = gdk_gc_new (tmp_pixmap); -- gdk_draw_pixbuf (tmp_pixmap, tmp_gc, pixbuf, -- 0, 0, -- 0, 0, -- pixbuf_width, pixbuf_height, -- GDK_RGB_DITHER_NORMAL, -- 0, 0); -- g_object_unref (tmp_gc); -- -- gc_values.fill = GDK_TILED; -- gc_values.tile = tmp_pixmap; -- tmp_gc = gdk_gc_new_with_values (window, -- &gc_values, GDK_GC_FILL | GDK_GC_TILE); -+ cairo_t *cr = gdk_cairo_create (window); -+ -+ gdk_cairo_set_source_pixbuf (cr, pixbuf, 0, 0); -+ cairo_pattern_set_extend (cairo_get_source (cr), CAIRO_EXTEND_REPEAT); -+ - if (clip_rect) -- gdk_draw_rectangle (window, tmp_gc, TRUE, -- clip_rect->x, clip_rect->y, clip_rect->width, clip_rect->height); -+ gdk_cairo_rectangle (cr, clip_rect); - else -- gdk_draw_rectangle (window, tmp_gc, TRUE, x, y, width, height); -+ cairo_rectangle (cr, x, y, width, height); - -- g_object_unref (tmp_gc); -- g_object_unref (tmp_pixmap); -- } -- } -+ cairo_fill (cr); - -+ cairo_destroy (cr); -+ } -+ } - g_object_unref(pixbuf); - } --- -1.7.2.1 diff --git a/librsvg.changes b/librsvg.changes index 20d521b..4e441bc 100644 --- a/librsvg.changes +++ b/librsvg.changes @@ -1,12 +1,3 @@ -------------------------------------------------------------------- -Fri Sep 10 00:06:06 CEST 2010 - vuntz@opensuse.org - -- Add librsvg-gdk-pixbuf-render-gtk3.patch to fix build with - GTK+ 3: the pixbuf renderer was using API that got removed. The - patch is correct, but suboptimal, so it's still sitting in - bugzilla. However, since we're not using this GTK+ engine by - default, it's okay to use it. - ------------------------------------------------------------------- Fri Jul 23 09:26:51 CEST 2010 - vuntz@opensuse.org diff --git a/librsvg.spec b/librsvg.spec index fdeabf5..34debec 100644 --- a/librsvg.spec +++ b/librsvg.spec @@ -30,8 +30,6 @@ Source99: baselibs.conf # PATCH-FIX-OPENSUSE librsvg-gdk-pixbuf-query-loaders-64.patch vuntz@opensuse.org -- Fix check for gdk-pixbuf-query-loaders on 64bit systems Patch0: librsvg-gdk-pixbuf-query-loaders-64.patch Patch1: env-paths.diff -# PATCH-FIX-UPSTREAM librsvg-gdk-pixbuf-render-gtk3.patch bgo#626605 vuntz@opensuse.org -- Fix build with recent gtk+ 3. The patch is technically correct, but suboptimal; see comments in bugzilla. Still, okay for us as we don't use this engine by default. -Patch2: librsvg-gdk-pixbuf-render-gtk3.patch BuildRequires: pkgconfig(cairo) BuildRequires: pkgconfig(fontconfig) BuildRequires: pkgconfig(freetype2) @@ -135,7 +133,6 @@ http://www.w3c.org). touch aclocal.m4 %endif %patch1 -%patch2 -p1 %build %configure\