[arch-commits] Commit in lib32-librsvg/trunk (PKGBUILD bgo759084.patch)
Felix Yan
fyan at archlinux.org
Sat Apr 2 14:41:51 UTC 2016
Date: Saturday, April 2, 2016 @ 16:41:51
Author: fyan
Revision: 169243
upgpkg: lib32-librsvg 2.40.15-1
Modified:
lib32-librsvg/trunk/PKGBUILD
Deleted:
lib32-librsvg/trunk/bgo759084.patch
-----------------+
PKGBUILD | 13 +++----------
bgo759084.patch | 53 -----------------------------------------------------
2 files changed, 3 insertions(+), 63 deletions(-)
Modified: PKGBUILD
===================================================================
--- PKGBUILD 2016-04-02 14:37:37 UTC (rev 169242)
+++ PKGBUILD 2016-04-02 14:41:51 UTC (rev 169243)
@@ -4,7 +4,7 @@
# Contributor: Jan de Groot <jgc at archlinux.org>
pkgname=lib32-librsvg
-pkgver=2.40.13
+pkgver=2.40.15
pkgrel=1
pkgdesc='A SVG viewing library (32-bit)'
arch=('x86_64')
@@ -13,16 +13,9 @@
depends=('lib32-gdk-pixbuf2' 'lib32-libcroco' 'lib32-pango' 'librsvg')
makedepends=('gcc-multilib' 'gobject-introspection' 'intltool' 'python2' 'vala')
install='librsvg.install'
-source=("https://download.gnome.org/sources/librsvg/${pkgver:0:4}/librsvg-${pkgver}.tar.xz"
- bgo759084.patch)
-sha256sums=('4d6ea93ec05f5dabe7262d711d246a0a99b2311e215360dd3dcabd6afe3b9804'
- 'd6cf5b318a89fb002a520c830c0666f0cb905d4d38322b2c41296fdd36d60b93')
+source=("https://download.gnome.org/sources/librsvg/${pkgver:0:4}/librsvg-${pkgver}.tar.xz")
+sha256sums=('d9cac4a123eec6e553a26e120979bab7425def9ae7ce7c079eba5e4a45db05f4')
-prepare() {
- cd librsvg-$pkgver
- patch -Np1 -i ../bgo759084.patch
-}
-
build() {
cd librsvg-${pkgver}
Deleted: bgo759084.patch
===================================================================
--- bgo759084.patch 2016-04-02 14:37:37 UTC (rev 169242)
+++ bgo759084.patch 2016-04-02 14:41:51 UTC (rev 169243)
@@ -1,53 +0,0 @@
-From d937c691678803ceda6be701587d997ccd03a1da Mon Sep 17 00:00:00 2001
-From: Benjamin Otte <otte at redhat.com>
-Date: Fri, 29 Jan 2016 12:49:55 +0100
-Subject: Don't crash when filters don't exist
-
-We put a new surface on the stack if a filter existed by name but we
-didn't pop it if the name didn't resolve to a real filter.
-
-New test: crash/bug759084.svg
-
-https://bugzilla.gnome.org/show_bug.cgi?id=759084
----
- rsvg-cairo-draw.c | 6 +++---
- tests/fixtures/crash/bug759084.svg | 9 +++++++++
- 2 files changed, 12 insertions(+), 3 deletions(-)
- create mode 100644 tests/fixtures/crash/bug759084.svg
-
-diff --git a/rsvg-cairo-draw.c b/rsvg-cairo-draw.c
-index 4d8fbc2..4152cb7 100644
---- a/rsvg-cairo-draw.c
-+++ b/rsvg-cairo-draw.c
-@@ -819,10 +819,10 @@ rsvg_cairo_pop_render_stack (RsvgDrawingCtx * ctx)
- cairo_surface_t *output;
-
- filter = rsvg_acquire_node (ctx, state->filter);
-- if (filter && RSVG_NODE_TYPE (filter) == RSVG_NODE_TYPE_FILTER) {
-- output = render->surfaces_stack->data;
-- render->surfaces_stack = g_list_delete_link (render->surfaces_stack, render->surfaces_stack);
-+ output = render->surfaces_stack->data;
-+ render->surfaces_stack = g_list_delete_link (render->surfaces_stack, render->surfaces_stack);
-
-+ if (filter && RSVG_NODE_TYPE (filter) == RSVG_NODE_TYPE_FILTER) {
- needs_destroy = TRUE;
- surface = rsvg_filter_render ((RsvgFilter *) filter, output, ctx, &render->bbox, "2103");
- /* Don't destroy the output surface, it's owned by child_cr */
-diff --git a/tests/fixtures/crash/bug759084.svg b/tests/fixtures/crash/bug759084.svg
-new file mode 100644
-index 0000000..9e8f8f1
---- /dev/null
-+++ b/tests/fixtures/crash/bug759084.svg
-@@ -0,0 +1,9 @@
-+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 10 10">
-+ <defs>
-+ <filter id="filter">
-+ </filter>
-+ </defs>
-+ <g filter="url(#filter)">
-+ <rect fill="red" width="10" height="10" filter="url(#doesnotexist)" />
-+ </g>
-+</svg>
---
-cgit v0.12
-
More information about the arch-commits
mailing list