Status return fix from bug 250159

Package-Manager: portage-2.2_rc23/cvs/Linux x86_64

4 files changed, 146 insertions, 2 deletions

diff --git a/x11-libs/cairo/ChangeLog b/x11-libs/cairo/ChangeLog
index b5bda0da9b20..680a38165e37 100644
--- a/x11-libs/cairo/ChangeLog
+++ b/x11-libs/cairo/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for x11-libs/cairo
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/cairo/ChangeLog,v 1.209 2009/01/15 22:35:35 loki_val Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/cairo/ChangeLog,v 1.210 2009/02/23 21:48:58 tommy Exp $
+
+*cairo-1.8.6-r1 (23 Feb 2009)
+
+  23 Feb 2009; Thomas Sachau (Tommy[D]) <tommy@gentoo.org>
+  +files/cairo-1.8.6-status-return-fix.patch, +cairo-1.8.6-r1.ebuild:
+  Status return fix from bug 250159
 
   15 Jan 2009; Peter Alfredsen <loki_val@gentoo.org> metadata.xml:
   Compnerd retired.
diff --git a/x11-libs/cairo/Manifest b/x11-libs/cairo/Manifest
index 8d6d653af95b..2dcb4aa4d51a 100644
--- a/x11-libs/cairo/Manifest
+++ b/x11-libs/cairo/Manifest
@@ -1,5 +1,9 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX cairo-1.2.4-lcd-cleartype-like.diff 7244 RMD160 e50d5bf17cbead688a8b808a78fe4104c09af52e SHA1 f63131fd75bb496db59e3ce6bc755bbfb70baacb SHA256 4926d20d2b6b5071a5bf9ee9a12a36fef69510ebebd717c1dab151fe650f173a
 AUX cairo-1.6.4-libpng-api-change.patch 799 RMD160 407e2bdbaa1624c2b70c4837eb872b84d48086e6 SHA1 aac038b81fba395b68b27c64814e19bbc1e8826d SHA256 82cf3e542f46b6c07dc32b16c622c0b15bb356f5069b34a9d1cdbd4b4d7481f4
+AUX cairo-1.8.6-status-return-fix.patch 784 RMD160 cfa21d49438ad4493fd27f619c2ec3286dc4ce97 SHA1 448a1a5c188ac8543c410700dfefa7938c37fcb5 SHA256 9ac4c13454d7ba44a4e3998bf1e25ff3b6dc937885e2f5275de74b9a825bf056
 DIST cairo-1.4.12.tar.gz 3276610 RMD160 5ed65d5872c0561f3392e60007898d9360d83d0a SHA1 45d5257e5a0c1524bcc25660a96b2c79d012ad3f SHA256 a1a1e4ccec8da980141d903adbe83535481b4fda96a479456438d3dfbc767d5d
 DIST cairo-1.4.14.tar.gz 3283608 RMD160 9e7c87a292c889b06b29e9622be0a7daa3ddd6fd SHA1 63310243ba8af949060b06c01fc28ee5471ed5a4 SHA256 8914f9c34a77bf9d908b0c617c2d7ffebdd6d1e855cfd367d2a1b3d677f22e3c
 DIST cairo-1.6.4.tar.gz 5042623 RMD160 ccae736a40d985b72bda7c2f0a98a0838020658e SHA1 9d990fe39a125ceb07221623c237cd7015855d5c SHA256 7f0ce28c358706913bc39e6930a18ae89f3b9a6aa17998faa2b59d1e0e2b4f42
@@ -14,6 +18,16 @@ EBUILD cairo-1.6.4.ebuild 2117 RMD160 ecf135d2fcdc378764146bb77dc86881d3428769 S
 EBUILD cairo-1.8.0.ebuild 2401 RMD160 5a453e103ebbe1659bf0b8c74989781ee208ea00 SHA1 e96dfb15660841456fd9f9df5556f2fc742d9868 SHA256 535ea062a0af14a87a898169617ed64e2e3c6e0f4688315e4c8643dc8de17d61
 EBUILD cairo-1.8.2.ebuild 2401 RMD160 fc8359214cf380dd59b2931061844588e31d13ca SHA1 73d957eb29c0fe115f91662180b9e7f1c9d138ca SHA256 cae9d0cbb3bd364715e5d7c3afdb61d2e3a34cbc37b90f3c39401b86f620bdc0
 EBUILD cairo-1.8.4.ebuild 2401 RMD160 c0d7e276231eb8bfcadff3495e243e2619fa1a9c SHA1 1ae1901be5ddb75f1f5e543890be6f9a0850ad9d SHA256 0ce912726059204d794ff6bf871113c4799290d95806395848be4f09e5ba1247
+EBUILD cairo-1.8.6-r1.ebuild 3047 RMD160 4a03bf90e2e65eeee106669c840368261c8ec8cd SHA1 9af1963cbe21b328175d5aa6df7fb95cd645420c SHA256 ec40479674907d02f43bfbbeaa122ca2d47c0e81a54462380e054c8179c4ff2c
 EBUILD cairo-1.8.6.ebuild 2985 RMD160 1b7aa4884c1b705935baf5973c4bd5ab1f237dae SHA1 36ec5a92a693a5bbe12e5a3a40ccd9e374d01030 SHA256 5f1ca16bf071439e03fa34ea44ada12fad0b37d5c076e8df2e9874304d1ad451
-MISC ChangeLog 29401 RMD160 b47cc13cb4db7790469cf34f3aa8bca7e889bf98 SHA1 8d6049562e7622cf021a2945bca6a4f6ffb01c57 SHA256 14865e9ae245206ffeb2ffacdbc5996d52c1332190987e2bfec02758b183735c
+MISC ChangeLog 29595 RMD160 dd9aa0eb3fde2292f00a5f0c24083bb36bbc5bd4 SHA1 bb873f479da327755bb5c9f1ae864fb6ec3ebc00 SHA256 824bf3dfbd37d532a3bc25e207ce6c6cf4951726329355f2b7ffd95791801968
 MISC metadata.xml 628 RMD160 589b0a5e55683527204892191462856d90661d4e SHA1 b0f6e67dffc97e5c0ed9acea7448cd5f92e36c41 SHA256 802fcf2d639a4125475acd325ebfa874ef3e89055e02636968baa9fa6fc5e406
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.9 (GNU/Linux)
+
+iJwEAQECAAYFAkmjGc8ACgkQG7kqcTWJkGfX6AQApxBxpuZnvJzgIICmDXVLUAPq
+quUXYo82pzYb8FH+H0+A8sCuA8NrDqw0RZTCzRKWY3xnNlP/sSDX4BSVTH2duv1c
+10OgUulsf+MKyXf98hQ544AJo5VOD1MjPOipwZmex1u98pBeYhj3XH9TBNwrS44X
+r7Tigg59dSa/h/tyu7w=
+=SShs
+-----END PGP SIGNATURE-----
diff --git a/x11-libs/cairo/cairo-1.8.6-r1.ebuild b/x11-libs/cairo/cairo-1.8.6-r1.ebuild
new file mode 100644
index 000000000000..b46464b9eb34
--- /dev/null
+++ b/x11-libs/cairo/cairo-1.8.6-r1.ebuild
@@ -0,0 +1,102 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/cairo/cairo-1.8.6-r1.ebuild,v 1.1 2009/02/23 21:48:58 tommy Exp $
+
+inherit eutils flag-o-matic libtool
+
+DESCRIPTION="A vector graphics library with cross-device output support"
+HOMEPAGE="http://cairographics.org/"
+SRC_URI="http://cairographics.org/releases/${P}.tar.gz"
+
+LICENSE="|| ( LGPL-2.1 MPL-1.1 )"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
+IUSE="cleartype debug directfb doc glitz opengl svg X xcb"
+
+# Test causes a circular depend on gtk+... since gtk+ needs cairo but test needs gtk+ so we need to block it
+RESTRICT="test"
+
+RDEPEND="media-libs/fontconfig
+	>=media-libs/freetype-2.1.9
+	sys-libs/zlib
+	media-libs/libpng
+	>=x11-libs/pixman-0.12.0
+	directfb? ( >=dev-libs/DirectFB-0.9.24 )
+	glitz? ( >=media-libs/glitz-0.5.1 )
+	svg? ( dev-libs/libxml2 )
+	X? ( 	>=x11-libs/libXrender-0.6
+		x11-libs/libXext
+		x11-libs/libX11
+		x11-libs/libXft )
+	xcb? (	>=x11-libs/libxcb-0.92
+		x11-libs/xcb-util )"
+#	test? (
+#	pdf test
+#	x11-libs/pango
+#	>=x11-libs/gtk+-2.0
+#	>=app-text/poppler-bindings-0.9.2
+#	ps test
+#	virtual/ghostscript
+#	svg test
+#	>=x11-libs/gtk+-2.0
+#	>=gnome-base/librsvg-2.15.0
+
+DEPEND="${RDEPEND}
+	>=dev-util/pkgconfig-0.19
+	doc? (	>=dev-util/gtk-doc-1.6
+		~app-text/docbook-xml-dtd-4.2 )
+	X? ( x11-proto/renderproto )
+	xcb? ( x11-proto/xcb-proto )"
+
+#pkg_setup() {
+#	if ! built_with_use app-text/poppler-bindings gtk ; then
+#		eerror 'poppler-bindings with gtk is required for the pdf backend'
+#		die 'poppler-bindings built without gtk support'
+#	fi
+#}
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+
+	epatch "${FILESDIR}"/${PN}-1.8.6-status-return-fix.patch
+	# ClearType-like patches applied by ArchLinux
+	use cleartype && epatch "${FILESDIR}"/cairo-1.2.4-lcd-cleartype-like.diff
+
+	# We need to run elibtoolize to ensure correct so versioning on FreeBSD
+	elibtoolize
+}
+
+src_compile() {
+	#gets rid of fbmmx.c inlining warnings
+	append-flags -finline-limit=1200
+
+	if use glitz && use opengl; then
+		export glitz_LIBS=$(pkg-config --libs glitz-glx)
+	fi
+
+	econf $(use_enable X xlib) $(use_enable doc gtk-doc) \
+		$(use_enable directfb) $(use_enable xcb) \
+		$(use_enable svg) $(use_enable glitz) $(use_enable X xlib-xrender) \
+		$(use_enable debug test-surfaces) --enable-pdf  --enable-png \
+		--enable-ft --enable-ps \
+		|| die "configure failed"
+
+	emake || die "compile failed"
+}
+
+src_install() {
+	make DESTDIR="${D}" install || die "Installation failed"
+	dodoc AUTHORS ChangeLog NEWS README
+}
+
+pkg_postinst() {
+	if use xcb; then
+		ewarn "You have enabled the Cairo XCB backend which is used only by"
+		ewarn "a select few apps. The Cairo XCB backend is presently"
+		ewarn "un-maintained and needs a lot of work to get it caught up"
+		ewarn "to the Xrender and Xlib backends, which are the backends used"
+		ewarn "by most applications. See:"
+		ewarn "http://lists.freedesktop.org/archives/xcb/2008-December/004139.html"
+	fi
+}
diff --git a/x11-libs/cairo/files/cairo-1.8.6-status-return-fix.patch b/x11-libs/cairo/files/cairo-1.8.6-status-return-fix.patch
new file mode 100644
index 000000000000..a01233e58561
--- /dev/null
+++ b/x11-libs/cairo/files/cairo-1.8.6-status-return-fix.patch
@@ -0,0 +1,22 @@
+From efa9e1088cbf1b5331cc0bab3348520f3b91ae4b Mon Sep 17 00:00:00 2001
+From: M Joonas Pihlaja <jpihlaja@cc.helsinki.fi>
+Date: Thu, 13 Nov 2008 10:11:12 +0000
+Subject: [clip] Fix uninitialised status return in _cairo_clip_intersect_mask() for empty extents.
+
+This fixes the clip-all test case crashing for me.
+---
+diff --git a/src/cairo-clip.c b/src/cairo-clip.c
+index 5bbffd7..726896e 100644
+--- a/src/cairo-clip.c
++++ b/src/cairo-clip.c
+@@ -423,7 +423,7 @@ _cairo_clip_intersect_mask (cairo_clip_t      *clip,
+     cairo_box_t extents;
+     cairo_rectangle_int_t surface_rect, target_rect;
+     cairo_surface_t *surface = NULL;
+-    cairo_status_t status;
++    cairo_status_t status = CAIRO_STATUS_SUCCESS;
+ 
+     if (clip->all_clipped)
+ 	return CAIRO_STATUS_SUCCESS;
+--
+cgit v0.8.2