revbump to prevent SIGFPE

Package-Manager: portage-2.1.2.3

diff --git a/gnome-base/librsvg/ChangeLog b/gnome-base/librsvg/ChangeLog
index 51efd88d0d330a4371da42d482b21783d4d0bba5..980c4971be207933f4b0f884c51234cc2b8887fc 100644 (file)
--- a/gnome-base/librsvg/ChangeLog
+++ b/gnome-base/librsvg/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for gnome-base/librsvg
 # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/librsvg/ChangeLog,v 1.137 2007/02/08 16:25:11 leio Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/librsvg/ChangeLog,v 1.138 2007/04/06 18:54:19 compnerd Exp $
+
+*librsvg-2.16.1-r1 (06 Apr 2007)
+
+  06 Apr 2007; Saleem Abdulrasool <compnerd@gentoo.org>
+  +files/librsvg-2.16.1-uninit.patch, +librsvg-2.16.1-r1.ebuild:
+  Revbump for a patch from truedfx to prevent floating point exceptions
 
   08 Feb 2007; Mart Raudsepp <leio@gentoo.org>
   -files/librsvg-2.12.6-plugin_checks.patch, -librsvg-2.12.7-r1.ebuild,

diff --git a/gnome-base/librsvg/Manifest b/gnome-base/librsvg/Manifest
index 0f6a7ac96a7aa6e42b4882c863c6d96dca4baea9..24e0655bdb1695a6f446c1839cb1af525f3dcb68 100644 (file)
--- a/gnome-base/librsvg/Manifest
+++ b/gnome-base/librsvg/Manifest
@@ -1,10 +1,11 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX librsvg-2.15.90-die-gtk-doc-die.patch 581 RMD160 94e7da4d6260daebd5e7b298911d1888f234ce91 SHA1 fe31e163db3afbe028b6499a20301c5278ab3966 SHA256 b85d7c1b58905258c75fd86a360a0ba2eebd5d530793d359e4be7913fffb2201
 MD5 83cc3db2d44688434536e2470020a2af files/librsvg-2.15.90-die-gtk-doc-die.patch 581
 RMD160 94e7da4d6260daebd5e7b298911d1888f234ce91 files/librsvg-2.15.90-die-gtk-doc-die.patch 581
 SHA256 b85d7c1b58905258c75fd86a360a0ba2eebd5d530793d359e4be7913fffb2201 files/librsvg-2.15.90-die-gtk-doc-die.patch 581
+AUX librsvg-2.16.1-uninit.patch 765 RMD160 abfb6af1fd08aab3fafacd19c1c216a3420f7115 SHA1 71549540d317402a08168bd5f3ad66750a3c05fe SHA256 b2fea4b59407fff1ccf1474412acf2296d43cf9b83a35abba6acb65a8ad45a0b
+MD5 c07b0821c3b3ee8dcf255aec46b3cb11 files/librsvg-2.16.1-uninit.patch 765
+RMD160 abfb6af1fd08aab3fafacd19c1c216a3420f7115 files/librsvg-2.16.1-uninit.patch 765
+SHA256 b2fea4b59407fff1ccf1474412acf2296d43cf9b83a35abba6acb65a8ad45a0b files/librsvg-2.16.1-uninit.patch 765
 DIST librsvg-2.14.4.tar.bz2 415862 RMD160 9e294f1a2e146bf30e1bde72838b8316506c9da2 SHA1 9314f0d44dbfe672dc1f1a65b66821593c3bf1ce SHA256 877f016487042eedc78c472bddd008fe70e17837374ede50726445eb8f5872d5
 DIST librsvg-2.16.1.tar.bz2 423624 RMD160 27d293693d050a8a326311b4b0b5366baf400573 SHA1 3e7d9020341dee0b0bc9b4d7b70f38e77d92e0e2 SHA256 2989d6a969b6f80d354f8120a5dd625d2c0b4e9e04bf178e9e7b34ae28e2ac69
 DIST librsvg-2.9.5.tar.bz2 392785 RMD160 5c7d6ad1a543b4880d7c3bb02da7126ed9f5aa5e SHA1 502338a1b42ec36fbca895b97a166e398e7e3018 SHA256 33a5ae2cf0a4056d46f0f09d4bd464ccfa7fa8768a1f03833e2fad5081b9bba2
@@ -12,6 +13,10 @@ EBUILD librsvg-2.14.4.ebuild 1748 RMD160 35caec7d5be9dcce7e1ac3a2ebf14f3452ba87a
 MD5 4ed059678723d9c9ac2d0aef7a6df0a9 librsvg-2.14.4.ebuild 1748
 RMD160 35caec7d5be9dcce7e1ac3a2ebf14f3452ba87a5 librsvg-2.14.4.ebuild 1748
 SHA256 eca517db92c17145aaf8e692887a86d36ad62e5252660f66105e3cfb04fcdd9d librsvg-2.14.4.ebuild 1748
+EBUILD librsvg-2.16.1-r1.ebuild 2017 RMD160 a303e3380fa86537714a3534dcb9555369967457 SHA1 bcd5875772461937be2bfdf0f9e085b9a7ed1d62 SHA256 4a50127d86595eda8da62af403e5c433b635031f57bd6b57ada2cf4294e8844c
+MD5 c96d9b7cef7dde8056504b5622a21774 librsvg-2.16.1-r1.ebuild 2017
+RMD160 a303e3380fa86537714a3534dcb9555369967457 librsvg-2.16.1-r1.ebuild 2017
+SHA256 4a50127d86595eda8da62af403e5c433b635031f57bd6b57ada2cf4294e8844c librsvg-2.16.1-r1.ebuild 2017
 EBUILD librsvg-2.16.1.ebuild 1898 RMD160 d96c8383c60d4ed16ac8748bffa4be77b59ae067 SHA1 23046603561bb531a7b9463c3bd8ea37424d7970 SHA256 21d41c7d973e3bd3c125aa20fedcb39b1420ce19c5decc2f7999e92c9e0f7bb5
 MD5 a71e9ae77ae7e1032fc59f349e3c18fd librsvg-2.16.1.ebuild 1898
 RMD160 d96c8383c60d4ed16ac8748bffa4be77b59ae067 librsvg-2.16.1.ebuild 1898
@@ -20,10 +25,10 @@ EBUILD librsvg-2.9.5.ebuild 1546 RMD160 777f3aea5e829d1f22486075d8e73cf4f509d26d
 MD5 51b920b38ffcdc52216f68508a398312 librsvg-2.9.5.ebuild 1546
 RMD160 777f3aea5e829d1f22486075d8e73cf4f509d26d librsvg-2.9.5.ebuild 1546
 SHA256 5703b19d40542b06a83245bd890e4ddc76da5edd1ee4faa34616668ca2e01d83 librsvg-2.9.5.ebuild 1546
-MISC ChangeLog 16766 RMD160 2e1278f77c689f90279b376f3dd65cb68b90acd4 SHA1 ebbbeccaa526310b0e4d9a7c0550322b4f042180 SHA256 3272e067bc9756c011ba35c17ad3589663bf7916c7e1b554c5da1555536a774c
-MD5 4817fd5cdfb2d20c0b5f0714460ca35c ChangeLog 16766
-RMD160 2e1278f77c689f90279b376f3dd65cb68b90acd4 ChangeLog 16766
-SHA256 3272e067bc9756c011ba35c17ad3589663bf7916c7e1b554c5da1555536a774c ChangeLog 16766
+MISC ChangeLog 16998 RMD160 f242bc77f88783681f7ad2248da777a5b1fdd670 SHA1 711576196b0693db244c50ec29e9968850d3ec1b SHA256 22cdfd97c0e903f2423316e87839a6c8b257ecfdf1df48a4c0e34e0548b24ab2
+MD5 b6c55f318f84540e599808a36165b7a5 ChangeLog 16998
+RMD160 f242bc77f88783681f7ad2248da777a5b1fdd670 ChangeLog 16998
+SHA256 22cdfd97c0e903f2423316e87839a6c8b257ecfdf1df48a4c0e34e0548b24ab2 ChangeLog 16998
 MISC metadata.xml 158 RMD160 c0e2bae8e91bb6be8922bac5e4f597302e06587e SHA1 38f78e9790bcd4382b4a49aa226aa6dda1d3a3d7 SHA256 3a7dbca0fdc557de69783e0663e2d76ddab129ea8a19b2d0ef6d3e5d1b947ce1
 MD5 03ad2e6c4ab41244af1015a8bbb0b39f metadata.xml 158
 RMD160 c0e2bae8e91bb6be8922bac5e4f597302e06587e metadata.xml 158
@@ -34,13 +39,9 @@ SHA256 660fce7479af7482c2081aecdd96cf535ec6aba766e03494ac1f09ff4e8afbd0 files/di
 MD5 ab99525f3daaac5586f216d17dfa3dde files/digest-librsvg-2.16.1 247
 RMD160 ce4d7ae96c7ec8cd9d22a11d2f9ce377e27baf88 files/digest-librsvg-2.16.1 247
 SHA256 f6489e69f2820d8401eec1ae48aeac109aeaccde26dfb0681895322fe151f787 files/digest-librsvg-2.16.1 247
+MD5 ab99525f3daaac5586f216d17dfa3dde files/digest-librsvg-2.16.1-r1 247
+RMD160 ce4d7ae96c7ec8cd9d22a11d2f9ce377e27baf88 files/digest-librsvg-2.16.1-r1 247
+SHA256 f6489e69f2820d8401eec1ae48aeac109aeaccde26dfb0681895322fe151f787 files/digest-librsvg-2.16.1-r1 247
 MD5 b8c85108b58132e8c5a435cc0d6d7683 files/digest-librsvg-2.9.5 244
 RMD160 fa8202d0e49d55d83606f5974dd0b664b6076240 files/digest-librsvg-2.9.5 244
 SHA256 7603e00573b3e1c94a065ec0c1d10f79d54ad33aed86a223ba233220e77b4c0a files/digest-librsvg-2.9.5 244
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.2 (GNU/Linux)
-
-iD8DBQFFy07UkeYb6olFHJcRAvriAJ45Ci8Eu8cm5cSzxmitkSsmwfWb9ACg7ctg
-5x/lyNwxngsI6Qvg04T165k=
-=+yrc
------END PGP SIGNATURE-----

diff --git a/gnome-base/librsvg/files/digest-librsvg-2.16.1-r1 b/gnome-base/librsvg/files/digest-librsvg-2.16.1-r1
new file mode 100644 (file)
index 0000000..1b7bd6a
--- /dev/null
+++ b/gnome-base/librsvg/files/digest-librsvg-2.16.1-r1
@@ -0,0 +1,3 @@
+MD5 37e046571097ff7ce77ae6e07f096324 librsvg-2.16.1.tar.bz2 423624
+RMD160 27d293693d050a8a326311b4b0b5366baf400573 librsvg-2.16.1.tar.bz2 423624
+SHA256 2989d6a969b6f80d354f8120a5dd625d2c0b4e9e04bf178e9e7b34ae28e2ac69 librsvg-2.16.1.tar.bz2 423624

diff --git a/gnome-base/librsvg/files/librsvg-2.16.1-uninit.patch b/gnome-base/librsvg/files/librsvg-2.16.1-uninit.patch
new file mode 100644 (file)
index 0000000..1f436aa
--- /dev/null
+++ b/gnome-base/librsvg/files/librsvg-2.16.1-uninit.patch
@@ -0,0 +1,26 @@
+If dst->virgin is set, dst->x, y, w and h are uninitialised. The result
+of the addition is already not used, but the addition itself can trigger
+floating point exceptions, so make sure it's not performed.
+
+--- librsvg-2.16.1/rsvg-base.c
++++ librsvg-2.16.1/rsvg-base.c
+@@ -1678,12 +1678,17 @@
+ void rsvg_bbox_insert(RsvgBbox * dst, RsvgBbox * src)
+ {
+       double affine[6];
+-      double xmin = dst->x, ymin = dst->y;
+-      double xmax = dst->x + dst->w, ymax = dst->y + dst->h;
++      double xmin, ymin;
++      double xmax, ymax;
+       int i;
+ 
+       if (src->virgin)
+               return;
++      if (!dst->virgin)
++              {
++                      xmin = dst->x, ymin = dst->y;
++                      xmax = dst->x + dst->w, ymax = dst->y + dst->h;
++              }
+       _rsvg_affine_invert(affine, dst->affine);
+       _rsvg_affine_multiply(affine, src->affine, affine);
+ 

diff --git a/gnome-base/librsvg/librsvg-2.16.1-r1.ebuild b/gnome-base/librsvg/librsvg-2.16.1-r1.ebuild
new file mode 100644 (file)
index 0000000..aece074
--- /dev/null
+++ b/gnome-base/librsvg/librsvg-2.16.1-r1.ebuild
@@ -0,0 +1,77 @@
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/librsvg/librsvg-2.16.1-r1.ebuild,v 1.1 2007/04/06 18:54:19 compnerd Exp $
+
+inherit multilib gnome2 eutils
+
+DESCRIPTION="Scalable Vector Graphics (SVG) rendering library"
+HOMEPAGE="http://librsvg.sourceforge.net/"
+
+LICENSE="LGPL-2"
+SLOT="2"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd"
+IUSE="doc gnome zlib"
+
+RDEPEND=">=media-libs/fontconfig-1.0.1
+       >=x11-libs/gtk+-2.6
+       >=dev-libs/glib-2.12
+       >=dev-libs/libxml2-2.4.7
+       >=x11-libs/cairo-1.2
+       >=x11-libs/pango-1.2
+       >=dev-libs/libcroco-0.6.1
+       >=media-libs/freetype-2
+       gnome? ( >=gnome-base/gnome-vfs-2 )
+       zlib? ( >=gnome-extra/libgsf-1.6 )"
+DEPEND="${RDEPEND}
+       >=dev-util/pkgconfig-0.9
+       doc? ( >=dev-util/gtk-doc-0.9 )"
+
+DOCS="AUTHORS ChangeLog NEWS README TODO"
+
+set_gtk_confdir() {
+       # An arch specific config directory is used on multilib systems
+       has_multilib_profile && GTK2_CONFDIR="/etc/gtk-2.0/${CHOST}"
+       GTK2_CONFDIR=${GTK2_CONFDIR:=/etc/gtk-2.0}
+}
+
+pkg_setup() {
+       G2CONF="--enable-gtk-theme --enable-pixbuf-loader \
+                       --disable-mozilla-plugin --with-croco \
+                       --disable-gnome-print \
+                       $(use_enable gnome gnome-vfs) \
+                       $(use_with zlib svgz)"
+}
+
+src_unpack() {
+       gnome2_src_unpack
+
+       # Still fails even with disable-gtk-doc
+       if ! use doc; then
+               epatch ${FILESDIR}/${PN}-2.15.90-die-gtk-doc-die.patch
+       fi
+
+       # Patch from truedfx to prevent floating point exceptions
+       epatch ${FILESDIR}/${PN}-2.16.1-uninit.patch
+
+       cp /usr/share/libtool/install-sh .
+}
+
+src_install() {
+       gnome2_src_install plugindir=/usr/$(get_libdir)/nsbrowser/plugins/
+
+       # remove gdk-pixbuf loaders (#47766)
+       rm -fr ${D}/etc
+
+       # remove plugins dir since we disable the plugin
+       rm -fr ${D}/usr/lib/nsbrowser
+}
+
+pkg_postinst() {
+       set_gtk_confdir
+       gdk-pixbuf-query-loaders > ${GTK2_CONFDIR}/gdk-pixbuf.loaders
+}
+
+pkg_postrm() {
+       set_gtk_confdir
+       gdk-pixbuf-query-loaders > ${GTK2_CONFDIR}/gdk-pixbuf.loaders
+}