| 1 |
commit: 5dc412a19ddc781967953d17cb08b8b844a1d220 |
| 2 |
Author: Aric Belsito <lluixhi <AT> gmail <DOT> com> |
| 3 |
AuthorDate: Mon Oct 23 18:09:24 2017 +0000 |
| 4 |
Commit: Aric Belsito <lluixhi <AT> gmail <DOT> com> |
| 5 |
CommitDate: Mon Oct 23 18:09:24 2017 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/proj/musl.git/commit/?id=5dc412a1 |
| 7 |
|
| 8 |
net-libs/webkit-gtk: bump patch |
| 9 |
|
| 10 |
net-libs/webkit-gtk/Manifest | 3 +- |
| 11 |
.../webkit-gtk/files/webkit-gtk-2.18.1-musl.patch | 64 ++++++++++++++++++++++ |
| 12 |
net-libs/webkit-gtk/webkit-gtk-2.18.1.ebuild | 2 +- |
| 13 |
3 files changed, 67 insertions(+), 2 deletions(-) |
| 14 |
|
| 15 |
diff --git a/net-libs/webkit-gtk/Manifest b/net-libs/webkit-gtk/Manifest |
| 16 |
index dfbbb8e..3cb56ca 100644 |
| 17 |
--- a/net-libs/webkit-gtk/Manifest |
| 18 |
+++ b/net-libs/webkit-gtk/Manifest |
| 19 |
@@ -2,6 +2,7 @@ AUX 2.16.1-avoid-perl-ithreads.patch 3179 SHA256 77a3e8ad48868c23834e14b98f99131 |
| 20 |
AUX webkit-gtk-1.11.90-gtk-docize-fix.patch 426 SHA256 20d26df63afbdbf829974597bf53a9657007e9940431ffa0020f1d5fa5d22b4f SHA512 e35cc255e36742519b4f26b60d8e704eb3e0e66e8e13599cadae6fe445a3a87a2c6c65b6746c4d39f1ab11e7eb79b0f63a5fc9d5af5d7fa8907b224b852e3b32 WHIRLPOOL a91ba71b8b4fa2f1ff5de1633fa477bc1f45de37f3bbd212af1ecf4b6298c5454c199cd89f6602854978d4ae6a551316eb96c4f90c82a0c07018e94ac3025e43 |
| 21 |
AUX webkit-gtk-1.6.1-darwin-quartz.patch 1516 SHA256 34ad751c33e868d85b41e06ecbd085b61a81c42bd52063bada52bc59b9e05a23 SHA512 ca8c80d06aa93c07d658ebf3433f5fdee9225616740a075f5606df87e3b90a83b2c492777a8e30255cdd4f11f889be789544ac1fc4a39056e1929a72720347ea WHIRLPOOL 558250f3cf6de4d511a26afb0aeacc04b7049b3d0499362d320c035acac20932d7c16f6ff99d83833498296e3a21b5e2bab985b1ee5fca709754b582195a0fd1 |
| 22 |
AUX webkit-gtk-2.14.3-musl.patch 4111 SHA256 cc371f6dd10f489169eaa5b0ef3b197eae7a0f7d349aca86f830dd45f39473af SHA512 eb47b3c9d58bfa121acf83f2f58e819e2e2a2198c58ff926a1d3db8ee1c5ddbcbaad5c06d113cec1c20f286877823edcd52cc0caf3993a8b89a6fb5277f0a387 WHIRLPOOL 486613fe49588ed3019298eebe66a94a6e823e1719ff602dedc330222a931350a605dc64013f3a0244d661d335699a5836cf4083c93b5723a6cb457845e5ca04 |
| 23 |
+AUX webkit-gtk-2.18.1-musl.patch 2792 SHA256 b73ac3741a866ea95abe6ee3288903a8c9a94ee167fabc4c067a362f0913fe99 SHA512 1d27969060710e65d79cde5fd03b8162710dd24c95368f4feafcd0c1a7b8e2e8d5f53e30d7e25f7fbb7d15882921503a8e96280485fea503645ff4f84d84fa26 WHIRLPOOL bff48b32057364fa8c45f524b618d1f5a17e8e3a9536f575d73da7c261e878cd48e38b987b47da1f7a9b5e2e64f256dd7b3e0b5123df80ff1a108df3b7975753 |
| 24 |
AUX webkit-gtk-2.2.5-hppa-platform.patch 530 SHA256 9a2b8311a89aa3500d19d2425c0f12f67c1457c67ecaa322511170461c4c6be7 SHA512 168d4f8acddf4a5fa6ddc3661ef3ec344824c854db036b279d38d526b6025cfbb8bbd15bc64ddd846876749823796ca7d05e4083cf35a744d46b00cfd5179ae1 WHIRLPOOL 5fc8070bf07eef199578db5802452b4443ee3a00b555325b430a3cfd923a0cbb827497907462cb224b07f2f1713d65a26af4adf24b3dca59cb9040dbd6227f92 |
| 25 |
AUX webkit-gtk-2.2.5-ia64-platform.patch 331 SHA256 1ac5327f4f190bc4cbee9e62d4a2805879bbffd914ba75be17afd1aa245e6693 SHA512 dae3cde801d2d29c61abb64c00bf33ac1f7080dd2085cc9a1520c8606ef65538ccee9b1e4c4c16a3dba551acd035542f80b6e808ae5090bb883c85ecfa7ac36e WHIRLPOOL d9ca8172f685f515bb22a38d269e73f1e0fdcbf487bb83557f41649cd9ff5883d1fe0827aef3c753d975895252db3e3fa5eef3f72b43a6557492effd5db10072 |
| 26 |
AUX webkit-gtk-2.4.1-ia64-malloc.patch 807 SHA256 8e01dee48af7e8e0d24729dd9b99e88b47125b5f91d07df29d579785e60d398d SHA512 d9e7a792861ff30137072eba6b5b80e7b37e47e7302bf1cd56027b5c30aea3fd215891f6272d85b80e98c826b3216d0701fe92f06b76e7d1fb860028d7a701c0 WHIRLPOOL 7cf769d9752cf800f72e76233ef299e2da8c13f427cd8d312d47d76282091f06ec32a618dda9d0bacedbc5dcf8aa4289ce9ce089cdbb90be28deeb75e449a925 |
| 27 |
@@ -18,7 +19,7 @@ DIST webkitgtk-2.16.6.tar.xz 14658120 SHA256 fc23650df953123c59b9c0edf3855e7bd55 |
| 28 |
DIST webkitgtk-2.18.1.tar.xz 14823708 SHA256 9cdb7b302fbc8a2a7e1e783b80391e64f8b12d70d6ebad4eb756dd59bf3ed795 SHA512 671392f46a34def51df34e5ce384acdcf7526b286e64f1220921f6c654a28148553e815f6f0fd02252b642dcabef9c646f5386b9ec3d2cb01520782833bb650b WHIRLPOOL e16e1e295d99d6589787fb51e2e3c5867877206428294b824307a5e7af43bdebeda3050a397fffee154c1a624fd21d59e25387fba58c91ce5ab30613773db056 |
| 29 |
DIST webkitgtk-2.4.11.tar.xz 9869100 SHA256 588aea051bfbacced27fdfe0335a957dca839ebe36aa548df39c7bbafdb65bf7 SHA512 2e2cf01a52b8593765a0a3c2d7f0ad306121660019eb402226bd2826c7d4666dab4e91ca6ccbd29abe0ad3993549f256ed1ab88de22e9c8516d5f40a4edd6bfb WHIRLPOOL de86c4abfb22aacbf62163d0398158931c9cf6ab628547d3b30e613f0505d67c85c3200f7db96500e7c2b35f640cdaa7f501346fc13f492c9439dff4056849a3 |
| 30 |
EBUILD webkit-gtk-2.16.6.ebuild 8479 SHA256 e8e9654be98cad921754a3b789bb71c9aee06f0fe6d65c77c57d35c2881c2ef1 SHA512 a64d237d9e011b78ce8e05158489aef83bc9d761ca3897d549f04cacf7377e44e4be5ef69182d3c81b6a0406b575d21d7866b3f5811fed47476476706a660a0f WHIRLPOOL c5d537a8e1247f82b83f6bea4a6c540af2fcb830b021d710b1cd831b9ae558058ed8abb0089aafa1f6527086d8069b3f222d7c2f7a50253d13c82814fba10b20 |
| 31 |
-EBUILD webkit-gtk-2.18.1.ebuild 8341 SHA256 b676787860e9f70db0bdd911a1124fa12b686ac2894338207de9565bcd3ad75b SHA512 3e45ae58f73765f2be0b45a1873efcb9a6cdb883c8606595b0b4ef9a7606d36e8f780c34f6c2e68196fcb71aecb5b1a9085b91a17a66c859aaf4a77f4e3f4367 WHIRLPOOL d64cbda15ae7d499a743dd112cee2cd5d43720286a573a7600ec9b38503760ce95e64403fa751db36f12bb1d11f5fdc5b343d39043d56b7bf752d550e0139ace |
| 32 |
+EBUILD webkit-gtk-2.18.1.ebuild 8341 SHA256 79084623ea7ae079202baa6a7c5bac831cddf2a198c51de24a6f5b7129ec3db9 SHA512 b3e296318fbc6a4823a9a2a53870a618c86274180306a3e73482057fe1ce3a76d5da145d47d21b10acb18f2d7437af109c6b81ae488317a7c26c477602282f6f WHIRLPOOL 49768ef93774ace80b6ffc03a76b5226ec402163d4483d120096bfe22e95b71bcb66edd3842c73f291d0dd6affee61862191ba0a0884c48a7de961de448dec0f |
| 33 |
EBUILD webkit-gtk-2.4.11-r1.ebuild 9116 SHA256 cb634f504420a7b9c685f6e0b7def916e44c0671a31628ed5086da7b960013c9 SHA512 e4796fa71dbfbe6bfc996e51a5d1a5eae8d6ad35736c55ca3d8a705f09833f19bf9d61d643ca8de3d14eb25264e2d1de1778c58ba904c7db044bbfbd6da7bd73 WHIRLPOOL b62d76a261fc01f59cfaa9907585918b4ba9e5d059d5ac8e4a32fbb454ae41854e920c9e237236d775881fd097a6eca765e29e3551b2e4e87146ff666faf1f50 |
| 34 |
EBUILD webkit-gtk-2.4.11-r200.ebuild 8523 SHA256 0877a84ecd95a782324353b5f4d97de900826bdb68e92c5ffca780bed050948e SHA512 faec9fa216387bcbb070f645a7ef1534880239c4ded5ce4a384c8e7b477e44f48905e5d0e87e2748d9296ce53c7770e72451cd142e7c09e2e908f570716d44db WHIRLPOOL 30480cc629d706ce423ec5e709abb4075da678ba9445155ef8e960a3d4a823955914446c4259e49474c32c67d964dfb8ae12644557be3653bcf18a025aa39f9a |
| 35 |
MISC metadata.xml 771 SHA256 b59662217120ef1a7edb3454ef844a0f53a0e585ea294a545b821dc0b20c88be SHA512 a4f15ea6644bf827f15628917d7af57f6569a2273cdf1246d468af95ab776ffe89fa305f842c869ad75c2b9a9480c4d5bc0e00732952ded75607de7ed9695236 WHIRLPOOL 78368036e7299c5ee0549798aa9a0130ea5f8287b151b8a1fe252c57b2d5d025cc307763a82c017d3216bfd0a204d1167e5a5c80cc5139d8f7ecf7dddc6d627c |
| 36 |
|
| 37 |
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 |
| 38 |
new file mode 100644 |
| 39 |
index 0000000..6153432 |
| 40 |
--- /dev/null |
| 41 |
+++ b/net-libs/webkit-gtk/files/webkit-gtk-2.18.1-musl.patch |
| 42 |
@@ -0,0 +1,64 @@ |
| 43 |
+diff -Naur webkitgtk-2.18.1.orig/Source/JavaScriptCore/runtime/MachineContext.h webkitgtk-2.18.1/Source/JavaScriptCore/runtime/MachineContext.h |
| 44 |
+--- webkitgtk-2.18.1.orig/Source/JavaScriptCore/runtime/MachineContext.h 2017-10-23 11:04:02.710772221 -0700 |
| 45 |
++++ webkitgtk-2.18.1/Source/JavaScriptCore/runtime/MachineContext.h 2017-10-23 11:06:15.310769846 -0700 |
| 46 |
+@@ -146,7 +146,7 @@ |
| 47 |
+ #error Unknown Architecture |
| 48 |
+ #endif |
| 49 |
+ |
| 50 |
+-#elif defined(__GLIBC__) |
| 51 |
++#elif OS(LINUX) |
| 52 |
+ |
| 53 |
+ #if CPU(X86) |
| 54 |
+ return reinterpret_cast<void*&>((uintptr_t&) machineContext.gregs[REG_ESP]); |
| 55 |
+@@ -251,7 +251,7 @@ |
| 56 |
+ #error Unknown Architecture |
| 57 |
+ #endif |
| 58 |
+ |
| 59 |
+-#elif defined(__GLIBC__) |
| 60 |
++#elif OS(LINUX) |
| 61 |
+ |
| 62 |
+ // The following sequence depends on glibc's sys/ucontext.h. |
| 63 |
+ #if CPU(X86) |
| 64 |
+@@ -354,7 +354,7 @@ |
| 65 |
+ #error Unknown Architecture |
| 66 |
+ #endif |
| 67 |
+ |
| 68 |
+-#elif defined(__GLIBC__) |
| 69 |
++#elif OS(LINUX) |
| 70 |
+ |
| 71 |
+ // The following sequence depends on glibc's sys/ucontext.h. |
| 72 |
+ #if CPU(X86) |
| 73 |
+@@ -466,7 +466,7 @@ |
| 74 |
+ #error Unknown Architecture |
| 75 |
+ #endif |
| 76 |
+ |
| 77 |
+-#elif defined(__GLIBC__) |
| 78 |
++#elif OS(LINUX) |
| 79 |
+ |
| 80 |
+ // The following sequence depends on glibc's sys/ucontext.h. |
| 81 |
+ #if CPU(X86) |
| 82 |
+@@ -583,7 +583,7 @@ |
| 83 |
+ #error Unknown Architecture |
| 84 |
+ #endif |
| 85 |
+ |
| 86 |
+-#elif defined(__GLIBC__) |
| 87 |
++#elif OS(LINUX) |
| 88 |
+ |
| 89 |
+ // The following sequence depends on glibc's sys/ucontext.h. |
| 90 |
+ #if CPU(X86) |
| 91 |
+diff -Naur webkitgtk-2.18.1.orig/Source/JavaScriptCore/runtime/Options.h webkitgtk-2.18.1/Source/JavaScriptCore/runtime/Options.h |
| 92 |
+--- webkitgtk-2.18.1.orig/Source/JavaScriptCore/runtime/Options.h 2017-10-23 11:04:02.711772221 -0700 |
| 93 |
++++ webkitgtk-2.18.1/Source/JavaScriptCore/runtime/Options.h 2017-10-23 11:07:37.100768382 -0700 |
| 94 |
+@@ -120,9 +120,9 @@ |
| 95 |
+ \ |
| 96 |
+ v(bool, reportMustSucceedExecutableAllocations, false, Normal, nullptr) \ |
| 97 |
+ \ |
| 98 |
+- v(unsigned, maxPerThreadStackUsage, 4 * MB, Normal, "Max allowed stack usage by the VM") \ |
| 99 |
+- v(unsigned, softReservedZoneSize, 128 * KB, Normal, "A buffer greater than reservedZoneSize that reserves space for stringifying exceptions.") \ |
| 100 |
+- v(unsigned, reservedZoneSize, 64 * KB, Normal, "The amount of stack space we guarantee to our clients (and to interal VM code that does not call out to clients).") \ |
| 101 |
++ v(unsigned, maxPerThreadStackUsage, 80 * KB, Normal, "Max allowed stack usage by the VM") \ |
| 102 |
++ v(unsigned, softReservedZoneSize, 32 * KB, Normal, "A buffer greater than reservedZoneSize that reserves space for stringifying exceptions.") \ |
| 103 |
++ v(unsigned, reservedZoneSize, 16 * KB, Normal, "The amount of stack space we guarantee to our clients (and to interal VM code that does not call out to clients).") \ |
| 104 |
+ \ |
| 105 |
+ v(bool, crashIfCantAllocateJITMemory, false, Normal, nullptr) \ |
| 106 |
+ v(unsigned, jitMemoryReservationSize, 0, Normal, "Set this number to change the executable allocation size in ExecutableAllocatorFixedVMPool. (In bytes.)") \ |
| 107 |
|
| 108 |
diff --git a/net-libs/webkit-gtk/webkit-gtk-2.18.1.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.18.1.ebuild |
| 109 |
index caf4f68..67e859b 100644 |
| 110 |
--- a/net-libs/webkit-gtk/webkit-gtk-2.18.1.ebuild |
| 111 |
+++ b/net-libs/webkit-gtk/webkit-gtk-2.18.1.ebuild |
| 112 |
@@ -153,7 +153,7 @@ src_prepare() { |
| 113 |
# https://bugs.gentoo.org/show_bug.cgi?id=555504 |
| 114 |
eapply "${FILESDIR}"/${PN}-2.8.5-fix-ia64-build.patch |
| 115 |
# musl and jit |
| 116 |
- eapply "${FILESDIR}"/${PN}-2.14.3-musl.patch |
| 117 |
+ eapply "${FILESDIR}"/${PN}-2.18.1-musl.patch |
| 118 |
cmake-utils_src_prepare |
| 119 |
gnome2_src_prepare |
| 120 |
} |
Archives