Sparc fix by Raúl Porcel for bug #389963.

Package-Manager: portage-2.2.0_alpha90/cvs/Linux x86_64

7 files changed, 44 insertions, 17 deletions

diff --git a/net-libs/webkit-gtk/ChangeLog b/net-libs/webkit-gtk/ChangeLog
index b14820144185..da71aa0e9bdb 100644
--- a/net-libs/webkit-gtk/ChangeLog
+++ b/net-libs/webkit-gtk/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-libs/webkit-gtk
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/webkit-gtk/ChangeLog,v 1.145 2012/03/06 16:23:45 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/webkit-gtk/ChangeLog,v 1.146 2012/03/17 19:22:58 tetromino Exp $
+
+  17 Mar 2012; Alexandre Rostovtsev <tetromino@gentoo.org>
+  webkit-gtk-1.6.1-r201.ebuild, webkit-gtk-1.6.1-r301.ebuild,
+  +files/webkit-gtk-1.6.1-sparc-needs-alignment.patch,
+  webkit-gtk-1.6.3-r200.ebuild, webkit-gtk-1.6.3-r300.ebuild:
+  Sparc fix by Raúl Porcel for bug #389963.
 
   06 Mar 2012; Alexandre Rostovtsev <tetromino@gentoo.org>
   files/gir-paxctl-lt-wrapper, webkit-gtk-1.6.3-r200.ebuild,
diff --git a/net-libs/webkit-gtk/Manifest b/net-libs/webkit-gtk/Manifest
index 03d110be0eac..67c748477a32 100644
--- a/net-libs/webkit-gtk/Manifest
+++ b/net-libs/webkit-gtk/Manifest
@@ -11,22 +11,23 @@ AUX webkit-gtk-1.4.1-libpng15.patch 2571 RMD160 427d9746f365f27c66be0c73a41c7034
 AUX webkit-gtk-1.6.1-darwin-quartz.patch 1516 RMD160 6c73b491645c0d4626d5a60043159c045bee013f SHA1 e032315b4155a92f18ea43b29a4581655eb34d89 SHA256 34ad751c33e868d85b41e06ecbd085b61a81c42bd52063bada52bc59b9e05a23
 AUX webkit-gtk-1.6.1-double-conversion.patch 1585 RMD160 2eb508cf95ce16f5a49e7375c46271d85d5280c6 SHA1 70b81cd3bb600fa698487b6fb59459ca24e31b6f SHA256 2b1baadaf694e96d546ae50ce2a4154e4d1f7efbe7566868297cee27e9c08f08
 AUX webkit-gtk-1.6.1-pkgconfig-fix.patch 1297 RMD160 8a83465d74bf34d6fe7cbb6a2767f62c77e33aa2 SHA1 40090e84c3ee7814c14363d8bb790c7ec38d2dbb SHA256 f4a41c4dd1c40347e846b377bd94b2d3ad10b1f110711b5f341f8fd8a5a13014
+AUX webkit-gtk-1.6.1-sparc-needs-alignment.patch 430 RMD160 5220e63f6c6abf4f9d2d0c4857637cb9fd07120f SHA1 7b29e3dfb79f4b2566d300bef37efa88594fd7eb SHA256 870f314ed330b8cb1d7ffc498e2019c001eded83f14dfb4976804f85af403f80
 AUX webkit-gtk-1.6.3-paxctl-introspection.patch 929 RMD160 fe2eb5fb4d6830c377a723480db6519e7a08cc32 SHA1 53b27522fe37fedb2485079055ce755833fe8048 SHA256 96efa5fcd823eca76f24c4d975dda0f7d9cfc439c71807941e895a70d0aea377
 DIST webkit-1.4.3.tar.gz 8512387 RMD160 43d1fd1cfd0cbf9fc83b107f05442e2d531c03aa SHA1 a24adee9583d66ebc93ac61ce9881947a54c569d SHA256 b808ace6b3edad76aba57cc746a430051abfedf301c969628b989a1128dd37e4
 DIST webkit-1.6.3.tar.xz 6794004 RMD160 cc319ffe4c2810663ae05b90e69d9495f5c3f0aa SHA1 7df69608ef2ce9dd7328353b4ee34f69271cd43b SHA256 12d0dbce6a895c7a8491a028e34a1dc55ae13ab76ac6202b2e489da9468077c3
 DIST webkit-gtk-1.6.1.tar.xz 6416248 RMD160 ab63ea133ed2bd471c5faf012d4d284c324d6ff3 SHA1 13b976e736f09950ceeb6f1b0af00c52e9d8d475 SHA256 ca29992afb70d97301b8cf991ce58bf53523a71b5eb91134d998a458824a0339
 EBUILD webkit-gtk-1.4.3-r200.ebuild 3489 RMD160 60dcca3f8ea8db6398c2e01e96119a44d28a6b80 SHA1 7d25b89803d208c7f0a7799659513ee8ff995966 SHA256 6380b001bf9077c2135453e3e45e947db2cbe9171fc2dcf9364bab1d25c13ac4
 EBUILD webkit-gtk-1.4.3-r300.ebuild 3559 RMD160 a508e11554ad3666d4180e94bfbef671cdfc59be SHA1 0cfa0a81eff8bded59f064fa787fdd716575b63f SHA256 7c94293468e42977281cdf3b7aa78e9c423ec35467256040473eadac17bd2760
-EBUILD webkit-gtk-1.6.1-r201.ebuild 4904 RMD160 7e634bdc950976878ac9a3ba3325d5f8a3f5b497 SHA1 2c69e53424a81a7354ab33e86b9bff221091bbd0 SHA256 41c2edadd9f5781e8d450e5610d7f7d71bd2c5010058befdc7670915257edcb6
-EBUILD webkit-gtk-1.6.1-r301.ebuild 4840 RMD160 7c31620d26124418302fae9378631fa25ae92fc0 SHA1 fcdce4aafe15aa58939fcb9a2dd2faef622bc176 SHA256 50aeb18c062c5c2f08177758acfb3bfdc4c918d81df9c601b77e4fb4ed3c3526
-EBUILD webkit-gtk-1.6.3-r200.ebuild 4997 RMD160 4f97375925cc30eb15859a42ed65b2e8514d45bc SHA1 5b1f33a0f81877dbf58fdd8ffc070bd76feace5b SHA256 14993a3ea33bcc5a6683c13d6dd4c433b5be9fbff8792f54d9738f21199e7114
-EBUILD webkit-gtk-1.6.3-r300.ebuild 4825 RMD160 9256cffcc88e8f226dbfe8f828044dda0d298ff1 SHA1 9be20a2a394bf92e3721394aaa842494739a5c2d SHA256 df7ec006b470db22f38a7798abe3e6908a3e1a036a1e22bfa8ce25cac3184ac1
-MISC ChangeLog 28918 RMD160 e2ba473733b356357fe1ccaba378a9838b80fd50 SHA1 06f12e6d630a1cbe0d9d9ab786cba49dd0c085e0 SHA256 2e441382e5710b1e91504f0cc823d2b2298e844cf98aeb4023b5ed5a2c169b3f
+EBUILD webkit-gtk-1.6.1-r201.ebuild 4963 RMD160 37d795b34fd015d00b3eb07b789cb87945f7322a SHA1 988d72b35ebe6b56570b2ffee21bcf5cb839729b SHA256 bf3926008e7e7319b536ed4fd3ee88a0544716272929c8d508be912a55842a01
+EBUILD webkit-gtk-1.6.1-r301.ebuild 4899 RMD160 d46a328d4708f22f9ffad885b28c9f8dc1068a7b SHA1 9c2e82d49da22f695644c32d0e965cb49835649a SHA256 330ed30997119f3b82c959ca3d06bdf553e0a31684a3923df166519d029f1610
+EBUILD webkit-gtk-1.6.3-r200.ebuild 5053 RMD160 b6efb06affc0281ecfebd467b40cdfd2d519b8c1 SHA1 035494927163fd2693bce564c2dacf4236fee3f8 SHA256 afb176321ad5ab32b4bf1770455129cb99e3411be1874e64dd51efe2febbf53d
+EBUILD webkit-gtk-1.6.3-r300.ebuild 4881 RMD160 eba8ae69b5510c5e4962ae3e29af5069ac08b14f SHA1 4b3cd3764935e4c031a470019abe929ed0ec61ab SHA256 8cd04fc9d1227f4822b68b31f3bd77e5d5c10086aff78b5ba40750e3e8e30d68
+MISC ChangeLog 29202 RMD160 b9bd786315ab40f60fab6764ab663eb15c5b75bf SHA1 717fd99d82c2ce1ba18e0c2450b7fee0f38dc1e4 SHA256 37e14b968d836b7ce79c8a04efda20d7b7d164bdbb0d607e9d3f4d9c011069ca
 MISC metadata.xml 539 RMD160 422a84bfd5fd0ca7d32825e204b0a435a980ecd5 SHA1 33fe25bdc890c5e034d5dc02a82b028283e0cc03 SHA256 eb78ad3163ace16c943a2620ef1659d33913985b8a9584a2d734f021a82f7887
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.18 (GNU/Linux)
 
-iF4EAREIAAYFAk9WOhcACgkQdjK8w9WeBnB/CgD9HXje/XitP90uNThSiWufvn1u
-jkAyas4NHgW5wKhteesA/jN5GdaB43CRS6qJxyqizJp0EQOzBVPmQ61jusdes2k8
-=sqE2
+iF4EAREIAAYFAk9k5JgACgkQdjK8w9WeBnDUuAD+JJzXo0lGLLjXZpfZd5GeZwYS
+6MLWnuqPu11uqijYRUUA/1oCjQL1agfnmpm2kTOLwRqp0xvJpllunXaBKWbu19lq
+=90rX
 -----END PGP SIGNATURE-----
diff --git a/net-libs/webkit-gtk/files/webkit-gtk-1.6.1-sparc-needs-alignment.patch b/net-libs/webkit-gtk/files/webkit-gtk-1.6.1-sparc-needs-alignment.patch
new file mode 100644
index 000000000000..2b678e5f9469
--- /dev/null
+++ b/net-libs/webkit-gtk/files/webkit-gtk-1.6.1-sparc-needs-alignment.patch
@@ -0,0 +1,12 @@
+diff -aur a/Source/JavaScriptCore/wtf/Platform.h b/Source/JavaScriptCore/wtf/Platform.h
+--- a/Source/JavaScriptCore/wtf/Platform.h	2012-02-25 11:10:13.000000000 +0000
++++ b/Source/JavaScriptCore/wtf/Platform.h	2012-02-25 11:26:17.992010602 +0000
+@@ -295,7 +295,7 @@
+ 
+ #endif /* ARM */
+ 
+-#if CPU(ARM) || CPU(MIPS) || CPU(SH4)
++#if CPU(ARM) || CPU(MIPS) || CPU(SH4) || CPU(SPARC)
+ #define WTF_CPU_NEEDS_ALIGNED_ACCESS 1
+ #endif
+ 
diff --git a/net-libs/webkit-gtk/webkit-gtk-1.6.1-r201.ebuild b/net-libs/webkit-gtk/webkit-gtk-1.6.1-r201.ebuild
index c81d583286ba..38fe903eeb67 100644
--- a/net-libs/webkit-gtk/webkit-gtk-1.6.1-r201.ebuild
+++ b/net-libs/webkit-gtk/webkit-gtk-1.6.1-r201.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/webkit-gtk/webkit-gtk-1.6.1-r201.ebuild,v 1.8 2012/03/05 22:15:14 ranger Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/webkit-gtk/webkit-gtk-1.6.1-r201.ebuild,v 1.9 2012/03/17 19:22:58 tetromino Exp $
 
 EAPI="4"
 
@@ -77,6 +77,8 @@ src_prepare() {
 	# https://bugs.webkit.org/show_bug.cgi?id=19775
 	# TODO: FAILS TO APPLY!
 	#use sparc && epatch "${FILESDIR}"/${PN}-1.2.3-fix-pool-sparc.patch
+	# bug #389963
+	epatch "${FILESDIR}/${PN}-1.6.1-sparc-needs-alignment.patch"
 
 	# intermediate MacPorts hack while upstream bug is not fixed properly
 	# https://bugs.webkit.org/show_bug.cgi?id=28727
@@ -116,7 +118,7 @@ src_configure() {
 	use alpha && append-ldflags "-Wl,--no-relax"
 
 	# Sigbuses on SPARC with mcpu and co.
-	use sparc && filter-flags "-mcpu=*" "-mvis" "-mtune=*"
+	use sparc && filter-flags "-mvis"
 
 	# https://bugs.webkit.org/show_bug.cgi?id=42070 , #301634
 	use ppc64 && append-flags "-mminimal-toc"
diff --git a/net-libs/webkit-gtk/webkit-gtk-1.6.1-r301.ebuild b/net-libs/webkit-gtk/webkit-gtk-1.6.1-r301.ebuild
index 81bb15afe8a2..5f031b27862b 100644
--- a/net-libs/webkit-gtk/webkit-gtk-1.6.1-r301.ebuild
+++ b/net-libs/webkit-gtk/webkit-gtk-1.6.1-r301.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/webkit-gtk/webkit-gtk-1.6.1-r301.ebuild,v 1.8 2012/03/05 22:15:14 ranger Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/webkit-gtk/webkit-gtk-1.6.1-r301.ebuild,v 1.9 2012/03/17 19:22:58 tetromino Exp $
 
 EAPI="4"
 
@@ -79,6 +79,8 @@ src_prepare() {
 	# https://bugs.webkit.org/show_bug.cgi?id=19775
 	# TODO: FAILS TO APPLY!
 	#use sparc && epatch "${FILESDIR}"/${PN}-1.2.3-fix-pool-sparc.patch
+	# bug #389963
+	epatch "${FILESDIR}/${PN}-1.6.1-sparc-needs-alignment.patch"
 
 	# intermediate MacPorts hack while upstream bug is not fixed properly
 	# https://bugs.webkit.org/show_bug.cgi?id=28727
@@ -109,7 +111,7 @@ src_configure() {
 	use alpha && append-ldflags "-Wl,--no-relax"
 
 	# Sigbuses on SPARC with mcpu and co.
-	use sparc && filter-flags "-mcpu=*" "-mvis" "-mtune=*"
+	use sparc && filter-flags "-mvis"
 
 	# https://bugs.webkit.org/show_bug.cgi?id=42070 , #301634
 	use ppc64 && append-flags "-mminimal-toc"
diff --git a/net-libs/webkit-gtk/webkit-gtk-1.6.3-r200.ebuild b/net-libs/webkit-gtk/webkit-gtk-1.6.3-r200.ebuild
index 39f58fb53045..7c16d5327cc3 100644
--- a/net-libs/webkit-gtk/webkit-gtk-1.6.3-r200.ebuild
+++ b/net-libs/webkit-gtk/webkit-gtk-1.6.3-r200.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/webkit-gtk/webkit-gtk-1.6.3-r200.ebuild,v 1.4 2012/03/06 16:23:45 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/webkit-gtk/webkit-gtk-1.6.3-r200.ebuild,v 1.5 2012/03/17 19:22:58 tetromino Exp $
 
 EAPI="4"
 
@@ -72,6 +72,8 @@ src_prepare() {
 	# https://bugs.webkit.org/show_bug.cgi?id=19775
 	# TODO: FAILS TO APPLY!
 	#use sparc && epatch "${FILESDIR}"/${PN}-1.2.3-fix-pool-sparc.patch
+	# bug #389963
+	epatch "${FILESDIR}/${PN}-1.6.1-sparc-needs-alignment.patch"
 
 	# intermediate MacPorts hack while upstream bug is not fixed properly
 	# https://bugs.webkit.org/show_bug.cgi?id=28727
@@ -115,7 +117,7 @@ src_configure() {
 	use alpha && append-ldflags "-Wl,--no-relax"
 
 	# Sigbuses on SPARC with mcpu and co.
-	use sparc && filter-flags "-mcpu=*" "-mvis" "-mtune=*"
+	use sparc && filter-flags "-mvis"
 
 	# https://bugs.webkit.org/show_bug.cgi?id=42070 , #301634
 	use ppc64 && append-flags "-mminimal-toc"
diff --git a/net-libs/webkit-gtk/webkit-gtk-1.6.3-r300.ebuild b/net-libs/webkit-gtk/webkit-gtk-1.6.3-r300.ebuild
index 3ac7263c3954..5dcedce5ff2e 100644
--- a/net-libs/webkit-gtk/webkit-gtk-1.6.3-r300.ebuild
+++ b/net-libs/webkit-gtk/webkit-gtk-1.6.3-r300.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/webkit-gtk/webkit-gtk-1.6.3-r300.ebuild,v 1.5 2012/03/06 16:23:45 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/webkit-gtk/webkit-gtk-1.6.3-r300.ebuild,v 1.6 2012/03/17 19:22:58 tetromino Exp $
 
 EAPI="4"
 
@@ -73,6 +73,8 @@ src_prepare() {
 	# https://bugs.webkit.org/show_bug.cgi?id=19775
 	# TODO: FAILS TO APPLY!
 	#use sparc && epatch "${FILESDIR}"/${PN}-1.2.3-fix-pool-sparc.patch
+	# bug #389963
+	epatch "${FILESDIR}/${PN}-1.6.1-sparc-needs-alignment.patch"
 
 	# intermediate MacPorts hack while upstream bug is not fixed properly
 	# https://bugs.webkit.org/show_bug.cgi?id=28727
@@ -107,7 +109,7 @@ src_configure() {
 	use alpha && append-ldflags "-Wl,--no-relax"
 
 	# Sigbuses on SPARC with mcpu and co.
-	use sparc && filter-flags "-mcpu=*" "-mvis" "-mtune=*"
+	use sparc && filter-flags "-mvis"
 
 	# https://bugs.webkit.org/show_bug.cgi?id=42070 , #301634
 	use ppc64 && append-flags "-mminimal-toc"