fix sparc memory alignment issues. fix authored by Chris Wilson (upstream). fixes bug #203282

Package-Manager: portage-2.1.4_rc11

5 files changed, 52 insertions, 14 deletions

diff --git a/x11-libs/cairo/ChangeLog b/x11-libs/cairo/ChangeLog
index 20ff6354c2d3..8bd65b9f385e 100644
--- a/x11-libs/cairo/ChangeLog
+++ b/x11-libs/cairo/ChangeLog
@@ -1,6 +1,14 @@
 # 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.157 2007/12/26 16:19:16 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/cairo/ChangeLog,v 1.158 2007/12/27 14:19:03 cardoe Exp $
+
+*cairo-1.5.4-r1 (27 Dec 2007)
+
+  27 Dec 2007; Doug Klima <cardoe@gentoo.org>
+  +files/cairo-1.5.4-sparc-alignment.patch, -cairo-1.5.4.ebuild,
+  +cairo-1.5.4-r1.ebuild:
+  fix sparc memory alignment issues. fix authored by Chris Wilson (upstream).
+  fixes bug #203282
 
   26 Dec 2007; Raúl Porcel <armin76@gentoo.org> cairo-1.5.4.ebuild:
   Doesn't work fine on sparc, bug #203282
diff --git a/x11-libs/cairo/Manifest b/x11-libs/cairo/Manifest
index b2ab754b7ea4..3323c73125d5 100644
--- a/x11-libs/cairo/Manifest
+++ b/x11-libs/cairo/Manifest
@@ -1,3 +1,10 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+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
+SHA256 ab99981206399bd0b73ca8b738db6723da0048114ffcf43feaa3580b052dabb4 files/cairo-1.5.4-sparc-alignment.patch 435
 DIST cairo-1.2.6.tar.gz 2973689 RMD160 4469a661b294e342ee77e726c1cefccd4837ae2e SHA1 b86b4017a9abd565ef11c72b7faee9082a04118f SHA256 7d36449c9a05c2c9b44248b10e9f82f0bca99f30e24848435e65aca77c28b3f9
 DIST cairo-1.4.10.tar.gz 3216689 RMD160 ce1cb025d47ec395577e4f4c6fe5092be85e0cbe SHA1 8371097e30650ec817b24694367110139627403e SHA256 594e78a66044898c321e378d47faf43b665b23ba638834d2787e344ba13e5132
 DIST cairo-1.4.12.tar.gz 3276610 RMD160 5ed65d5872c0561f3392e60007898d9360d83d0a SHA1 45d5257e5a0c1524bcc25660a96b2c79d012ad3f SHA256 a1a1e4ccec8da980141d903adbe83535481b4fda96a479456438d3dfbc767d5d
@@ -14,14 +21,14 @@ EBUILD cairo-1.4.12.ebuild 1968 RMD160 64ecf4bd8788e715239de20ed9b8e0b25266258c
 MD5 f91e3835adfee4275068944417f29eb5 cairo-1.4.12.ebuild 1968
 RMD160 64ecf4bd8788e715239de20ed9b8e0b25266258c cairo-1.4.12.ebuild 1968
 SHA256 6f25e6e271d47c75deeee9121d25098eb0c6aa25cbdf60349e76d094a4f0d912 cairo-1.4.12.ebuild 1968
-EBUILD cairo-1.5.4.ebuild 2085 RMD160 ba69ceb6960bda210fc2ad2854856a0335bac24b SHA1 f8565a82121d8c83c6d123ae80c4a52667e52506 SHA256 2466995a71310b64a0a2b855ced805291a2e441af722e20a460bd3946d9999d9
-MD5 d9fe76ddb51c3931fd9636cb4303cf14 cairo-1.5.4.ebuild 2085
-RMD160 ba69ceb6960bda210fc2ad2854856a0335bac24b cairo-1.5.4.ebuild 2085
-SHA256 2466995a71310b64a0a2b855ced805291a2e441af722e20a460bd3946d9999d9 cairo-1.5.4.ebuild 2085
-MISC ChangeLog 21669 RMD160 35187ffcc4e03d376b9a6375454eb61a9bf7a1c9 SHA1 0121fdb186489b94beea63b30441ee974a7395d0 SHA256 24c8f90ee3a00bde673608b0ed6bd29bafec89a34a4a996d3c8ba6cd3af5fd25
-MD5 6ddb612eff8337eaaa4210083f55c145 ChangeLog 21669
-RMD160 35187ffcc4e03d376b9a6375454eb61a9bf7a1c9 ChangeLog 21669
-SHA256 24c8f90ee3a00bde673608b0ed6bd29bafec89a34a4a996d3c8ba6cd3af5fd25 ChangeLog 21669
+EBUILD cairo-1.5.4-r1.ebuild 2162 RMD160 538007d9f05b21831ef13deb8763171cfaa9e592 SHA1 9c76190cadbaf6ab3168a681fbe30dd830586a61 SHA256 442edae9ac2f60e7365de9ac768d22a26c894944480000905a1abfb190c32c9b
+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
 MISC metadata.xml 316 RMD160 d7b0e5cfbeb43dfd4360c0f214cf8c2ac9752639 SHA1 3605a0ef9a0874134e3dbed331719153c1dc9db6 SHA256 5d1733aeedb6ad445d6e54a1dcfcfe822ea57bd010275fc46d9c34cc0c6b9b53
 MD5 b11544cc1116038b149ab213e9d56262 metadata.xml 316
 RMD160 d7b0e5cfbeb43dfd4360c0f214cf8c2ac9752639 metadata.xml 316
@@ -35,6 +42,13 @@ SHA256 479281990988707e395037e580d635d725fb33bb7391130f96fac6d727204df7 files/di
 MD5 7e19929e3130311dbfe5ca0456e022ef files/digest-cairo-1.4.12 241
 RMD160 83f76aee79f965a8df771fd1c359f937b1251976 files/digest-cairo-1.4.12 241
 SHA256 43bad19a131cf5a1aa9819d12bb00d701ef6ceb7e42e525c2334475df5a12503 files/digest-cairo-1.4.12 241
-MD5 fe25ae526890515ad1b88e4205d48e9c files/digest-cairo-1.5.4 238
-RMD160 4633fa8500a6e2fe0190584b2321e709232c2660 files/digest-cairo-1.5.4 238
-SHA256 c01ae42cc1f8609558a4fc5cc2526d4b5b4f2810c364f1019debede2276da03e files/digest-cairo-1.5.4 238
+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
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.8 (GNU/Linux)
+
+iEUEARECAAYFAkdztGkACgkQoeSe8B0zEfz/cgCfcFu1KbUpsWd33K5nZi+VjhZK
+C1MAmO4pqWqF59ksz0gQsErHOSKPaMY=
+=W1Av
+-----END PGP SIGNATURE-----
diff --git a/x11-libs/cairo/cairo-1.5.4.ebuild b/x11-libs/cairo/cairo-1.5.4-r1.ebuild
index 6535f9daaa57..c2d3e81a727b 100644
--- a/x11-libs/cairo/cairo-1.5.4.ebuild
+++ b/x11-libs/cairo/cairo-1.5.4-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 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.ebuild,v 1.3 2007/12/26 16:19:16 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/cairo/cairo-1.5.4-r1.ebuild,v 1.1 2007/12/27 14:19:03 cardoe Exp $
 
 inherit eutils flag-o-matic libtool
 
@@ -10,7 +10,7 @@ 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"
+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
@@ -50,6 +50,9 @@ src_unpack() {
 	unpack ${A}
 	cd "${S}"
 
+	# SPARC alignment patch
+	epatch "${FILESDIR}"/${P}-sparc-alignment.patch
+
 	# We need to run elibtoolize to ensure correct so versioning on FreeBSD
 	elibtoolize
 }
diff --git a/x11-libs/cairo/files/cairo-1.5.4-sparc-alignment.patch b/x11-libs/cairo/files/cairo-1.5.4-sparc-alignment.patch
new file mode 100644
index 000000000000..2a7e0f290688
--- /dev/null
+++ b/x11-libs/cairo/files/cairo-1.5.4-sparc-alignment.patch
@@ -0,0 +1,13 @@
+--- src/cairo-path-fixed.c.orig	2007-12-27 00:01:13.000000000 +0000
++++ src/cairo-path-fixed.c	2007-12-27 00:02:10.000000000 +0000
+@@ -415,8 +415,8 @@
+ 	buf->num_points = 0;
+ 	buf->buf_size = buf_size;
+ 
+-	buf->op = (cairo_path_op_t *) (buf + 1);
+-	buf->points = (cairo_point_t *) (buf->op + buf_size);
++	buf->points = (cairo_point_t *) (buf + 1);
++	buf->op = (cairo_path_op_t *) (buf->points + 2 * buf_size);
+     }
+ 
+     return buf;
\ No newline at end of file
diff --git a/x11-libs/cairo/files/digest-cairo-1.5.4 b/x11-libs/cairo/files/digest-cairo-1.5.4-r1
index 716222d0cdcb..716222d0cdcb 100644
--- a/x11-libs/cairo/files/digest-cairo-1.5.4
+++ b/x11-libs/cairo/files/digest-cairo-1.5.4-r1