commit: 2a24c444d20f548aa3e09f3f2b67019041b980b6
Author: Aric Belsito <lluixhi <AT> gmail <DOT> com>
AuthorDate: Mon Oct 23 20:48:28 2017 +0000
Commit: Aric Belsito <lluixhi <AT> gmail <DOT> com>
CommitDate: Mon Oct 23 20:48:28 2017 +0000
URL: https://gitweb.gentoo.org/proj/musl.git/commit/?id=2a24c444
net-libs/webkit-gtk: fix patch
still couldn't tell musl has machine_context
net-libs/webkit-gtk/Manifest | 2 +-
.../webkit-gtk/files/webkit-gtk-2.18.1-musl.patch | 83 ++++++++++++++++++++--
2 files changed, 80 insertions(+), 5 deletions(-)
diff --git a/net-libs/webkit-gtk/Manifest b/net-libs/webkit-gtk/Manifest
index 3cb56ca..d798191 100644
--- a/net-libs/webkit-gtk/Manifest
+++ b/net-libs/webkit-gtk/Manifest
@@ -2,7 +2,7 @@ AUX 2.16.1-avoid-perl-ithreads.patch 3179 SHA256
77a3e8ad48868c23834e14b98f99131
AUX webkit-gtk-1.11.90-gtk-docize-fix.patch 426 SHA256
20d26df63afbdbf829974597bf53a9657007e9940431ffa0020f1d5fa5d22b4f SHA512
e35cc255e36742519b4f26b60d8e704eb3e0e66e8e13599cadae6fe445a3a87a2c6c65b6746c4d39f1ab11e7eb79b0f63a5fc9d5af5d7fa8907b224b852e3b32
WHIRLPOOL
a91ba71b8b4fa2f1ff5de1633fa477bc1f45de37f3bbd212af1ecf4b6298c5454c199cd89f6602854978d4ae6a551316eb96c4f90c82a0c07018e94ac3025e43
AUX webkit-gtk-1.6.1-darwin-quartz.patch 1516 SHA256
34ad751c33e868d85b41e06ecbd085b61a81c42bd52063bada52bc59b9e05a23 SHA512
ca8c80d06aa93c07d658ebf3433f5fdee9225616740a075f5606df87e3b90a83b2c492777a8e30255cdd4f11f889be789544ac1fc4a39056e1929a72720347ea
WHIRLPOOL
558250f3cf6de4d511a26afb0aeacc04b7049b3d0499362d320c035acac20932d7c16f6ff99d83833498296e3a21b5e2bab985b1ee5fca709754b582195a0fd1
AUX webkit-gtk-2.14.3-musl.patch 4111 SHA256
cc371f6dd10f489169eaa5b0ef3b197eae7a0f7d349aca86f830dd45f39473af SHA512
eb47b3c9d58bfa121acf83f2f58e819e2e2a2198c58ff926a1d3db8ee1c5ddbcbaad5c06d113cec1c20f286877823edcd52cc0caf3993a8b89a6fb5277f0a387
WHIRLPOOL
486613fe49588ed3019298eebe66a94a6e823e1719ff602dedc330222a931350a605dc64013f3a0244d661d335699a5836cf4083c93b5723a6cb457845e5ca04
-AUX webkit-gtk-2.18.1-musl.patch 2792 SHA256
b73ac3741a866ea95abe6ee3288903a8c9a94ee167fabc4c067a362f0913fe99 SHA512
1d27969060710e65d79cde5fd03b8162710dd24c95368f4feafcd0c1a7b8e2e8d5f53e30d7e25f7fbb7d15882921503a8e96280485fea503645ff4f84d84fa26
WHIRLPOOL
bff48b32057364fa8c45f524b618d1f5a17e8e3a9536f575d73da7c261e878cd48e38b987b47da1f7a9b5e2e64f256dd7b3e0b5123df80ff1a108df3b7975753
+AUX webkit-gtk-2.18.1-musl.patch 6201 SHA256
0c8cc541f5d211ab8e342ee3d203ecb4288a1c707a34a50cd0d6a32edf2aaeea SHA512
d22ece5f3a2414abcbd804fbe8340dbcd91ad503fc76950f931edbe22d3b15d5991717ea02bdfa21f82d08df9d0b4443265893b271560fbcef2dd90ca633b13c
WHIRLPOOL
249682a8f402a28b609b0e46f8310a2a0e338aa095a5debb21703486989505810b253c7d4290857c9be7947d4579f74791b19cb45f9dfc6b429889019e81953c
AUX webkit-gtk-2.2.5-hppa-platform.patch 530 SHA256
9a2b8311a89aa3500d19d2425c0f12f67c1457c67ecaa322511170461c4c6be7 SHA512
168d4f8acddf4a5fa6ddc3661ef3ec344824c854db036b279d38d526b6025cfbb8bbd15bc64ddd846876749823796ca7d05e4083cf35a744d46b00cfd5179ae1
WHIRLPOOL
5fc8070bf07eef199578db5802452b4443ee3a00b555325b430a3cfd923a0cbb827497907462cb224b07f2f1713d65a26af4adf24b3dca59cb9040dbd6227f92
AUX webkit-gtk-2.2.5-ia64-platform.patch 331 SHA256
1ac5327f4f190bc4cbee9e62d4a2805879bbffd914ba75be17afd1aa245e6693 SHA512
dae3cde801d2d29c61abb64c00bf33ac1f7080dd2085cc9a1520c8606ef65538ccee9b1e4c4c16a3dba551acd035542f80b6e808ae5090bb883c85ecfa7ac36e
WHIRLPOOL
d9ca8172f685f515bb22a38d269e73f1e0fdcbf487bb83557f41649cd9ff5883d1fe0827aef3c753d975895252db3e3fa5eef3f72b43a6557492effd5db10072
AUX webkit-gtk-2.4.1-ia64-malloc.patch 807 SHA256
8e01dee48af7e8e0d24729dd9b99e88b47125b5f91d07df29d579785e60d398d SHA512
d9e7a792861ff30137072eba6b5b80e7b37e47e7302bf1cd56027b5c30aea3fd215891f6272d85b80e98c826b3216d0701fe92f06b76e7d1fb860028d7a701c0
WHIRLPOOL
7cf769d9752cf800f72e76233ef299e2da8c13f427cd8d312d47d76282091f06ec32a618dda9d0bacedbc5dcf8aa4289ce9ce089cdbb90be28deeb75e449a925
diff --git a/net-libs/webkit-gtk/files/webkit-gtk-2.18.1-musl.patch
b/net-libs/webkit-gtk/files/webkit-gtk-2.18.1-musl.patch
index 6153432..d46dd47 100644
--- a/net-libs/webkit-gtk/files/webkit-gtk-2.18.1-musl.patch
+++ b/net-libs/webkit-gtk/files/webkit-gtk-2.18.1-musl.patch
@@ -1,6 +1,6 @@
diff -Naur
webkitgtk-2.18.1.orig/Source/JavaScriptCore/runtime/MachineContext.h
webkitgtk-2.18.1/Source/JavaScriptCore/runtime/MachineContext.h
---- webkitgtk-2.18.1.orig/Source/JavaScriptCore/runtime/MachineContext.h
2017-10-23 11:04:02.710772221 -0700
-+++ webkitgtk-2.18.1/Source/JavaScriptCore/runtime/MachineContext.h
2017-10-23 11:06:15.310769846 -0700
+--- webkitgtk-2.18.1.orig/Source/JavaScriptCore/runtime/MachineContext.h
2017-08-09 02:13:46.000000000 -0700
++++ webkitgtk-2.18.1/Source/JavaScriptCore/runtime/MachineContext.h
2017-10-23 13:37:19.427607525 -0700
@@ -146,7 +146,7 @@
#error Unknown Architecture
#endif
@@ -47,8 +47,8 @@ diff -Naur
webkitgtk-2.18.1.orig/Source/JavaScriptCore/runtime/MachineContext.h
// The following sequence depends on glibc's sys/ucontext.h.
#if CPU(X86)
diff -Naur webkitgtk-2.18.1.orig/Source/JavaScriptCore/runtime/Options.h
webkitgtk-2.18.1/Source/JavaScriptCore/runtime/Options.h
---- webkitgtk-2.18.1.orig/Source/JavaScriptCore/runtime/Options.h
2017-10-23 11:04:02.711772221 -0700
-+++ webkitgtk-2.18.1/Source/JavaScriptCore/runtime/Options.h 2017-10-23
11:07:37.100768382 -0700
+--- webkitgtk-2.18.1.orig/Source/JavaScriptCore/runtime/Options.h
2017-08-13 23:05:57.000000000 -0700
++++ webkitgtk-2.18.1/Source/JavaScriptCore/runtime/Options.h 2017-10-23
13:37:19.428607525 -0700
@@ -120,9 +120,9 @@
\
v(bool, reportMustSucceedExecutableAllocations, false, Normal, nullptr) \
@@ -62,3 +62,78 @@ diff -Naur
webkitgtk-2.18.1.orig/Source/JavaScriptCore/runtime/Options.h webkitg
\
v(bool, crashIfCantAllocateJITMemory, false, Normal, nullptr) \
v(unsigned, jitMemoryReservationSize, 0, Normal, "Set this number to
change the executable allocation size in ExecutableAllocatorFixedVMPool. (In
bytes.)") \
+diff -Naur
webkitgtk-2.18.1.orig/Source/ThirdParty/ANGLE/src/compiler/preprocessor/ExpressionParser.cpp
webkitgtk-2.18.1/Source/ThirdParty/ANGLE/src/compiler/preprocessor/ExpressionParser.cpp
+---
webkitgtk-2.18.1.orig/Source/ThirdParty/ANGLE/src/compiler/preprocessor/ExpressionParser.cpp
2017-08-09 02:13:47.000000000 -0700
++++
webkitgtk-2.18.1/Source/ThirdParty/ANGLE/src/compiler/preprocessor/ExpressionParser.cpp
2017-10-23 13:46:31.956597630 -0700
+@@ -839,7 +839,7 @@
+ #if YYERROR_VERBOSE
+
+ # ifndef yystrlen
+-# if defined __GLIBC__ && defined _STRING_H
++# if defined __linux__ && defined _STRING_H
+ # define yystrlen strlen
+ # else
+ /* Return the length of YYSTR. */
+@@ -855,7 +855,7 @@
+ # endif
+
+ # ifndef yystpcpy
+-# if defined __GLIBC__ && defined _STRING_H && defined _GNU_SOURCE
++# if defined __linux__ && defined _STRING_H && defined _GNU_SOURCE
+ # define yystpcpy stpcpy
+ # else
+ /* Copy YYSRC to YYDEST, returning the address of the terminating '\0' in
+diff -Naur
webkitgtk-2.18.1.orig/Source/ThirdParty/ANGLE/src/compiler/translator/glslang_tab.cpp
webkitgtk-2.18.1/Source/ThirdParty/ANGLE/src/compiler/translator/glslang_tab.cpp
+---
webkitgtk-2.18.1.orig/Source/ThirdParty/ANGLE/src/compiler/translator/glslang_tab.cpp
2017-08-09 02:13:47.000000000 -0700
++++
webkitgtk-2.18.1/Source/ThirdParty/ANGLE/src/compiler/translator/glslang_tab.cpp
2017-10-23 13:46:13.605597959 -0700
+@@ -1994,7 +1994,7 @@
+ #if YYERROR_VERBOSE
+
+ # ifndef yystrlen
+-# if defined __GLIBC__ && defined _STRING_H
++# if defined __linux__ && defined _STRING_H
+ # define yystrlen strlen
+ # else
+ /* Return the length of YYSTR. */
+@@ -2010,7 +2010,7 @@
+ # endif
+
+ # ifndef yystpcpy
+-# if defined __GLIBC__ && defined _STRING_H && defined _GNU_SOURCE
++# if defined __linux__ && defined _STRING_H && defined _GNU_SOURCE
+ # define yystpcpy stpcpy
+ # else
+ /* Copy YYSRC to YYDEST, returning the address of the terminating '\0' in
+diff -Naur webkitgtk-2.18.1.orig/Source/WTF/wtf/Platform.h
webkitgtk-2.18.1/Source/WTF/wtf/Platform.h
+--- webkitgtk-2.18.1.orig/Source/WTF/wtf/Platform.h 2017-10-16
05:18:56.000000000 -0700
++++ webkitgtk-2.18.1/Source/WTF/wtf/Platform.h 2017-10-23 13:44:27.882599852
-0700
+@@ -676,7 +676,7 @@
+ #define HAVE_CFNETWORK_STORAGE_PARTITIONING 1
+ #endif
+
+-#if OS(DARWIN) || ((OS(FREEBSD) || defined(__GLIBC__)) && (CPU(X86) ||
CPU(X86_64) || CPU(ARM) || CPU(ARM64) || CPU(MIPS)))
++#if OS(DARWIN) || ((OS(FREEBSD) || OS(LINUX)) && (CPU(X86) || CPU(X86_64) ||
CPU(ARM) || CPU(ARM64) || CPU(MIPS)))
+ #define HAVE_MACHINE_CONTEXT 1
+ #endif
+
+diff -Naur webkitgtk-2.18.1.orig/Source/WebCore/xml/XPathGrammar.cpp
webkitgtk-2.18.1/Source/WebCore/xml/XPathGrammar.cpp
+--- webkitgtk-2.18.1.orig/Source/WebCore/xml/XPathGrammar.cpp 2017-08-09
02:13:52.000000000 -0700
++++ webkitgtk-2.18.1/Source/WebCore/xml/XPathGrammar.cpp 2017-10-23
13:43:16.467601131 -0700
+@@ -967,7 +967,7 @@
+ #if YYERROR_VERBOSE
+
+ # ifndef yystrlen
+-# if defined __GLIBC__ && defined _STRING_H
++# if defined __linux__ && defined _STRING_H
+ # define yystrlen strlen
+ # else
+ /* Return the length of YYSTR. */
+@@ -990,7 +990,7 @@
+ # endif
+
+ # ifndef yystpcpy
+-# if defined __GLIBC__ && defined _STRING_H && defined _GNU_SOURCE
++# if defined __linux__ && defined _STRING_H && defined _GNU_SOURCE
+ # define yystpcpy stpcpy
+ # else
+ /* Copy YYSRC to YYDEST, returning the address of the terminating '\0' in
