add patch to fix corruption with Mozilla renderer. From Gentoo's Mozilla herd, specifically armin76

Package-Manager: portage-2.1.4_rc14

5 files changed, 124 insertions, 9 deletions

diff --git a/x11-libs/cairo/ChangeLog b/x11-libs/cairo/ChangeLog
index 8bd65b9f385e..863e8ab1c1cb 100644
--- a/x11-libs/cairo/ChangeLog
+++ b/x11-libs/cairo/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for x11-libs/cairo
-# Copyright 2000-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/cairo/ChangeLog,v 1.158 2007/12/27 14:19:03 cardoe Exp $
+# Copyright 2000-2008 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/cairo/ChangeLog,v 1.159 2008/01/08 20:36:07 cardoe Exp $
+
+*cairo-1.5.4-r2 (08 Jan 2008)
+
+  08 Jan 2008; Doug Klima <cardoe@gentoo.org>
+  +files/cairo-1.5.4-fix-private.patch, +cairo-1.5.4-r2.ebuild:
+  add patch to fix corruption with Mozilla renderer. From Gentoo's Mozilla
+  herd, specifically armin76
 
 *cairo-1.5.4-r1 (27 Dec 2007)
 
diff --git a/x11-libs/cairo/Manifest b/x11-libs/cairo/Manifest
index 3323c73125d5..b842717cafa5 100644
--- a/x11-libs/cairo/Manifest
+++ b/x11-libs/cairo/Manifest
@@ -1,6 +1,10 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
+AUX cairo-1.5.4-fix-private.patch 416 RMD160 4566184daa1f13d58607c47a13055bfbf28a33db SHA1 5b3f89946de27e458440ece8b3af00516445553e SHA256 7ef56272ad699eef04388752df5127d09879c8f3f67b6408edbafa285eeea6d5
+MD5 a9dff83169192e5b605f6c72765b9f9c files/cairo-1.5.4-fix-private.patch 416
+RMD160 4566184daa1f13d58607c47a13055bfbf28a33db files/cairo-1.5.4-fix-private.patch 416
+SHA256 7ef56272ad699eef04388752df5127d09879c8f3f67b6408edbafa285eeea6d5 files/cairo-1.5.4-fix-private.patch 416
 AUX cairo-1.5.4-sparc-alignment.patch 435 RMD160 57bc95017e156bfc62c8a811ceb862af12051f8d SHA1 04480cd715d1047616ec037343be0d912115ef3a SHA256 ab99981206399bd0b73ca8b738db6723da0048114ffcf43feaa3580b052dabb4
 MD5 ed252a8c483df221022939e49d8a60de files/cairo-1.5.4-sparc-alignment.patch 435
 RMD160 57bc95017e156bfc62c8a811ceb862af12051f8d files/cairo-1.5.4-sparc-alignment.patch 435
@@ -25,10 +29,14 @@ EBUILD cairo-1.5.4-r1.ebuild 2162 RMD160 538007d9f05b21831ef13deb8763171cfaa9e59
 MD5 222807885a0c2f058419f948add8a0af cairo-1.5.4-r1.ebuild 2162
 RMD160 538007d9f05b21831ef13deb8763171cfaa9e592 cairo-1.5.4-r1.ebuild 2162
 SHA256 442edae9ac2f60e7365de9ac768d22a26c894944480000905a1abfb190c32c9b cairo-1.5.4-r1.ebuild 2162
-MISC ChangeLog 21935 RMD160 38e1f946c1ea1f5cd27a56fe794b6cc8a11673f8 SHA1 d418e4b1e184f039c60f0cc4e19e30da94af8ca2 SHA256 9af52daa8218b3d637fc45c35bd36862f040f15e5cdf5293effd29be06032190
-MD5 7d21559e972957e66862343305f040b0 ChangeLog 21935
-RMD160 38e1f946c1ea1f5cd27a56fe794b6cc8a11673f8 ChangeLog 21935
-SHA256 9af52daa8218b3d637fc45c35bd36862f040f15e5cdf5293effd29be06032190 ChangeLog 21935
+EBUILD cairo-1.5.4-r2.ebuild 2236 RMD160 ab8ca07298f7d44c1df5a565c576dce0411d8a1a SHA1 2c2e8eabde9727f60e1d22d84f910365a1fe7f04 SHA256 0fbdf8e28f0d5e20b89749c7ac0090fafc94b6c94a5ea3524e4177be18220480
+MD5 c1ab5e1b27219ee917b56c880d458569 cairo-1.5.4-r2.ebuild 2236
+RMD160 ab8ca07298f7d44c1df5a565c576dce0411d8a1a cairo-1.5.4-r2.ebuild 2236
+SHA256 0fbdf8e28f0d5e20b89749c7ac0090fafc94b6c94a5ea3524e4177be18220480 cairo-1.5.4-r2.ebuild 2236
+MISC ChangeLog 22181 RMD160 b1216b26686b3f1a5f083f6c8a9580d2a88a6cef SHA1 456b7a8c7d9c6cbcb31ebe28fb01c36caecef27d SHA256 796253fc73e8ae1d04861fa82b0373db16cc532a8a8cda5f979fdb96b666a902
+MD5 d966298382a26501262204c7abd4b47c ChangeLog 22181
+RMD160 b1216b26686b3f1a5f083f6c8a9580d2a88a6cef ChangeLog 22181
+SHA256 796253fc73e8ae1d04861fa82b0373db16cc532a8a8cda5f979fdb96b666a902 ChangeLog 22181
 MISC metadata.xml 316 RMD160 d7b0e5cfbeb43dfd4360c0f214cf8c2ac9752639 SHA1 3605a0ef9a0874134e3dbed331719153c1dc9db6 SHA256 5d1733aeedb6ad445d6e54a1dcfcfe822ea57bd010275fc46d9c34cc0c6b9b53
 MD5 b11544cc1116038b149ab213e9d56262 metadata.xml 316
 RMD160 d7b0e5cfbeb43dfd4360c0f214cf8c2ac9752639 metadata.xml 316
@@ -45,10 +53,13 @@ SHA256 43bad19a131cf5a1aa9819d12bb00d701ef6ceb7e42e525c2334475df5a12503 files/di
 MD5 fe25ae526890515ad1b88e4205d48e9c files/digest-cairo-1.5.4-r1 238
 RMD160 4633fa8500a6e2fe0190584b2321e709232c2660 files/digest-cairo-1.5.4-r1 238
 SHA256 c01ae42cc1f8609558a4fc5cc2526d4b5b4f2810c364f1019debede2276da03e files/digest-cairo-1.5.4-r1 238
+MD5 fe25ae526890515ad1b88e4205d48e9c files/digest-cairo-1.5.4-r2 238
+RMD160 4633fa8500a6e2fe0190584b2321e709232c2660 files/digest-cairo-1.5.4-r2 238
+SHA256 c01ae42cc1f8609558a4fc5cc2526d4b5b4f2810c364f1019debede2276da03e files/digest-cairo-1.5.4-r2 238
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.8 (GNU/Linux)
 
-iEUEARECAAYFAkdztGkACgkQoeSe8B0zEfz/cgCfcFu1KbUpsWd33K5nZi+VjhZK
-C1MAmO4pqWqF59ksz0gQsErHOSKPaMY=
-=W1Av
+iEYEARECAAYFAkeD3r8ACgkQoeSe8B0zEfyZggCfcaJqR5tD5CCOkdGvR7uiA1k7
+3WQAn2T+tKROkcqu4ogCBHyTZWDk0udj
+=VI52
 -----END PGP SIGNATURE-----
diff --git a/x11-libs/cairo/cairo-1.5.4-r2.ebuild b/x11-libs/cairo/cairo-1.5.4-r2.ebuild
new file mode 100644
index 000000000000..d676e03e8e9a
--- /dev/null
+++ b/x11-libs/cairo/cairo-1.5.4-r2.ebuild
@@ -0,0 +1,83 @@
+# Copyright 1999-2008 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/cairo/cairo-1.5.4-r2.ebuild,v 1.1 2008/01/08 20:36:07 cardoe 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/snapshots/${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="debug directfb doc glitz opengl svg X xcb test"
+
+RDEPEND="media-libs/fontconfig
+		>=media-libs/freetype-2.1.4
+		sys-libs/zlib
+		media-libs/libpng
+		>=x11-libs/pixman-0.9.4
+		X?	(
+				x11-libs/libXrender
+				x11-libs/libXext
+				x11-libs/libX11
+				virtual/xft
+				xcb? ( x11-libs/libxcb
+						x11-libs/xcb-util )
+			)
+		directfb? ( >=dev-libs/DirectFB-0.9.24 )
+		glitz? ( >=media-libs/glitz-0.5.1 )
+		svg? ( dev-libs/libxml2 )"
+
+DEPEND="${RDEPEND}
+		>=dev-util/pkgconfig-0.19
+		test? (
+				virtual/ghostscript
+				>=app-text/poppler-bindings-0.4.1
+				x11-libs/pango
+				x11-libs/gtk+
+				svg? ( >=gnome-base/librsvg-2.15.0 )
+			)
+		X? ( x11-proto/renderproto
+			xcb? ( x11-proto/xcb-proto ) )
+		doc?	(
+					>=dev-util/gtk-doc-1.6
+					 ~app-text/docbook-xml-dtd-4.2
+				)"
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+
+	# SPARC alignment patch
+	epatch "${FILESDIR}"/${P}-sparc-alignment.patch
+
+	# Mozilla corruption patch
+	epatch "${FILESDIR}"/${P}-fix-private.patch
+
+	# 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=-lglitz-glx
+	fi
+
+	econf $(use_enable X xlib) $(use_enable doc gtk-doc) $(use_enable directfb) \
+		  $(use_enable svg) $(use_enable glitz) $(use_enable X xlib-xrender) \
+		  $(use_enable debug test-surfaces) --enable-pdf  --enable-png \
+		  --enable-freetype --enable-ps $(use_enable xcb) \
+		  || die "configure failed"
+
+	emake || die "compile failed"
+}
+
+src_install() {
+	make DESTDIR="${D}" install || die "Installation failed"
+	dodoc AUTHORS ChangeLog NEWS README TODO
+}
diff --git a/x11-libs/cairo/files/cairo-1.5.4-fix-private.patch b/x11-libs/cairo/files/cairo-1.5.4-fix-private.patch
new file mode 100644
index 000000000000..79f538590620
--- /dev/null
+++ b/x11-libs/cairo/files/cairo-1.5.4-fix-private.patch
@@ -0,0 +1,11 @@
+--- src/cairo-fixed-private.h.orig	2007-12-27 18:42:39.000000000 +0100
++++ src/cairo-fixed-private.h	2007-12-27 18:43:11.000000000 +0100
+@@ -59,7 +59,7 @@
+  * making sure that you compute a double-to-fixed magic number.
+  * (see below).
+  */
+-#define CAIRO_FIXED_FRAC_BITS	16
++#define CAIRO_FIXED_FRAC_BITS	8
+ 
+ /* A signed type CAIRO_FIXED_BITS in size; the main fixed point type */
+ typedef int32_t cairo_fixed_t;
diff --git a/x11-libs/cairo/files/digest-cairo-1.5.4-r2 b/x11-libs/cairo/files/digest-cairo-1.5.4-r2
new file mode 100644
index 000000000000..716222d0cdcb
--- /dev/null
+++ b/x11-libs/cairo/files/digest-cairo-1.5.4-r2
@@ -0,0 +1,3 @@
+MD5 2738af237fc125f7e7d3e7bf8c5728c4 cairo-1.5.4.tar.gz 3283307
+RMD160 2ccdbd21adf344dc7405951d919a89610deb6d14 cairo-1.5.4.tar.gz 3283307
+SHA256 dafc9c43fe20977ece09aeff699d42b1f55a7f7465ca76baf96d42a379d36b57 cairo-1.5.4.tar.gz 3283307