Apply various fixes to improve support on some arches (#502492 by Emeric Maschino)

Package-Manager: portage-2.2.8-r1/cvs/Linux x86_64
Manifest-Sign-Key: 0xA188FBD4

7 files changed, 92 insertions, 11 deletions

diff --git a/net-libs/webkit-gtk/ChangeLog b/net-libs/webkit-gtk/ChangeLog
index 9f9255af7c10..48f5e44bbc51 100644
--- a/net-libs/webkit-gtk/ChangeLog
+++ b/net-libs/webkit-gtk/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for net-libs/webkit-gtk
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/webkit-gtk/ChangeLog,v 1.246 2014/02/24 07:44:35 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/webkit-gtk/ChangeLog,v 1.247 2014/03/01 18:49:11 pacho Exp $
+
+  01 Mar 2014; Pacho Ramos <pacho@gentoo.org>
+  +files/webkit-gtk-2.2.5-hppa-platform.patch,
+  +files/webkit-gtk-2.2.5-ia64-malloc.patch,
+  +files/webkit-gtk-2.2.5-ia64-platform.patch, webkit-gtk-2.2.5-r200.ebuild,
+  webkit-gtk-2.2.5.ebuild:
+  Apply various fixes to improve support on some arches (#502492 by Emeric
+  Maschino)
 
   24 Feb 2014; Pacho Ramos <pacho@gentoo.org> webkit-gtk-2.2.5-r200.ebuild,
   webkit-gtk-2.2.5.ebuild:
diff --git a/net-libs/webkit-gtk/Manifest b/net-libs/webkit-gtk/Manifest
index d61b4c82c223..d3784ac6401c 100644
--- a/net-libs/webkit-gtk/Manifest
+++ b/net-libs/webkit-gtk/Manifest
@@ -37,6 +37,9 @@ AUX webkit-gtk-2.0.4-freetype-2.5.1.patch 2893 SHA256 f1069fa1f7a867bdf894dd6295
 AUX webkit-gtk-2.2.2-freetype-2.5.1.patch 2851 SHA256 5f1fe73fb19c91b44749cdd68452ab124b533001d9e8a1c90f4cb9cbe416a9d8 SHA512 19c51e02189a177ce4a2b4a2f929cacc621e2e453d402c3b0eea91306a1ed6cde638ce62b665301a48c365efc8aedcedb2370ea95555515d4d6c546dc19c569f WHIRLPOOL cfa950c38310effa0eb09c3942d8e321097d783197e5bbcfbf2967a5414d40a8270baf2589765cc12da32ab1b25b26752d9932158b91df404aee2e8ece6fef2c
 AUX webkit-gtk-2.2.2-unittests-build.patch 1328 SHA256 f49a561effc00858c21db55607849f5b9c8f09cf4ee76f60262e71992013b625 SHA512 66d44483ac7de8b12f310239c4f8cb40a700ea9aad494decbe15b8976a4f4ff5ed53c97660e7762a7bb51de721ec081133368ca2871128d6e6e871fed5b0e042 WHIRLPOOL 77b308072cd705be3700da85ec05208d24bf8ff4aec9b93a1f73b311314fde1608e89ca8218e1f9da206d30bf2c378d727bc51a83f8144f7a559d35e6b5fe47e
 AUX webkit-gtk-2.2.4-unittests-build.patch 2866 SHA256 714b4663c5ae3fc695ae13c40fbedfae358e7ae4b6c2743a35ddd5e96d213133 SHA512 e4ba2eafdc97a673d07d1e253832c30ec32b57e02eb5b61d7a1c327760630f39d24e215a7940bcd5cd9ca321cd4d71e433f231e12e8476ebda62abfa53573297 WHIRLPOOL 5252edd1a69769ef99724f1aaf7844e50a9db1c204984ee066c2dd116bc58814631ddd9bea6bf4822e4c1122ad230f50f87e5f037b00e35ee81299fb9adf7ab5
+AUX webkit-gtk-2.2.5-hppa-platform.patch 530 SHA256 9a2b8311a89aa3500d19d2425c0f12f67c1457c67ecaa322511170461c4c6be7 SHA512 168d4f8acddf4a5fa6ddc3661ef3ec344824c854db036b279d38d526b6025cfbb8bbd15bc64ddd846876749823796ca7d05e4083cf35a744d46b00cfd5179ae1 WHIRLPOOL 5fc8070bf07eef199578db5802452b4443ee3a00b555325b430a3cfd923a0cbb827497907462cb224b07f2f1713d65a26af4adf24b3dca59cb9040dbd6227f92
+AUX webkit-gtk-2.2.5-ia64-malloc.patch 780 SHA256 4a057c94f3e83101dc48401897a2e9295106e395bdf2a7abcad8334afb26f22b SHA512 09d3287fb41dbe5f87e483874f9c81b0e5dbcc1eed709285aaa4f0232377ba19865491ed0f2e5a108bbc8f3d486bc6ab30f3c940cb68dc8515c1826b181051df WHIRLPOOL 4f97a8d74b95cdfe1d223391b93c6de0dbe0944fd9872bf81c5e1d357f677ca6650beb73ad44e50dd51dc4505807592b2caaee4010e271cbb6ada772c6b2a72d
+AUX webkit-gtk-2.2.5-ia64-platform.patch 331 SHA256 1ac5327f4f190bc4cbee9e62d4a2805879bbffd914ba75be17afd1aa245e6693 SHA512 dae3cde801d2d29c61abb64c00bf33ac1f7080dd2085cc9a1520c8606ef65538ccee9b1e4c4c16a3dba551acd035542f80b6e808ae5090bb883c85ecfa7ac36e WHIRLPOOL d9ca8172f685f515bb22a38d269e73f1e0fdcbf487bb83557f41649cd9ff5883d1fe0827aef3c753d975895252db3e3fa5eef3f72b43a6557492effd5db10072
 DIST webkit-1.8.3.tar.xz 7814028 SHA256 ada02d636af61aed38f142d3cded662d141ce71264f624c4eb873621a74cc9e7 SHA512 4d400cb0dfbde7eadcce52e7a37d2095ec382b65c6c0d4ea4795410dabad771fac0def50875092634075dc0a80043058d2d2913767e59db3e32cf3e13361803f WHIRLPOOL 25b8ce9a26f2c475a5e061bedf75d835ae5a907a92628e11cd9ae5962fcacbdfa6a0181ae7730fb39e4544615d2d78741025b17fa202f3d42d0f3956fcb7c3f0
 DIST webkitgtk-1.10.2.tar.xz 8633640 SHA256 19234f8e4edfaefe91ed06471a2aa8c71d26dd55d33787eede1dcfc9a3a96d9c SHA512 0c2909eabdc9532619d6486cd42f18a4eb4868c02be3f1c62a6d11d2cb23b4d5a84dd9b60fc353a25134c4ecd8f7cc9f75690bfc17a0360fd4a4c1f4f07aac8f WHIRLPOOL f733244ce7601f7906f7aa26e750f770cc1472737f62d64c706e7c8c32cc31db22a38824e32c347bf70166f7c5104bac049a80eb08dc040733aee4988542e954
 DIST webkitgtk-2.0.4.tar.xz 9849620 SHA256 bd1550b7f6e1a55f803efe7d64438163ff6c04f02186002cb81d0c090aac734f SHA512 d5fd825d01f700df8eb7d9021673a2a551cb6b4ba9e35ad0038e3d4e76322c0e751e1cd4cd7293a3388d58b8cc18169fec75044412a428c886376609d52fc3ce WHIRLPOOL ce42703d535b97e9e65bc05eacf462292ddf0434da3f056698fabaab007e53a5ded8c02a31ce9c289e22dcf73308daad4b3ca54ef1be7904035e2482abea6ce1
@@ -46,14 +49,14 @@ EBUILD webkit-gtk-1.8.3-r200.ebuild 9156 SHA256 10a39327ff264ad68e04a027342e62b9
 EBUILD webkit-gtk-1.8.3-r201.ebuild 9610 SHA256 d624ff02d974fd706c4f0511182ca2227a550f10a936f4d5e003d64b4ef7b5f5 SHA512 0ee9bfd80d36d82487d9ad2789b3046fb0a1d34081c4905ab6cc661890b757b445edcfb1396cedeb5b6d79ec9f3835757f234c2abd43d37d78b992b671db9816 WHIRLPOOL f812239bb7803677acc4250d7f1e2517dc00669dd6d683af44225b4ac5b0b09934ce8c135a60481415215d1d2925beb30e1e988cc55d371fff1d2df7918883ca
 EBUILD webkit-gtk-1.8.3-r300.ebuild 9759 SHA256 9404a95936f1c043a71dd94f6681dfeb4e194dcd5f474af0663c80faba4b6bd5 SHA512 a99bcd2462838a39db811839f1d16f1d163c8d6916a891419fdf6458eacb8073eef117e0a5e77f5ffcd322f8e7f7c8806f7e291eeb7f08c1ccd869b7efa346e1 WHIRLPOOL e78d3d3327e214f7c231ae1e54a81012608dde15f5faa0243f73d4cb0b84dd064feb73e496e0834e70ce52d1fcb252cd7cbc8dad074a4f0f96aa3e53ea699a4d
 EBUILD webkit-gtk-2.0.4.ebuild 9039 SHA256 296e9efaefad105ff350d7669d2c5baebd9fe796719238ee5a39646901198279 SHA512 3550522141269c643a86546e89ee12f8045033423219efad21ebf138144e296006735c6c1d6980c1bb74564a338dded14fea809490471895c060beac4dbe4720 WHIRLPOOL 14f043df57bfbf36664c06b77f80d7f2f69f36b8efb9f76fa18bfa93306c541f7c4799f2de34beaf60cdbe95540c844e4b3617bdd39176d14cc9f2a855aeea6c
-EBUILD webkit-gtk-2.2.5-r200.ebuild 9163 SHA256 111d7fc4435ad9ff12789f87f13c683a5b3a9ad52a37c92a5e40c3bea462a394 SHA512 090d546f4f35366ec6f6b13f17a8cfaf7ede979eebfc4396a0cbc28042374eaac84c1b8ad2d055b01cf0b5303b3f1c6066e2d003e2a9f3d7748c11e61a592b8c WHIRLPOOL 11de0c22326d912f68faa244c0f172d82c9a29010b2ea5e05cb62a16c2d7ba3308ced926739c4dc6fa4f3cd9aa1690086dc8151b51595329f1de6fcce3458aff
-EBUILD webkit-gtk-2.2.5.ebuild 9259 SHA256 93631cd9b326d0a4aaf4d7408608b1cd0179a80100a0f777ea93a6a8faf8fe0e SHA512 253e012f260963d301ac8768ca85dbc25256aa950975b4569b2d01cb273af1b24604b372cf835f0d0f04f9d32402ea77dc660adaa531e7e1c71cbe11d8c346f7 WHIRLPOOL 21f1efe270870b5d600c7a75e5245a68d18c6129d269adc4135b6ef810ae24e93343a4f0551615576b19851de3dab22550583ed4b67b52c30035e7e747907b41
-MISC ChangeLog 49989 SHA256 138e11158417375aee9032ae631eca4bef96ebf132a52aa8783124f5e0f0be8b SHA512 d8cbd88e7c13207465c9381528f39c30f70b6193446ba676df505031e9f93250ce26cf1cc9d719952dd42312cc1cb682c9530672f66b22cb8081216c1dc5ec86 WHIRLPOOL c201650c2a29a83474f5ab553e886deec1497176ddc085b119b0d8d4d4b3449af920b3ff596a77366cda1b8a7e7956574ccddffe6367e31742a26b5b0f22834a
+EBUILD webkit-gtk-2.2.5-r200.ebuild 9506 SHA256 97d5c4a4d2caf112a8e463ce3daaf63f0d17b2f993602751a653855b4fbb63cb SHA512 fbe67fcd941f0f6b8572fd77f0c69bcb0351a047b2508ca87d31f7aa4f9837aa156e9fd03c64944ced08353fa7b396e57e5db244b79a2389fe8bf13300c547f3 WHIRLPOOL 6e704c3f70b26fcc77e7a9c04b265d8c21e27f40eb9c3270a38fba2e960c78af7897e2b2622dc9497246673d4bc2aed5b57f2aa196346c6d248aa140e44fc3c0
+EBUILD webkit-gtk-2.2.5.ebuild 9602 SHA256 ee20be3a140ea847db04320c0e311b1835b4a830f9bd588a897d471f16cb30ca SHA512 b965b7b22f0020bd2c158f860d1cb3ae3b347e86e1e9bda1128ddf9c2aa6569b01e58c5198f60dcd8c507011d70a4cae2660523371bf691c438c9f4220bcadc5 WHIRLPOOL 1a222700f130b024d20d1459d983c667c09fdf3955d07342475f04fa03e33bbf9c37995705236a78fef1544f92c8dd91c04f26fd372b1e5436f0efe7096c8009
+MISC ChangeLog 50319 SHA256 6c3012d4901e341515c67afb0bd2572c29562300770e9cb14085e09aa3cc9c42 SHA512 a201aa0295c1e596ccddfe86e09595ceed9d5e129b00ae26fd5459259ab6b2158271b3414a66152658f49f8c12796a0140074aee53f35c2f45487d4105bf7abf WHIRLPOOL b57797424a46e7d9160c9f44f00a4f7f81c8c84e3ca199ca5e1d52623bcd2add57869009270e543f6bc1376dc737ddf7e495c5d063b9896a540f9eae0db60706
 MISC metadata.xml 735 SHA256 25d9027d26b4842187348aa43666ea6e00af2a55fb16d4fae447e81a59c072be SHA512 4c67d850758b3bf54a5de45e35797d2cb2133776e15d729f81aa592e4d4b58e7c9869ed476c25a6dc442bfc131961875e433e3c3fa73e693cf948eeed2230fa8 WHIRLPOOL c5bc56d53e735e5b9cd8dd03ca55ae5380f2ddb333118797b222914307c57248cc8f55cab80abfd41d1054a9e856c8e1d3f88f2aa36fb7cb885d7f3e442dd307
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iEYEAREIAAYFAlMK+GQACgkQCaWpQKGI+9R49gCdHU8FtQBgGyFjWuNCLuUfXkZa
-sMgAn2jGMts/hrlJMBHxbrnzDqgH6HpG
-=cePI
+iEYEAREIAAYFAlMSK6kACgkQCaWpQKGI+9RgSQCdEi0cQJWCh1NooWP+oIJicD8D
+jX4An3n/vmpY2mOqaWEiL20uQzggwWBh
+=AbVS
 -----END PGP SIGNATURE-----
diff --git a/net-libs/webkit-gtk/files/webkit-gtk-2.2.5-hppa-platform.patch b/net-libs/webkit-gtk/files/webkit-gtk-2.2.5-hppa-platform.patch
new file mode 100644
index 000000000000..8aee778c1bb9
--- /dev/null
+++ b/net-libs/webkit-gtk/files/webkit-gtk-2.2.5-hppa-platform.patch
@@ -0,0 +1,20 @@
+Index: webkitgtk/Source/WTF/wtf/Platform.h
+===================================================================
+--- webkitgtk.orig/Source/WTF/wtf/Platform.h
++++ webkitgtk/Source/WTF/wtf/Platform.h
+@@ -72,6 +72,15 @@
+ #define WTF_CPU_BIG_ENDIAN 1
+ #endif
+ 
++/* CPU(HPPA) - HP PARISC */
++#if defined(__hppa__)
++#define WTF_CPU_HPPA 1
++#define WTF_CPU_BIG_ENDIAN 1
++#define ENABLE_JIT 0
++#define ENABLE_YARR_JIT 0
++#define ENABLE_ASSEMBLER 0
++#endif
++
+ /* CPU(IA64) - Itanium / IA-64 */
+ #if defined(__ia64__)
+ #define WTF_CPU_IA64 1
diff --git a/net-libs/webkit-gtk/files/webkit-gtk-2.2.5-ia64-malloc.patch b/net-libs/webkit-gtk/files/webkit-gtk-2.2.5-ia64-malloc.patch
new file mode 100644
index 000000000000..5f0542c4bd02
--- /dev/null
+++ b/net-libs/webkit-gtk/files/webkit-gtk-2.2.5-ia64-malloc.patch
@@ -0,0 +1,20 @@
+Description: Fix wide pointer issues on ia64 (closes: #642750).
+Author: Stephan Schreiber <info@fs-driver.org>
+Index: webkitgtk/Source/WTF/wtf/Platform.h
+===================================================================
+--- webkitgtk.orig/Source/WTF/wtf/Platform.h
++++ webkitgtk/Source/WTF/wtf/Platform.h
+@@ -705,6 +705,13 @@
+ #define ENABLE_JIT 1
+ #endif
+ 
++/* FIXME: The fast malloc implementation is broken on Itanium / IA64 because
++   some memory barriers are missing in the thread-unsafe code around the
++   pagemap_cache_ object. */
++#if CPU(IA64) || CPU(IA64_32)
++#define USE_SYSTEM_MALLOC 1
++#endif
++
+ /* The JIT is enabled by default on all x86, x86-64, ARM & MIPS platforms. */
+ #if !defined(ENABLE_JIT) \
+     && (CPU(X86) || CPU(X86_64) || CPU(ARM) || CPU(MIPS)) \
diff --git a/net-libs/webkit-gtk/files/webkit-gtk-2.2.5-ia64-platform.patch b/net-libs/webkit-gtk/files/webkit-gtk-2.2.5-ia64-platform.patch
new file mode 100644
index 000000000000..a63e9e82e31a
--- /dev/null
+++ b/net-libs/webkit-gtk/files/webkit-gtk-2.2.5-ia64-platform.patch
@@ -0,0 +1,12 @@
+--- a/Source/WTF/wtf/Platform.h	2014-02-25 00:33:16.561606810 +0100
++++ b/Source/WTF/wtf/Platform.h	2014-02-25 00:49:52.895512955 +0100
+@@ -79,6 +79,9 @@
+ #if !defined(__LP64__)
+ #define WTF_CPU_IA64_32 1
+ #endif
++#define ENABLE_JIT 0
++#define ENABLE_YARR_JIT 0
++#define ENABLE_ASSEMBLER 0
+ #endif
+ 
+ /* CPU(MIPS) - MIPS 32-bit */
diff --git a/net-libs/webkit-gtk/webkit-gtk-2.2.5-r200.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.2.5-r200.ebuild
index 8053f9dbe072..2dc43ac84af7 100644
--- a/net-libs/webkit-gtk/webkit-gtk-2.2.5-r200.ebuild
+++ b/net-libs/webkit-gtk/webkit-gtk-2.2.5-r200.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/webkit-gtk/webkit-gtk-2.2.5-r200.ebuild,v 1.3 2014/02/24 07:44:35 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/webkit-gtk/webkit-gtk-2.2.5-r200.ebuild,v 1.4 2014/03/01 18:49:11 pacho Exp $
 
 EAPI="5"
 
@@ -172,6 +172,12 @@ src_prepare() {
 	# Do not build unittests unless requested, upstream bug #128163
 	epatch "${FILESDIR}"/${PN}-2.2.4-unittests-build.patch
 
+	# Debian patches to fix support for some arches
+	# https://bugs.webkit.org/show_bug.cgi?id=129540
+	epatch "${FILESDIR}"/${PN}-2.2.5-{hppa,ia64}-platform.patch
+	# https://bugs.webkit.org/show_bug.cgi?id=129542
+	epatch "${FILESDIR}"/${PN}-2.2.5-ia64-malloc.patch
+
 	# Prevent maintainer mode from being triggered during make
 	AT_M4DIR=Source/autotools eautoreconf
 }
@@ -187,7 +193,10 @@ src_configure() {
 	use ppc64 && append-flags "-mminimal-toc"
 
 	# Try to use less memory, bug #469942 (see Fedora .spec for reference)
-	append-ldflags "-Wl,--no-keep-memory"
+	# --no-keep-memory doesn't work on ia64, bug #502492
+	if ! use ia64; then
+		append-ldflags "-Wl,--no-keep-memory"
+	fi
 	if ! $(tc-getLD) --version | grep -q "GNU gold"; then
 		append-ldflags "-Wl,--reduce-memory-overheads"
 	fi
diff --git a/net-libs/webkit-gtk/webkit-gtk-2.2.5.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.2.5.ebuild
index 0fd4139574fa..9616a49d3422 100644
--- a/net-libs/webkit-gtk/webkit-gtk-2.2.5.ebuild
+++ b/net-libs/webkit-gtk/webkit-gtk-2.2.5.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/webkit-gtk/webkit-gtk-2.2.5.ebuild,v 1.3 2014/02/24 07:44:35 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/webkit-gtk/webkit-gtk-2.2.5.ebuild,v 1.4 2014/03/01 18:49:11 pacho Exp $
 
 EAPI="5"
 
@@ -177,6 +177,12 @@ src_prepare() {
 	# Do not build unittests unless requested, upstream bug #128163
 	epatch "${FILESDIR}"/${PN}-2.2.4-unittests-build.patch
 
+	# Debian patches to fix support for some arches
+	# https://bugs.webkit.org/show_bug.cgi?id=129540
+	epatch "${FILESDIR}"/${PN}-2.2.5-{hppa,ia64}-platform.patch
+	# https://bugs.webkit.org/show_bug.cgi?id=129542
+	epatch "${FILESDIR}"/${PN}-2.2.5-ia64-malloc.patch
+
 	# Prevent maintainer mode from being triggered during make
 	AT_M4DIR=Source/autotools eautoreconf
 }
@@ -192,7 +198,10 @@ src_configure() {
 	use ppc64 && append-flags "-mminimal-toc"
 
 	# Try to use less memory, bug #469942 (see Fedora .spec for reference)
-	append-ldflags "-Wl,--no-keep-memory"
+	# --no-keep-memory doesn't work on ia64, bug #502492
+	if ! use ia64; then
+		append-ldflags "-Wl,--no-keep-memory"
+	fi
 	if ! $(tc-getLD) --version | grep -q "GNU gold"; then
 		append-ldflags "-Wl,--reduce-memory-overheads"
 	fi