commit: 8cdc8c876e8dd460e7749511d8c5478104e14246 Author: Pacho Ramos <pacho <AT> gentoo <DOT> org> AuthorDate: Sat Jul 2 12:48:05 2016 +0000 Commit: Pacho Ramos <pacho <AT> gentoo <DOT> org> CommitDate: Sat Jul 2 13:30:33 2016 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8cdc8c87
gnome-base/librsvg: Drop old Package-Manager: portage-2.3.0_rc1 gnome-base/librsvg/Manifest | 1 - .../files/librsvg-2.40.13-filters-crash.patch | 53 ----------- gnome-base/librsvg/librsvg-2.40.13-r1.ebuild | 102 --------------------- gnome-base/librsvg/librsvg-2.40.13.ebuild | 99 -------------------- 4 files changed, 255 deletions(-) diff --git a/gnome-base/librsvg/Manifest b/gnome-base/librsvg/Manifest index e6b127b..659fa99 100644 --- a/gnome-base/librsvg/Manifest +++ b/gnome-base/librsvg/Manifest @@ -1,3 +1,2 @@ DIST librsvg-2.40.11.tar.xz 539428 SHA256 611ac0f544debd0c9bf1ef5509c990d218e83dd1d8c83297075c4b29796a2e02 SHA512 89fc4f94150ab47665ab1b6c26979c8072efe40dd74ff13284598cb63de8594e7cfe4b73a151e54002a4811b5de56b93f5d52215ef0862b994d230fafe04b4fc WHIRLPOOL 7c9a0292faf42dd396a59b38c6900a1b78a254c8bd8c724b5636d506c41934d19c924fbf86c2faab7151c065dd134252b78adfd94940b09acd601ef2dc86a5cc -DIST librsvg-2.40.13.tar.xz 552900 SHA256 4d6ea93ec05f5dabe7262d711d246a0a99b2311e215360dd3dcabd6afe3b9804 SHA512 7549f78d25c3319b5b74803c46cc0d1bd5c53a425b632a5b306eb238080df0da2b4bcefb159064988bd56cb1d69e0c94ecd0a073315acff14abb187ba6d4c788 WHIRLPOOL 9113a1ae41a8f2146dd55f9d3a9d47f4f45c7926434d91cf94387ab054b6585371a6d6175699588481f331f0dba98ffccd7597c7792c73d8ba009ce5b1cfa8c8 DIST librsvg-2.40.15.tar.xz 554608 SHA256 d9cac4a123eec6e553a26e120979bab7425def9ae7ce7c079eba5e4a45db05f4 SHA512 1169c02247dbf3d71d3d4bfb1aa2580a4b1e243e1c2c6d1c86aaa09c54c66857b959df4358a1ca6a34ec5fbb34b9529963b993fc978ec1fe401dbc56ac460101 WHIRLPOOL 687e9afc6c1c46079fa9005c94ed329ff6f681a9fb784df999efca36ba1fac05a05f3d6413105993ff4af60a62a36b647e2f1335ab1245c621de2ff76ccef479 diff --git a/gnome-base/librsvg/files/librsvg-2.40.13-filters-crash.patch b/gnome-base/librsvg/files/librsvg-2.40.13-filters-crash.patch deleted file mode 100644 index f5503d1..0000000 --- a/gnome-base/librsvg/files/librsvg-2.40.13-filters-crash.patch +++ /dev/null @@ -1,53 +0,0 @@ -From d937c691678803ceda6be701587d997ccd03a1da Mon Sep 17 00:00:00 2001 -From: Benjamin Otte <o...@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 - diff --git a/gnome-base/librsvg/librsvg-2.40.13-r1.ebuild b/gnome-base/librsvg/librsvg-2.40.13-r1.ebuild deleted file mode 100644 index 7a0f5bc..0000000 --- a/gnome-base/librsvg/librsvg-2.40.13-r1.ebuild +++ /dev/null @@ -1,102 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI="5" -GCONF_DEBUG="no" -GNOME2_LA_PUNT="yes" -VALA_USE_DEPEND="vapigen" - -inherit autotools gnome2 multilib-minimal vala - -DESCRIPTION="Scalable Vector Graphics (SVG) rendering library" -HOMEPAGE="https://wiki.gnome.org/Projects/LibRsvg"; - -LICENSE="LGPL-2" -SLOT="2" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris" - -IUSE="+introspection vala tools" -REQUIRED_USE="vala? ( introspection )" - -RDEPEND=" - >=dev-libs/glib-2.34.3:2[${MULTILIB_USEDEP}] - >=x11-libs/cairo-1.12.14-r4[${MULTILIB_USEDEP}] - >=x11-libs/pango-1.36.3[${MULTILIB_USEDEP}] - >=dev-libs/libxml2-2.9.1-r4:2[${MULTILIB_USEDEP}] - >=dev-libs/libcroco-0.6.8-r1[${MULTILIB_USEDEP}] - >=x11-libs/gdk-pixbuf-2.30.7:2[introspection?,${MULTILIB_USEDEP}] - introspection? ( >=dev-libs/gobject-introspection-0.10.8:= ) - tools? ( >=x11-libs/gtk+-3.10.0:3 ) -" -DEPEND="${RDEPEND} - dev-libs/gobject-introspection-common - dev-libs/vala-common - >=dev-util/gtk-doc-am-1.13 - >=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}] - vala? ( $(vala_depend) ) -" -# >=gtk-doc-am-1.13, gobject-introspection-common, vala-common needed by eautoreconf - -src_prepare() { - # https://bugzilla.gnome.org/show_bug.cgi?id=653323 - epatch "${FILESDIR}/${PN}-2.40.12-gtk-optional.patch" - - # https://bugzilla.gnome.org/show_bug.cgi?id=731826 - epatch "${FILESDIR}/${PN}-2.40.2-vala-out-of-source.patch" - - # Don't crash when filters don't exist (included in next release) - epatch "${FILESDIR}/${P}-filters-crash.patch" - - eautoreconf - - use vala && vala_src_prepare - gnome2_src_prepare -} - -multilib_src_configure() { - local myconf=() - - # -Bsymbolic is not supported by the Darwin toolchain - if [[ ${CHOST} == *-darwin* ]]; then - myconf+=( --disable-Bsymbolic ) - fi - - # --disable-tools even when USE=tools; the tools/ subdirectory is useful - # only for librsvg developers - ECONF_SOURCE=${S} \ - gnome2_src_configure \ - --disable-static \ - --disable-tools \ - $(multilib_native_use_enable introspection) \ - $(multilib_native_use_with tools gtk3) \ - $(multilib_native_use_enable vala) \ - --enable-pixbuf-loader \ - "${myconf[@]}" - - if multilib_is_native_abi; then - ln -s "${S}"/doc/html doc/html || die - fi -} - -multilib_src_compile() { - # causes segfault if set, see bug #411765 - unset __GL_NO_DSO_FINALIZER - gnome2_src_compile -} - -multilib_src_install() { - gnome2_src_install -} - -pkg_postinst() { - # causes segfault if set, see bug 375615 - unset __GL_NO_DSO_FINALIZER - multilib_foreach_abi gnome2_pkg_postinst -} - -pkg_postrm() { - # causes segfault if set, see bug 375615 - unset __GL_NO_DSO_FINALIZER - multilib_foreach_abi gnome2_pkg_postrm -} diff --git a/gnome-base/librsvg/librsvg-2.40.13.ebuild b/gnome-base/librsvg/librsvg-2.40.13.ebuild deleted file mode 100644 index 54d2a19..0000000 --- a/gnome-base/librsvg/librsvg-2.40.13.ebuild +++ /dev/null @@ -1,99 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI="5" -GCONF_DEBUG="no" -GNOME2_LA_PUNT="yes" -VALA_USE_DEPEND="vapigen" - -inherit autotools gnome2 multilib-minimal vala - -DESCRIPTION="Scalable Vector Graphics (SVG) rendering library" -HOMEPAGE="https://wiki.gnome.org/Projects/LibRsvg"; - -LICENSE="LGPL-2" -SLOT="2" -KEYWORDS="~alpha amd64 arm ~arm64 hppa ~ia64 ~mips ~ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris" - -IUSE="+introspection vala tools" -REQUIRED_USE="vala? ( introspection )" - -RDEPEND=" - >=dev-libs/glib-2.34.3:2[${MULTILIB_USEDEP}] - >=x11-libs/cairo-1.12.14-r4[${MULTILIB_USEDEP}] - >=x11-libs/pango-1.36.3[${MULTILIB_USEDEP}] - >=dev-libs/libxml2-2.9.1-r4:2[${MULTILIB_USEDEP}] - >=dev-libs/libcroco-0.6.8-r1[${MULTILIB_USEDEP}] - >=x11-libs/gdk-pixbuf-2.30.7:2[introspection?,${MULTILIB_USEDEP}] - introspection? ( >=dev-libs/gobject-introspection-0.10.8:= ) - tools? ( >=x11-libs/gtk+-3.10.0:3 ) -" -DEPEND="${RDEPEND} - dev-libs/gobject-introspection-common - dev-libs/vala-common - >=dev-util/gtk-doc-am-1.13 - >=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}] - vala? ( $(vala_depend) ) -" -# >=gtk-doc-am-1.13, gobject-introspection-common, vala-common needed by eautoreconf - -src_prepare() { - # https://bugzilla.gnome.org/show_bug.cgi?id=653323 - epatch "${FILESDIR}/${PN}-2.40.12-gtk-optional.patch" - - # https://bugzilla.gnome.org/show_bug.cgi?id=731826 - epatch "${FILESDIR}/${PN}-2.40.2-vala-out-of-source.patch" - - eautoreconf - - use vala && vala_src_prepare - gnome2_src_prepare -} - -multilib_src_configure() { - local myconf=() - - # -Bsymbolic is not supported by the Darwin toolchain - if [[ ${CHOST} == *-darwin* ]]; then - myconf+=( --disable-Bsymbolic ) - fi - - # --disable-tools even when USE=tools; the tools/ subdirectory is useful - # only for librsvg developers - ECONF_SOURCE=${S} \ - gnome2_src_configure \ - --disable-static \ - --disable-tools \ - $(multilib_native_use_enable introspection) \ - $(multilib_native_use_with tools gtk3) \ - $(multilib_native_use_enable vala) \ - --enable-pixbuf-loader \ - "${myconf[@]}" - - if multilib_is_native_abi; then - ln -s "${S}"/doc/html doc/html || die - fi -} - -multilib_src_compile() { - # causes segfault if set, see bug #411765 - unset __GL_NO_DSO_FINALIZER - gnome2_src_compile -} - -multilib_src_install() { - gnome2_src_install -} - -pkg_postinst() { - # causes segfault if set, see bug 375615 - unset __GL_NO_DSO_FINALIZER - multilib_foreach_abi gnome2_pkg_postinst -} - -pkg_postrm() { - # causes segfault if set, see bug 375615 - unset __GL_NO_DSO_FINALIZER - multilib_foreach_abi gnome2_pkg_postrm -}
