Get Gentoo!
gentoo.org sites
gentoo.org Wiki Bugs Forums Packages
Planet Archives Sources
Infra Status

Gentoo Archives: gentoo-commits

From: Aric Belsito <lluixhi@×××××.com>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] proj/musl:master commit in: net-libs/webkit-gtk/, net-libs/webkit-gtk/files/
Date: Fri, 03 Feb 2017 00:47:55
Message-Id: 1486082826.723e96f762eeaec837d88e20a1ba22de597f5658.lluixhi@gentoo
1 commit: 723e96f762eeaec837d88e20a1ba22de597f5658
2 Author: Aric Belsito <lluixhi <AT> gmail <DOT> com>
3 AuthorDate: Fri Feb 3 00:47:06 2017 +0000
4 Commit: Aric Belsito <lluixhi <AT> gmail <DOT> com>
5 CommitDate: Fri Feb 3 00:47:06 2017 +0000
6 URL: https://gitweb.gentoo.org/proj/musl.git/commit/?id=723e96f7
7
8 net-libs/webkit-gtk: add 2.14.3
9
10 net-libs/webkit-gtk/Manifest | 6 +
11 .../webkit-gtk/files/webkit-gtk-2.14.3-musl.patch | 82 ++++++
12 .../files/webkit-gtk-2.8.5-fix-alpha-build.patch | 22 ++
13 .../files/webkit-gtk-2.8.5-fix-ia64-build.patch | 21 ++
14 ...kit-gtk-2.8.5-webkit2gtkinjectedbundle-j1.patch | 22 ++
15 net-libs/webkit-gtk/webkit-gtk-2.14.3.ebuild | 293 +++++++++++++++++++++
16 6 files changed, 446 insertions(+)
17
18 diff --git a/net-libs/webkit-gtk/Manifest b/net-libs/webkit-gtk/Manifest
19 index 989b7e1..4eae739 100644
20 --- a/net-libs/webkit-gtk/Manifest
21 +++ b/net-libs/webkit-gtk/Manifest
22 @@ -1,5 +1,6 @@
23 AUX webkit-gtk-1.11.90-gtk-docize-fix.patch 426 SHA256 20d26df63afbdbf829974597bf53a9657007e9940431ffa0020f1d5fa5d22b4f SHA512 e35cc255e36742519b4f26b60d8e704eb3e0e66e8e13599cadae6fe445a3a87a2c6c65b6746c4d39f1ab11e7eb79b0f63a5fc9d5af5d7fa8907b224b852e3b32 WHIRLPOOL a91ba71b8b4fa2f1ff5de1633fa477bc1f45de37f3bbd212af1ecf4b6298c5454c199cd89f6602854978d4ae6a551316eb96c4f90c82a0c07018e94ac3025e43
24 AUX webkit-gtk-1.6.1-darwin-quartz.patch 1516 SHA256 34ad751c33e868d85b41e06ecbd085b61a81c42bd52063bada52bc59b9e05a23 SHA512 ca8c80d06aa93c07d658ebf3433f5fdee9225616740a075f5606df87e3b90a83b2c492777a8e30255cdd4f11f889be789544ac1fc4a39056e1929a72720347ea WHIRLPOOL 558250f3cf6de4d511a26afb0aeacc04b7049b3d0499362d320c035acac20932d7c16f6ff99d83833498296e3a21b5e2bab985b1ee5fca709754b582195a0fd1
25 +AUX webkit-gtk-2.14.3-musl.patch 4111 SHA256 cc371f6dd10f489169eaa5b0ef3b197eae7a0f7d349aca86f830dd45f39473af SHA512 eb47b3c9d58bfa121acf83f2f58e819e2e2a2198c58ff926a1d3db8ee1c5ddbcbaad5c06d113cec1c20f286877823edcd52cc0caf3993a8b89a6fb5277f0a387 WHIRLPOOL 486613fe49588ed3019298eebe66a94a6e823e1719ff602dedc330222a931350a605dc64013f3a0244d661d335699a5836cf4083c93b5723a6cb457845e5ca04
26 AUX webkit-gtk-2.2.5-hppa-platform.patch 530 SHA256 9a2b8311a89aa3500d19d2425c0f12f67c1457c67ecaa322511170461c4c6be7 SHA512 168d4f8acddf4a5fa6ddc3661ef3ec344824c854db036b279d38d526b6025cfbb8bbd15bc64ddd846876749823796ca7d05e4083cf35a744d46b00cfd5179ae1 WHIRLPOOL 5fc8070bf07eef199578db5802452b4443ee3a00b555325b430a3cfd923a0cbb827497907462cb224b07f2f1713d65a26af4adf24b3dca59cb9040dbd6227f92
27 AUX webkit-gtk-2.2.5-ia64-platform.patch 331 SHA256 1ac5327f4f190bc4cbee9e62d4a2805879bbffd914ba75be17afd1aa245e6693 SHA512 dae3cde801d2d29c61abb64c00bf33ac1f7080dd2085cc9a1520c8606ef65538ccee9b1e4c4c16a3dba551acd035542f80b6e808ae5090bb883c85ecfa7ac36e WHIRLPOOL d9ca8172f685f515bb22a38d269e73f1e0fdcbf487bb83557f41649cd9ff5883d1fe0827aef3c753d975895252db3e3fa5eef3f72b43a6557492effd5db10072
28 AUX webkit-gtk-2.4.1-ia64-malloc.patch 807 SHA256 8e01dee48af7e8e0d24729dd9b99e88b47125b5f91d07df29d579785e60d398d SHA512 d9e7a792861ff30137072eba6b5b80e7b37e47e7302bf1cd56027b5c30aea3fd215891f6272d85b80e98c826b3216d0701fe92f06b76e7d1fb860028d7a701c0 WHIRLPOOL 7cf769d9752cf800f72e76233ef299e2da8c13f427cd8d312d47d76282091f06ec32a618dda9d0bacedbc5dcf8aa4289ce9ce089cdbb90be28deeb75e449a925
29 @@ -10,7 +11,12 @@ AUX webkit-gtk-2.4.7-disable-webgl.patch 442 SHA256 6fb78d5f94806ddb976ceb076e62
30 AUX webkit-gtk-2.4.9-gcc-6.patch 1890 SHA256 d0d82c1a1e955e03dd7667e351d99da485d7297acf378e715820202e48d4088e SHA512 cfcfe95b08d503456b1ea6e1770dd4ca4cd61f613ef76962cd01bc4826fbb25aed04834f820da987fd1c80941b90da73086ec5e7e19285e54082f5e90598fd9c WHIRLPOOL 1ebbeb9564978b3ddf4488c9fe72113da0ff10a0ba8c3bcd418b913a936ebe09da907e86714b7419f2746af1648ab786850559c4a5c6a0f1b51ed98e9aab0334
31 AUX webkit-gtk-2.4.9-remove-disallow_ctypes_h-braindead.patch 733 SHA256 d447d71943cacdec166f0a65f34258494f70719ba9cd951d5b512902e20200d0 SHA512 580531428c0498e996de358a20a499f36edaaa98a108088c5dde428a997a61e5a55293cf855d652655c193cd5cda8e25723cac360d3983fcd1fbce35aa9b41a0 WHIRLPOOL b68bc94045ef46f5959146b6d14e2e39c9a1e3c7a39a9e7164ece4db1d1fc9f3c846b26af5e7b2b81db5ee82913b4018097367c6843a8b41758316cd27371bcc
32 AUX webkit-gtk-2.4.9-remove-execinfo_h.patch 1374 SHA256 9a6cea9456c7d38b280be1d4f29417e3d4ebd619e183535368175c473485c2dd SHA512 f4a0647530f29bed5fdbf0fcec5d52c6064a13c00715fb6fb490490dee29dac87bb2b1d9ab35ce2bf7b9eb2da262cf5bb07b7c84f82f84cfab784a61f163811e WHIRLPOOL f18be67ef26051ebe271481c3444761c604a40fcda9679f3778cccbc3513f8501a6c3ea9b43fa1b3c3eaa04ca08585e62d8b3a27185358dc69c612ef8eab8364
33 +AUX webkit-gtk-2.8.5-fix-alpha-build.patch 914 SHA256 aa6617505fe9342153ba9442ea109d880ca6c3315777c57ab599f67515e2a9f7 SHA512 c3599c21dbcc709cf1bbc56eafdff8f8d30d65732fff73e601a828b397523d9a0cec96a4e7940ad1b4b3d9b4711f6d5f2935dcd34cac9adec63b73401638fd5e WHIRLPOOL 68a39ccf49e7719393f14cd5d53497148527bd697b010378bdec4cdefb21c5fc7ce5081ce10b412c61390a82e45fa44d9d34aa7f223c51ad15eb1d0288ccbe60
34 +AUX webkit-gtk-2.8.5-fix-ia64-build.patch 663 SHA256 d076739707de117fbc9aebc684c4a43024e1673e4c30fdfa3be529331f0c1f78 SHA512 ce8dbe7f2bacfc6d1ad70d39d80447ab90e6daf63bc1dc4a49c406255f76eff090f79e6076ebc349d69193b72a821fa6591692cf74a28e529f8db95cf86358fc WHIRLPOOL adf8e11ee3060bcba606cf17673d06d9c98034a71f6a7406832fabf461c4697abcd0c3d4cdb8d8298caf221c797e0732a9f865d761fcf05753a1dfd96dfd3d82
35 +AUX webkit-gtk-2.8.5-webkit2gtkinjectedbundle-j1.patch 880 SHA256 411a4238c2e863b60744287ad645f1e3e0cddd33e895f4dfb1e1c5cfd9f48765 SHA512 7150400387f5edd3a647359ef1d864634c25d0a7dad043c1b0734fb44d133f59bbc0ce065e59bc3abab0082272ac54c1b40752e06041e5e36c11f502a9734a62 WHIRLPOOL 470ea2f6228878ddae55cec72b667f14f56d5f7017ea1cce123dcc5da41dd3fd589214b722e5a85bd81f2a14445a759c55366826b82e3801d8e40ef2ba9c6826
36 +DIST webkitgtk-2.14.3.tar.xz 13962776 SHA256 0bead450a4c92024f09008725bb3e8c3830a32c7e2983d566368c4fede9e106c SHA512 b530b84f238230f29462ef599ffd1b9a9458690ba03a78d09126bf4c4ab37b4dfb477da7c364d2446cc259720ff4743112672ebf7888b8e3ff2c8fc1271fda57 WHIRLPOOL 560b4c818ca6271eca72a31c65c11b0c42269a125e68dfac7932f40e6d108cff325e5340d6040889f429b0e6b978a2a6279432f23a0c8956af02e6ece8a61ff8
37 DIST webkitgtk-2.4.11.tar.xz 9869100 SHA256 588aea051bfbacced27fdfe0335a957dca839ebe36aa548df39c7bbafdb65bf7 SHA512 2e2cf01a52b8593765a0a3c2d7f0ad306121660019eb402226bd2826c7d4666dab4e91ca6ccbd29abe0ad3993549f256ed1ab88de22e9c8516d5f40a4edd6bfb WHIRLPOOL de86c4abfb22aacbf62163d0398158931c9cf6ab628547d3b30e613f0505d67c85c3200f7db96500e7c2b35f640cdaa7f501346fc13f492c9439dff4056849a3
38 +EBUILD webkit-gtk-2.14.3.ebuild 8558 SHA256 948c02462aee8e42db2d040c3e3c47079538935e99274e588064b6484b24c398 SHA512 0918411af48f6332925a3b2c3470273d7f6d586db94a065a34a899ed25635069c4559bacf3297d777779ed795dcb4360fa75f56ae7fcb2abecb0322e141192ae WHIRLPOOL 8df6af74418c8b595194dff849087bd8747062c586ace1ca76b1525d002bcc7c5fa63275bb536af9d75e405fcb613583b5b502e684b45bc41d18a9bf7fe4044c
39 EBUILD webkit-gtk-2.4.11-r1.ebuild 9123 SHA256 6fc62f471fe028d8e0a2fe0a130dc53833f62c49ab7136dbc446dd290b4b71ce SHA512 5e12f7febbd297859e6d9fa709efbdfe440b5d7900d70ee1e81479313bfabd5583b6c1a68d912748df02af2d1f430fac63382ecb92a9986cbb9841602294b5c8 WHIRLPOOL f9d46ac0776142733ee7d2fe5907acaa265198f6bc1334e74c8c6f7fecece8545de9f620d15d00b7f8aa3225e0d325ace4af58360145d3f9f8bd20a4ed74a067
40 EBUILD webkit-gtk-2.4.11-r200.ebuild 8530 SHA256 e579be98b8fba274c974019ac867e2a2fdefba5d4b7e4419c324f1eae74b7a5d SHA512 dbf7e7e1dffc157be18602e0e1bda57297f30c5a1f00862736067d6fee8573c1711f027bab07a698a1cd382a6f6d825327deed7274930a098f416e77c8d05371 WHIRLPOOL ec612bb5db541cdd866227f09281f63dbf9e157eb485c8ce8e87f9664ef3213750958f0ba13f3a87cfe641b3c6f1972ea15a9955d2293e101cf8b466dea10aad
41 MISC metadata.xml 634 SHA256 48f0a29437afb03701f60011476eb2ad74683d918b69c6963e16f92b763bb0de SHA512 36bcb7965d4bf4b61d9399c794d4f4a438152bf6338ef68cfd6a04f8c94351b35f1cb09172fb4eee4db9b072e0984420ee976031e2c27963fe0390e079494ba8 WHIRLPOOL e14b1f0070ff39f026b1c406718d68f2ccffe4c4db7bf5afe16c658cc1837cb3b29820868b2e9617beb37442eab7ac2f9d8340f55a763bc5ee8ebe1a2065c694
42
43 diff --git a/net-libs/webkit-gtk/files/webkit-gtk-2.14.3-musl.patch b/net-libs/webkit-gtk/files/webkit-gtk-2.14.3-musl.patch
44 new file mode 100644
45 index 0000000..f5b40f9
46 --- /dev/null
47 +++ b/net-libs/webkit-gtk/files/webkit-gtk-2.14.3-musl.patch
48 @@ -0,0 +1,82 @@
49 +diff -Naur webkitgtk-2.14.3.orig/Source/JavaScriptCore/heap/MachineStackMarker.cpp webkitgtk-2.14.3/Source/JavaScriptCore/heap/MachineStackMarker.cpp
50 +--- webkitgtk-2.14.3.orig/Source/JavaScriptCore/heap/MachineStackMarker.cpp 2017-01-21 14:57:58.821113862 -0800
51 ++++ webkitgtk-2.14.3/Source/JavaScriptCore/heap/MachineStackMarker.cpp 2017-01-21 14:59:46.889444106 -0800
52 +@@ -549,7 +549,7 @@
53 + #error Unknown Architecture
54 + #endif
55 +
56 +-#elif defined(__GLIBC__) && ENABLE(JIT)
57 ++#elif OS(LINUX) && ENABLE(JIT)
58 +
59 + #if CPU(X86)
60 + return reinterpret_cast<void*>((uintptr_t) regs.machineContext.gregs[REG_ESP]);
61 +@@ -648,9 +648,8 @@
62 + #error Unknown Architecture
63 + #endif
64 +
65 +-#elif defined(__GLIBC__)
66 ++#elif OS(LINUX)
67 +
68 +-// The following sequence depends on glibc's sys/ucontext.h.
69 + #if CPU(X86)
70 + return reinterpret_cast<void*>((uintptr_t) regs.machineContext.gregs[REG_EBP]);
71 + #elif CPU(X86_64)
72 +@@ -730,9 +729,8 @@
73 + #error Unknown Architecture
74 + #endif
75 +
76 +-#elif defined(__GLIBC__)
77 ++#elif OS(LINUX)
78 +
79 +-// The following sequence depends on glibc's sys/ucontext.h.
80 + #if CPU(X86)
81 + return reinterpret_cast<void*>((uintptr_t) regs.machineContext.gregs[REG_EIP]);
82 + #elif CPU(X86_64)
83 +@@ -821,9 +819,8 @@
84 + #error Unknown Architecture
85 + #endif
86 +
87 +-#elif defined(__GLIBC__)
88 ++#elif OS(LINUX)
89 +
90 +-// The following sequence depends on glibc's sys/ucontext.h.
91 + #if CPU(X86)
92 + return reinterpret_cast<void*>((uintptr_t) regs.machineContext.gregs[REG_ESI]);
93 + #elif CPU(X86_64)
94 +diff -Naur webkitgtk-2.14.3.orig/Source/JavaScriptCore/inspector/JSGlobalObjectInspectorController.cpp webkitgtk-2.14.3/Source/JavaScriptCore/inspector/JSGlobalObjectInspectorController.cpp
95 +--- webkitgtk-2.14.3.orig/Source/JavaScriptCore/inspector/JSGlobalObjectInspectorController.cpp 2017-01-21 14:57:58.933115241 -0800
96 ++++ webkitgtk-2.14.3/Source/JavaScriptCore/inspector/JSGlobalObjectInspectorController.cpp 2017-01-21 15:00:42.712131243 -0800
97 +@@ -49,7 +49,7 @@
98 + #include "ScriptCallStackFactory.h"
99 + #include <wtf/Stopwatch.h>
100 +
101 +-#if OS(DARWIN) || (OS(LINUX) && !PLATFORM(GTK))
102 ++#if OS(DARWIN) || (OS(LINUX) && !PLATFORM(GTK) && defined(__GLIBC__) && !defined(__UCLIBC__))
103 + #include <cxxabi.h>
104 + #include <dlfcn.h>
105 + #include <execinfo.h>
106 +@@ -187,7 +187,7 @@
107 +
108 + void JSGlobalObjectInspectorController::appendAPIBacktrace(ScriptCallStack* callStack)
109 + {
110 +-#if OS(DARWIN) || (OS(LINUX) && !PLATFORM(GTK))
111 ++#if OS(DARWIN) || (OS(LINUX) && !PLATFORM(GTK) && defined(__GLIBC__) && !defined(__UCLIBC__))
112 + static const int framesToShow = 31;
113 + static const int framesToSkip = 3; // WTFGetBacktrace, appendAPIBacktrace, reportAPIException.
114 +
115 +diff -Naur webkitgtk-2.14.3.orig/Source/JavaScriptCore/runtime/Options.h webkitgtk-2.14.3/Source/JavaScriptCore/runtime/Options.h
116 +--- webkitgtk-2.14.3.orig/Source/JavaScriptCore/runtime/Options.h 2017-01-21 14:57:59.074116976 -0800
117 ++++ webkitgtk-2.14.3/Source/JavaScriptCore/runtime/Options.h 2017-01-21 15:01:36.813797195 -0800
118 +@@ -112,9 +112,9 @@
119 + \
120 + v(bool, reportMustSucceedExecutableAllocations, false, Normal, nullptr) \
121 + \
122 +- v(unsigned, maxPerThreadStackUsage, 4 * MB, Normal, "Max allowed stack usage by the VM") \
123 +- v(unsigned, softReservedZoneSize, 128 * KB, Normal, "A buffer greater than reservedZoneSize that reserves space for stringifying exceptions.") \
124 +- 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).") \
125 ++ v(unsigned, maxPerThreadStackUsage, 80 * KB, Normal, "Max allowed stack usage by the VM") \
126 ++ v(unsigned, softReservedZoneSize, 32 * KB, Normal, "A buffer greater than reservedZoneSize that reserves space for stringifying exceptions.") \
127 ++ 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).") \
128 + \
129 + v(bool, crashIfCantAllocateJITMemory, false, Normal, nullptr) \
130 + v(unsigned, jitMemoryReservationSize, 0, Normal, "Set this number to change the executable allocation size in ExecutableAllocatorFixedVMPool. (In bytes.)") \
131
132 diff --git a/net-libs/webkit-gtk/files/webkit-gtk-2.8.5-fix-alpha-build.patch b/net-libs/webkit-gtk/files/webkit-gtk-2.8.5-fix-alpha-build.patch
133 new file mode 100644
134 index 0000000..3817bce
135 --- /dev/null
136 +++ b/net-libs/webkit-gtk/files/webkit-gtk-2.8.5-fix-alpha-build.patch
137 @@ -0,0 +1,22 @@
138 +--- a/Source/JavaScriptCore/CMakeLists.txt.orig 2015-08-06 11:21:27.000000000 +0300
139 ++++ b/Source/JavaScriptCore/CMakeLists.txt 2015-10-29 17:47:10.535712494 +0300
140 +@@ -1146,6 +1146,7 @@
141 + list(APPEND JavaScriptCore_SOURCES ${DERIVED_SOURCES_DIR}/GeneratedJITStubs.obj)
142 + endif ()
143 + elseif (WTF_CPU_ARM64)
144 ++elseif (WTF_CPU_ALPHA)
145 + elseif (WTF_CPU_HPPA)
146 + elseif (WTF_CPU_IA64)
147 + elseif (WTF_CPU_PPC)
148 + elseif (WTF_CPU_PPC64)
149 +--- a/CMakeLists.txt.orig 2015-08-06 11:21:27.000000000 +0300
150 ++++ b/CMakeLists.txt 2015-10-29 01:23:37.416886279 +0300
151 +@@ -82,6 +82,8 @@
152 + set(WTF_CPU_ARM 1)
153 + elseif (LOWERCASE_CMAKE_SYSTEM_PROCESSOR MATCHES "^aarch64")
154 + set(WTF_CPU_ARM64 1)
155 ++elseif (LOWERCASE_CMAKE_SYSTEM_PROCESSOR MATCHES "alpha")
156 ++ set(WTF_CPU_ALPHA 1)
157 + elseif (LOWERCASE_CMAKE_SYSTEM_PROCESSOR MATCHES "^mips")
158 + set(WTF_CPU_MIPS 1)
159 + elseif (LOWERCASE_CMAKE_SYSTEM_PROCESSOR MATCHES "sh4")
160
161 diff --git a/net-libs/webkit-gtk/files/webkit-gtk-2.8.5-fix-ia64-build.patch b/net-libs/webkit-gtk/files/webkit-gtk-2.8.5-fix-ia64-build.patch
162 new file mode 100644
163 index 0000000..6c88c49
164 --- /dev/null
165 +++ b/net-libs/webkit-gtk/files/webkit-gtk-2.8.5-fix-ia64-build.patch
166 @@ -0,0 +1,21 @@
167 +--- a/CMakeLists.txt
168 ++++ b/CMakeLists.txt
169 +@@ -98,6 +98,8 @@
170 + set(WTF_CPU_PPC64LE 1)
171 + elseif (LOWERCASE_CMAKE_SYSTEM_PROCESSOR MATCHES "parisc*")
172 + set(WTF_CPU_HPPA 1)
173 ++elseif (LOWERCASE_CMAKE_SYSTEM_PROCESSOR MATCHES "ia64")
174 ++ set(WTF_CPU_IA64 1)
175 + elseif (LOWERCASE_CMAKE_SYSTEM_PROCESSOR MATCHES "s390")
176 + set(WTF_CPU_S390 1)
177 + elseif (LOWERCASE_CMAKE_SYSTEM_PROCESSOR MATCHES "s390x")
178 +--- a/Source/JavaScriptCore/CMakeLists.txt
179 ++++ b/Source/JavaScriptCore/CMakeLists.txt
180 +@@ -1147,6 +1147,7 @@
181 + endif ()
182 + elseif (WTF_CPU_ARM64)
183 + elseif (WTF_CPU_HPPA)
184 ++elseif (WTF_CPU_IA64)
185 + elseif (WTF_CPU_PPC)
186 + elseif (WTF_CPU_PPC64)
187 + elseif (WTF_CPU_PPC64LE)
188
189 diff --git a/net-libs/webkit-gtk/files/webkit-gtk-2.8.5-webkit2gtkinjectedbundle-j1.patch b/net-libs/webkit-gtk/files/webkit-gtk-2.8.5-webkit2gtkinjectedbundle-j1.patch
190 new file mode 100644
191 index 0000000..49af448
192 --- /dev/null
193 +++ b/net-libs/webkit-gtk/files/webkit-gtk-2.8.5-webkit2gtkinjectedbundle-j1.patch
194 @@ -0,0 +1,22 @@
195 +2015-08-24 Alexandre Rostovtsev <tetromino@g.o>
196 +
197 + webkit2gtkinjectedbundle requires forwarding headers
198 + https://bugs.webkit.org/show_bug.cgi?id=148379
199 +
200 + Fixes GTK build with -j1
201 +
202 + * PlatformGTK.cmake:
203 +
204 +Index: Source/WebKit2/PlatformGTK.cmake
205 +===================================================================
206 +--- a/Source/WebKit2/PlatformGTK.cmake (revision 188859)
207 ++++ b/Source/WebKit2/PlatformGTK.cmake (working copy)
208 +@@ -860,7 +860,7 @@ include_directories(
209 + )
210 +
211 + add_library(webkit2gtkinjectedbundle MODULE "${WEBKIT2_DIR}/WebProcess/gtk/WebGtkInjectedBundleMain.cpp")
212 +-add_dependencies(webkit2gtkinjectedbundle GObjectDOMBindings)
213 ++add_dependencies(webkit2gtkinjectedbundle GObjectDOMBindings WebKit2-forwarding-headers)
214 + add_webkit2_prefix_header(webkit2gtkinjectedbundle)
215 +
216 + # Add ${CMAKE_LIBRARY_OUTPUT_DIRECTORY} to LD_LIBRARY_PATH
217
218 diff --git a/net-libs/webkit-gtk/webkit-gtk-2.14.3.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.14.3.ebuild
219 new file mode 100644
220 index 0000000..e9c4089
221 --- /dev/null
222 +++ b/net-libs/webkit-gtk/webkit-gtk-2.14.3.ebuild
223 @@ -0,0 +1,293 @@
224 +# Copyright 1999-2017 Gentoo Foundation
225 +# Distributed under the terms of the GNU General Public License v2
226 +# $Id$
227 +
228 +EAPI=6
229 +CMAKE_MAKEFILE_GENERATOR="ninja"
230 +PYTHON_COMPAT=( python2_7 )
231 +USE_RUBY="ruby21 ruby22 ruby23 ruby24"
232 +
233 +inherit check-reqs cmake-utils eutils flag-o-matic gnome2 pax-utils python-any-r1 ruby-single toolchain-funcs versionator virtualx
234 +
235 +MY_P="webkitgtk-${PV}"
236 +DESCRIPTION="Open source web browser engine"
237 +HOMEPAGE="http://www.webkitgtk.org/"
238 +SRC_URI="http://www.webkitgtk.org/releases/${MY_P}.tar.xz"
239 +
240 +LICENSE="LGPL-2+ BSD"
241 +SLOT="4/37" # soname version of libwebkit2gtk-4.0
242 +KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x86-macos"
243 +
244 +IUSE="aqua coverage doc +egl +geolocation gles2 gnome-keyring +gstreamer +introspection +jit libnotify nsplugin +opengl spell wayland +webgl X"
245 +
246 +# webgl needs gstreamer, bug #560612
247 +REQUIRED_USE="
248 + geolocation? ( introspection )
249 + gles2? ( egl )
250 + introspection? ( gstreamer )
251 + nsplugin? ( X )
252 + webgl? ( ^^ ( gles2 opengl ) )
253 + !webgl? ( ?? ( gles2 opengl ) )
254 + webgl? ( gstreamer )
255 + wayland? ( egl )
256 + || ( aqua wayland X )
257 +"
258 +
259 +# Tests fail to link for inexplicable reasons
260 +# https://bugs.webkit.org/show_bug.cgi?id=148210
261 +RESTRICT="test"
262 +
263 +# use sqlite, svg by default
264 +# Aqua support in gtk3 is untested
265 +# Dependencies found at Source/cmake/OptionsGTK.cmake
266 +RDEPEND="
267 + dev-db/sqlite:3=
268 + >=dev-libs/glib-2.36:2
269 + dev-libs/hyphen
270 + >=dev-libs/icu-3.8.1-r1:=
271 + >=dev-libs/libxml2-2.8:2
272 + >=dev-libs/libxslt-1.1.7
273 + >=media-libs/fontconfig-2.8:1.0
274 + >=media-libs/freetype-2.4.2:2
275 + >=media-libs/harfbuzz-0.9.18:=[icu(+)]
276 + >=media-libs/libpng-1.4:0=
277 + media-libs/libwebp:=
278 + >=net-libs/gnutls-3
279 + >=net-libs/libsoup-2.42:2.4[introspection?]
280 + >=x11-libs/cairo-1.10.2:=
281 + >=x11-libs/gtk+-3.14:3[introspection?]
282 + >=x11-libs/pango-1.30.0
283 + virtual/jpeg:0=
284 +
285 + aqua? ( >=x11-libs/gtk+-3.14:3[aqua] )
286 + egl? ( media-libs/mesa[egl] )
287 + geolocation? ( >=app-misc/geoclue-2.1.5:2.0 )
288 + gles2? ( media-libs/mesa[gles2] )
289 + gnome-keyring? ( app-crypt/libsecret )
290 + gstreamer? (
291 + >=media-libs/gstreamer-1.2:1.0
292 + >=media-libs/gst-plugins-base-1.2:1.0
293 + >=media-libs/gst-plugins-bad-1.8:1.0[opengl?] )
294 + introspection? ( >=dev-libs/gobject-introspection-1.32.0:= )
295 + libnotify? ( x11-libs/libnotify )
296 + nsplugin? ( >=x11-libs/gtk+-2.24.10:2 )
297 + opengl? ( virtual/opengl
298 + x11-libs/cairo[opengl] )
299 + spell? ( >=app-text/enchant-0.22:= )
300 + wayland? ( >=x11-libs/gtk+-3.14:3[wayland] )
301 + webgl? (
302 + x11-libs/cairo[opengl]
303 + x11-libs/libXcomposite
304 + x11-libs/libXdamage )
305 + X? (
306 + x11-libs/cairo[X]
307 + >=x11-libs/gtk+-3.14:3[X]
308 + x11-libs/libX11
309 + x11-libs/libXcomposite
310 + x11-libs/libXrender
311 + x11-libs/libXt )
312 +"
313 +
314 +# paxctl needed for bug #407085
315 +# Need real bison, not yacc
316 +DEPEND="${RDEPEND}
317 + ${PYTHON_DEPS}
318 + ${RUBY_DEPS}
319 + >=dev-lang/perl-5.10
320 + >=app-accessibility/at-spi2-core-2.5.3
321 + >=dev-libs/atk-2.8.0
322 + >=dev-util/gtk-doc-am-1.10
323 + >=dev-util/gperf-3.0.1
324 + >=sys-devel/bison-2.4.3
325 + >=sys-devel/flex-2.5.34
326 + || ( >=sys-devel/gcc-4.9 >=sys-devel/clang-3.3 )
327 + sys-devel/gettext
328 + virtual/pkgconfig
329 +
330 + doc? ( >=dev-util/gtk-doc-1.10 )
331 + geolocation? ( dev-util/gdbus-codegen )
332 + introspection? ( jit? ( sys-apps/paxctl ) )
333 + test? (
334 + dev-lang/python:2.7
335 + dev-python/pygobject:3[python_targets_python2_7]
336 + x11-themes/hicolor-icon-theme
337 + jit? ( sys-apps/paxctl ) )
338 +"
339 +
340 +S="${WORKDIR}/${MY_P}"
341 +
342 +CHECKREQS_DISK_BUILD="18G" # and even this might not be enough, bug #417307
343 +
344 +pkg_pretend() {
345 + if [[ ${MERGE_TYPE} != "binary" ]] ; then
346 + if is-flagq "-g*" && ! is-flagq "-g*0" ; then
347 + einfo "Checking for sufficient disk space to build ${PN} with debugging CFLAGS"
348 + check-reqs_pkg_pretend
349 + fi
350 +
351 + if ! test-flag-CXX -std=c++11 ; then
352 + die "You need at least GCC 4.9.x or Clang >= 3.3 for C++11-specific compiler flags"
353 + fi
354 +
355 + if tc-is-gcc && [[ $(gcc-version) < 4.9 ]] ; then
356 + die 'The active compiler needs to be gcc 4.9 (or newer)'
357 + fi
358 + fi
359 +}
360 +
361 +pkg_setup() {
362 + if [[ ${MERGE_TYPE} != "binary" ]] && is-flagq "-g*" && ! is-flagq "-g*0" ; then
363 + check-reqs_pkg_setup
364 + fi
365 +
366 + python-any-r1_pkg_setup
367 +}
368 +
369 +src_prepare() {
370 + # https://bugs.gentoo.org/show_bug.cgi?id=555504
371 + eapply "${FILESDIR}"/${PN}-2.8.5-fix-ia64-build.patch
372 +
373 + # https://bugs.gentoo.org/show_bug.cgi?id=564352
374 + # https://bugs.webkit.org/show_bug.cgi?id=167283
375 + eapply "${FILESDIR}"/${PN}-2.8.5-fix-alpha-build.patch
376 +
377 + # https://bugs.webkit.org/show_bug.cgi?id=148379
378 + eapply "${FILESDIR}"/${PN}-2.8.5-webkit2gtkinjectedbundle-j1.patch
379 +
380 + # musl and jit
381 + eapply "${FILESDIR}"/${PN}-2.14.3-musl.patch
382 +
383 + gnome2_src_prepare
384 +}
385 +
386 +src_configure() {
387 + # Respect CC, otherwise fails on prefix #395875
388 + tc-export CC
389 +
390 + # Arches without JIT support also need this to really disable it in all places
391 + use jit || append-cppflags -DENABLE_JIT=0 -DENABLE_YARR_JIT=0 -DENABLE_ASSEMBLER=0
392 +
393 + # It does not compile on alpha without this in LDFLAGS
394 + # https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=648761
395 + use alpha && append-ldflags "-Wl,--no-relax"
396 +
397 + # ld segfaults on ia64 with LDFLAGS --as-needed, bug #555504
398 + use ia64 && append-ldflags "-Wl,--no-as-needed"
399 +
400 + # Sigbuses on SPARC with mcpu and co., bug #???
401 + use sparc && filter-flags "-mvis"
402 +
403 + # https://bugs.webkit.org/show_bug.cgi?id=42070 , #301634
404 + use ppc64 && append-flags "-mminimal-toc"
405 +
406 + # Try to use less memory, bug #469942 (see Fedora .spec for reference)
407 + # --no-keep-memory doesn't work on ia64, bug #502492
408 + if ! use ia64; then
409 + append-ldflags "-Wl,--no-keep-memory"
410 + fi
411 +
412 + # We try to use gold when possible for this package
413 +# if ! tc-ld-is-gold ; then
414 +# append-ldflags "-Wl,--reduce-memory-overheads"
415 +# fi
416 +
417 + # older glibc needs this for INTPTR_MAX, bug #533976
418 + if has_version "<sys-libs/glibc-2.18" ; then
419 + append-cppflags "-D__STDC_LIMIT_MACROS"
420 + fi
421 +
422 + # Multiple rendering bugs on youtube, github, etc without this, bug #547224
423 + append-flags $(test-flags -fno-strict-aliasing)
424 +
425 + local ruby_interpreter=""
426 +
427 + if has_version "virtual/rubygems[ruby_targets_ruby24]"; then
428 + ruby_interpreter="-DRUBY_EXECUTABLE=$(type -P ruby24)"
429 + elif has_version "virtual/rubygems[ruby_targets_ruby23]"; then
430 + ruby_interpreter="-DRUBY_EXECUTABLE=$(type -P ruby23)"
431 + elif has_version "virtual/rubygems[ruby_targets_ruby22]"; then
432 + ruby_interpreter="-DRUBY_EXECUTABLE=$(type -P ruby22)"
433 + else
434 + ruby_interpreter="-DRUBY_EXECUTABLE=$(type -P ruby21)"
435 + fi
436 +
437 + # TODO: Check Web Audio support
438 + # should somehow let user select between them?
439 + #
440 + # FTL_JIT requires llvm
441 + #
442 + # opengl needs to be explicetly handled, bug #576634
443 +
444 + local opengl_enabled
445 + if use opengl || use gles2; then
446 + opengl_enabled=ON
447 + else
448 + opengl_enabled=OFF
449 + fi
450 +
451 + # support for webgl (aka 2d-canvas accelerating)
452 + local canvas_enabled
453 + if use webgl && ! use gles2 ; then
454 + canvas_enabled=ON
455 + else
456 + canvas_enabled=OFF
457 + fi
458 +
459 + local mycmakeargs=(
460 + -DENABLE_QUARTZ_TARGET=$(usex aqua)
461 + -DENABLE_API_TESTS=$(usex test)
462 + -DENABLE_GTKDOC=$(usex doc)
463 + -DENABLE_GEOLOCATION=$(usex geolocation)
464 + $(cmake-utils_use_find_package gles2 OpenGLES2)
465 + -DENABLE_GLES2=$(usex gles2)
466 + -DENABLE_CREDENTIAL_STORAGE=$(usex gnome-keyring)
467 + -DENABLE_VIDEO=$(usex gstreamer)
468 + -DENABLE_WEB_AUDIO=$(usex gstreamer)
469 + -DENABLE_INTROSPECTION=$(usex introspection)
470 + -DENABLE_JIT=$(usex jit)
471 + -DUSE_LIBNOTIFY=$(usex libnotify)
472 + -DENABLE_PLUGIN_PROCESS_GTK2=$(usex nsplugin)
473 + -DENABLE_SPELLCHECK=$(usex spell)
474 + -DENABLE_WAYLAND_TARGET=$(usex wayland)
475 + -DENABLE_WEBGL=$(usex webgl)
476 + $(cmake-utils_use_find_package egl EGL)
477 + $(cmake-utils_use_find_package opengl OpenGL)
478 + -DENABLE_X11_TARGET=$(usex X)
479 + -DENABLE_OPENGL=${opengl_enabled}
480 + -DENABLE_ACCELERATED_2D_CANVAS=${canvas_enabled}
481 + -DCMAKE_BUILD_TYPE=Release
482 + -DPORT=GTK
483 + ${ruby_interpreter}
484 + )
485 +
486 + # Allow it to use GOLD when possible as it has all the magic to
487 + # detect when to use it and using gold for this concrete package has
488 + # multiple advantages and is also the upstream default, bug #585788
489 +# if tc-ld-is-gold ; then
490 +# mycmakeargs+=( -DUSE_LD_GOLD=ON )
491 +# else
492 +# mycmakeargs+=( -DUSE_LD_GOLD=OFF )
493 +# fi
494 +
495 + cmake-utils_src_configure
496 +}
497 +
498 +src_compile() {
499 + cmake-utils_src_compile
500 +}
501 +
502 +src_test() {
503 + # Prevents test failures on PaX systems
504 + use jit && pax-mark m $(list-paxables Programs/*[Tt]ests/*) # Programs/unittests/.libs/test*
505 +
506 + cmake-utils_src_test
507 +}
508 +
509 +src_install() {
510 + cmake-utils_src_install
511 +
512 + # Prevents crashes on PaX systems, bug #522808
513 + use jit && pax-mark m "${ED}usr/bin/jsc" "${ED}usr/libexec/webkit2gtk-4.0/WebKitWebProcess"
514 + pax-mark m "${ED}usr/libexec/webkit2gtk-4.0/WebKitPluginProcess"
515 + use nsplugin && pax-mark m "${ED}usr/libexec/webkit2gtk-4.0/WebKitPluginProcess"2
516 +}
Report Message
Find on MARC Find on Google Groups