<pre style='margin:0'>
Chih-Hsuan Yen (yan12125) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/1be5ae51f2a2c1d061d3c05718c3559324c03f9c">https://github.com/macports/macports-ports/commit/1be5ae51f2a2c1d061d3c05718c3559324c03f9c</a></p>
<pre style="white-space: pre; background: #F8F8F8">The following commit(s) were added to refs/heads/master by this push:
<span style='display:block; white-space:pre;color:#404040;'> new 1be5ae5 webkit2-gtk: update to 2.20.3
</span>1be5ae5 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 1be5ae51f2a2c1d061d3c05718c3559324c03f9c
</span>Author: Yen Chi Hsuan <yan12125@gmail.com>
AuthorDate: Wed Sep 27 23:51:14 2017 +0800
<span style='display:block; white-space:pre;color:#404040;'> webkit2-gtk: update to 2.20.3
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Notable changes:
</span><span style='display:block; white-space:pre;color:#404040;'> * Source/WebKit2 is renamed to Source/WebKit [1]
</span><span style='display:block; white-space:pre;color:#404040;'> * DatabaseProcess is renamed to StorageProcess [2]
</span><span style='display:block; white-space:pre;color:#404040;'> * testb3 is now enabled in developer mode only [3]
</span><span style='display:block; white-space:pre;color:#404040;'> * PR-157554.patch is superseded by patch-WTF-wtf-Randomdevice.diff
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> There are also patches for 2.18.0 during this upgrade [4]. Some of them
</span><span style='display:block; white-space:pre;color:#404040;'> are not necessary as of 2.20.3. Specificially,
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> * patch-disable-mach-exceptions.diff: no longer needed after [5]
</span><span style='display:block; white-space:pre;color:#404040;'> * patch-fix-include-path.diff: no longer needed after [6]
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> See also: https://trac.macports.org/ticket/55278
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> [skip ci]
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> [1] https://github.com/WebKit/webkit/commit/7f8a4a6dab6e75a624a97e5ce47de5626476b67d
</span><span style='display:block; white-space:pre;color:#404040;'> [2] https://bugs.webkit.org/show_bug.cgi?id=174879
</span><span style='display:block; white-space:pre;color:#404040;'> [3] https://github.com/WebKit/webkit/commit/e276ecde58923cb70dcfbc52544c6b81b661dac4
</span><span style='display:block; white-space:pre;color:#404040;'> [4] https://github.com/kencu/myports/tree/master/www/webkit2-gtk/files
</span><span style='display:block; white-space:pre;color:#404040;'> [5] https://github.com/WebKit/webkit/commit/ebd290d9fba427a15c6fd8227e022fbc72cc8765
</span><span style='display:block; white-space:pre;color:#404040;'> [6] https://github.com/WebKit/webkit/commit/1f8841aad73175256656a31d7d43fff1e069ba73
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Co-authored-by: Ken Cunningham <kencu@macports.org>
</span>---
www/webkit2-gtk/Portfile | 72 ++++++++-----
www/webkit2-gtk/files/PR-152650-2.patch | 12 +--
www/webkit2-gtk/files/PR-157554.patch | 33 ------
www/webkit2-gtk/files/PR-157574.patch | 2 +-
.../files/patch-WTF-wtf-Randomdevice.diff | 115 +++++++++++++++++++++
.../files/patch-Webcore-page-crypto.diff | 22 ++++
.../files/patch-bundle-link-webcore.diff | 11 ++
.../patch-enable-plugin-architecture-unix.diff | 16 +++
www/webkit2-gtk/files/patch-name-conflicts.diff | 46 +++++++++
www/webkit2-gtk/files/patch-ramsize.diff | 93 +++++++++++++++++
10 files changed, 356 insertions(+), 66 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/www/webkit2-gtk/Portfile b/www/webkit2-gtk/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 4e07297..a7da1ed 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/www/webkit2-gtk/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/www/webkit2-gtk/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -12,8 +12,7 @@ PortGroup cxx11 1.1
</span>
name webkit2-gtk
conflicts webkit2-gtk-devel
<span style='display:block; white-space:pre;background:#ffe0e0;'>-version 2.14.2
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 2
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+version 2.20.3
</span> description Apple's WebKit2 HTML rendering library for GTK+3 (with optional support for GTK+2 plugins)
long_description ${description}
maintainers {jeremyhu @jeremyhu} {devans @dbevans}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -28,8 +27,9 @@ distname webkitgtk-${version}
</span>
dist_subdir webkit-gtk
<span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums rmd160 3fea1696539ba305367e36af803ce1a934b99b0d \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 2edbcbd5105046aea55af9671c4de8deedb5b0e3567c618034d440a760675556
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums rmd160 6bc2c007fe00f696c6014d72137280835c117765 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 579b307d78fa16a73f112790178022166d7ad17d4147492ced9b9fba48f20dd8 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 16623456
</span>
# don't overwrite build dependencies provided by cmake portgroup
depends_build-append \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -66,17 +66,28 @@ depends_lib port:atk \
</span> port:libxslt \
port:sqlite3 \
port:webp \
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:woff2 \
</span> port:zlib
# PR-152650-2.patch: WIP to re-enable gtk-doc support
# PR-153138.patch: https://bugs.webkit.org/show_bug.cgi?id=153138
<span style='display:block; white-space:pre;background:#ffe0e0;'>-# PR-157554.patch: https://bugs.webkit.org/show_bug.cgi?id=157554
</span> # PR-157574.patch: https://bugs.webkit.org/show_bug.cgi?id=157574
<span style='display:block; white-space:pre;background:#e0ffe0;'>+# patch-name-conflicts.diff: avoid conflicts between Style in /usr/include/MacTypes.h
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# and WebCore::Style
</span> patchfiles-append \
PR-152650-2.patch \
PR-153138.patch \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- PR-157554.patch \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- PR-157574.patch
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ PR-157574.patch \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patch-bundle-link-webcore.diff \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patch-enable-plugin-architecture-unix.diff \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patch-name-conflicts.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# Source/WTF/wtf/RAMSize.cpp has changed, and the Darwin parts were
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# stripped out. Replace it with the previous version
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+patchfiles-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patch-ramsize.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span>
# Build out-of-tree
configure.post_args ../${worksrcdir}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -112,27 +123,24 @@ pre-configure {
</span> post-configure {
# https://bugs.webkit.org/show_bug.cgi?id=153176
reinplace {s|\.\./\.\./lib/libWTFGTK\.a||} \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- ${build.dir}/Source/WebKit2/CMakeFiles/WebKit2.dir/link.txt
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- reinplace {s|\.\./\.\./lib/libbmalloc\.a||} \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ${build.dir}/Source/JavaScriptCore/CMakeFiles/JavaScriptCore.dir/link.txt
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${build.dir}/Source/WebKit/CMakeFiles/WebKit.dir/link.txt
</span> reinplace {s|[\./]*\.\./lib/lib[^\.]*\.a||g} \
${build.dir}/Source/JavaScriptCore/CMakeFiles/LLIntOffsetsExtractor.dir/link.txt \
${build.dir}/Source/JavaScriptCore/shell/CMakeFiles/jsc.dir/link.txt \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- ${build.dir}/Source/JavaScriptCore/shell/CMakeFiles/testb3.dir/link.txt \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ${build.dir}/Source/WebKit2/CMakeFiles/DatabaseProcess.dir/link.txt \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ${build.dir}/Source/WebKit2/CMakeFiles/NetworkProcess.dir/link.txt \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ${build.dir}/Source/WebKit2/CMakeFiles/webkit2gtkinjectedbundle.dir/link.txt \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ${build.dir}/Source/WebKit2/CMakeFiles/WebProcess.dir/link.txt
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${build.dir}/Source/WebKit/CMakeFiles/StorageProcess.dir/link.txt \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${build.dir}/Source/WebKit/CMakeFiles/NetworkProcess.dir/link.txt \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${build.dir}/Source/WebKit/CMakeFiles/webkit2gtkinjectedbundle.dir/link.txt \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${build.dir}/Source/WebKit/CMakeFiles/WebProcess.dir/link.txt
</span> if {[variant_isset x11]} {
# ENABLE_PLUGIN_PROCESS is only enabled with +x11
reinplace {s|[\./]*\.\./lib/lib[^\.]*\.a||g} \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- ${build.dir}/Source/WebKit2/CMakeFiles/PluginProcess.dir/link.txt
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${build.dir}/Source/WebKit/CMakeFiles/PluginProcess.dir/link.txt
</span>
if {[variant_isset gtk2]} {
reinplace {s|\.\./\.\./lib/libWTFGTK\.a||} \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- ${build.dir}/Source/WebKit2/CMakeFiles/WebKitPluginProcess2.dir/link.txt
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${build.dir}/Source/WebKit/CMakeFiles/WebKitPluginProcess2.dir/link.txt
</span> reinplace {s|-Wl,-all_load||g} \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- ${build.dir}/Source/WebKit2/CMakeFiles/WebKitPluginProcess2.dir/link.txt
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${build.dir}/Source/WebKit/CMakeFiles/WebKitPluginProcess2.dir/link.txt
</span> }
}
if {[variant_isset minibrowser]} {
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -149,20 +157,32 @@ post-configure {
</span> configure.cflags-append -ftemplate-depth=256
configure.cxxflags-append -ftemplate-depth=256
<span style='display:block; white-space:pre;background:#ffe0e0;'>-# fix build with clang on newer systems
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# https://trac.macports.org/ticket/54798
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-if {${os.platform} eq "darwin" && ${os.major} > 13} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.cxxflags-append -std=c++14
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> if {![variant_isset quartz]} {
default_variants-append +x11 +gtk2
}
# fix build on older systems
<span style='display:block; white-space:pre;background:#ffe0e0;'>-if {${os.platform} eq "darwin" && ${os.major} < 13} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+if {${os.platform} eq "darwin" && ${os.major} <= 13} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # disable Apple internal security libraries, available only on new systems
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patchfiles-append patch-Webcore-page-crypto.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # gl cocoa build continues to fail due to use of API not available on darwin 12 or earlier
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # so gstreamergl is not available at present for darwin 12 or earlier
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.args-append -DUSE_GSTREAMER_GL=OFF
</span>
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ # ENABLE_SUBTLE_CRYPTO used to be off by default, but now is on by default
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # there are > 100 instances of #if ENABLE(SUBTLE_CRYPTO)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # fails up to darwin 13
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.args-append -DENABLE_SUBTLE_CRYPTO=OFF
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # the darwin build uses security features that were Apple internal only, but
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # the unix version does not, and seems to build OK so use that
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # the ifdefs were too cumbersome to sort out, so for now I just stripped those out and left
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # the unix build behind - FIXME: sort the ifdefs out
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # https://bugs.webkit.org/show_bug.cgi?id=157554
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patchfiles-append patch-WTF-wtf-Randomdevice.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> # add dep for newer ruby and spec this for build
# https://trac.macports.org/ticket/52016
depends_build-append port:ruby24
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/www/webkit2-gtk/files/PR-152650-2.patch b/www/webkit2-gtk/files/PR-152650-2.patch
</span><span style='display:block; white-space:pre;color:#808080;'>index d93b416..e134b97 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/www/webkit2-gtk/files/PR-152650-2.patch
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/www/webkit2-gtk/files/PR-152650-2.patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -38,22 +38,22 @@ index 6b01f1a..b443d10 100644
</span> - set(ENABLE_GTKDOC OFF)
-endif ()
-
<span style='display:block; white-space:pre;background:#ffe0e0;'>- set(DERIVED_SOURCES_GOBJECT_DOM_BINDINGS_DIR ${DERIVED_SOURCES_DIR}/webkitdom)
</span> set(DERIVED_SOURCES_WEBKITGTK_DIR ${DERIVED_SOURCES_DIR}/webkitgtk)
set(DERIVED_SOURCES_WEBKITGTK_API_DIR ${DERIVED_SOURCES_WEBKITGTK_DIR}/webkit)
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ set(DERIVED_SOURCES_WEBKIT2GTK_DIR ${DERIVED_SOURCES_DIR}/webkit2gtk)
</span> diff --git a/Tools/gtk/gtkdoc.py b/Tools/gtk/gtkdoc.py
index 4c8237b..a628ae0 100644
--- Tools/gtk/gtkdoc.py
+++ Tools/gtk/gtkdoc.py
@@ -322,6 +322,11 @@ class GTKDoc(object):
<span style='display:block; white-space:pre;background:#ffe0e0;'>- env['RUN'] = 'LD_LIBRARY_PATH="%s:%s" ' % (self.library_path, current_ld_library_path)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ env['LD_LIBRARY_PATH'] = '%s:%s' % (self.library_path, current_ld_library_path)
</span> else:
<span style='display:block; white-space:pre;background:#ffe0e0;'>- env['RUN'] = 'LD_LIBRARY_PATH="%s" ' % self.library_path
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ env['LD_LIBRARY_PATH'] = self.library_path
</span> + current_dyld_library_path = env.get('DYLD_LIBRARY_PATH')
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+ if current_ld_library_path:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ env['RUN'] = 'DYLD_LIBRARY_PATH="%s:%s" ' % (self.library_path, current_dyld_library_path)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ if current_dyld_library_path:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ env['DYLD_LIBRARY_PATH'] = '%s:%s' % (self.library_path, current_dyld_library_path)
</span> + else:
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+ env['RUN'] = 'DYLD_LIBRARY_PATH="%s" ' % self.library_path
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ env['DYLD_LIBRARY_PATH'] = self.library_path
</span>
if ldflags:
env['LDFLAGS'] = '%s %s' % (ldflags, env.get('LDFLAGS', ''))
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/www/webkit2-gtk/files/PR-157554.patch b/www/webkit2-gtk/files/PR-157554.patch
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 24f0e98..0000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/www/webkit2-gtk/files/PR-157554.patch
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,33 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-https://bugs.webkit.org/show_bug.cgi?id=157554
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- Source/WTF/wtf/OSRandomSource.cpp
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ Source/WTF/wtf/OSRandomSource.cpp
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -29,7 +29,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include <stdint.h>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include <stdlib.h>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--#if !OS(DARWIN) && OS(UNIX)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#if OS(UNIX) && !(OS(DARWIN) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 1070)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include <errno.h>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include <fcntl.h>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include <unistd.h>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -46,7 +46,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- namespace WTF {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--#if !OS(DARWIN) && OS(UNIX)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#if OS(UNIX) && !(OS(DARWIN) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 1070)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- NEVER_INLINE NO_RETURN_DUE_TO_CRASH static void crashUnableToOpenURandom()
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- CRASH();
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -60,8 +56,8 @@ NEVER_INLINE NO_RETURN_DUE_TO_CRASH static void crashUnableToReadFromURandom()
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- void cryptographicallyRandomValuesFromOS(unsigned char* buffer, size_t length)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--#if OS(DARWIN)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- RELEASE_ASSERT(!CCRandomCopyBytes(kCCRandomDefault, buffer, length));
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#if OS(DARWIN) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 1070
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ return arc4random_buf(buffer, length);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #elif OS(UNIX)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- int fd = open("/dev/urandom", O_RDONLY, 0);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if (fd < 0)
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/www/webkit2-gtk/files/PR-157574.patch b/www/webkit2-gtk/files/PR-157574.patch
</span><span style='display:block; white-space:pre;color:#808080;'>index 3b07d7d..0945b98 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/www/webkit2-gtk/files/PR-157574.patch
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/www/webkit2-gtk/files/PR-157574.patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -45,7 +45,7 @@ index ab53183..1310dec 100644
</span> -#define AVAILABLE_MAC_OS_X_VERSION_10_10_AND_LATER
-#endif
-
<span style='display:block; white-space:pre;background:#ffe0e0;'>--#endif /* __MAC_OS_X_VERSION_MIN_REQUIRED <= 101100 */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#endif /* !TARGET_OS_IPHONE && __MAC_OS_X_VERSION_MIN_REQUIRED < 101100 */
</span> -
-#if defined(BUILDING_GTK__)
#undef CF_AVAILABLE
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/www/webkit2-gtk/files/patch-WTF-wtf-Randomdevice.diff b/www/webkit2-gtk/files/patch-WTF-wtf-Randomdevice.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 0000000..07092e8
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/www/webkit2-gtk/files/patch-WTF-wtf-Randomdevice.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,115 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git Source/WTF/wtf/RandomDevice.cpp Source/WTF/wtf/RandomDevice.cpp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 61d6057..90fa30c 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- Source/WTF/wtf/RandomDevice.cpp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ Source/WTF/wtf/RandomDevice.cpp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -30,24 +30,12 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <stdint.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <stdlib.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#if !OS(DARWIN) && OS(UNIX)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <errno.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <fcntl.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <unistd.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#if OS(WINDOWS)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#include <windows.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#include <wincrypt.h> // windows.h must be included before wincrypt.h.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#if OS(DARWIN)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#include "CommonCryptoSPI.h"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ namespace WTF {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#if !OS(DARWIN) && OS(UNIX)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ NEVER_INLINE NO_RETURN_DUE_TO_CRASH static void crashUnableToOpenURandom()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ CRASH();
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -57,9 +45,7 @@ NEVER_INLINE NO_RETURN_DUE_TO_CRASH static void crashUnableToReadFromURandom()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ CRASH();
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#if !OS(DARWIN) && !OS(WINDOWS)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ RandomDevice::RandomDevice()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ int ret = 0;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -70,22 +56,16 @@ RandomDevice::RandomDevice()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (m_fd < 0)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ crashUnableToOpenURandom(); // We need /dev/urandom for this API to work...
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#if !OS(DARWIN) && !OS(WINDOWS)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ RandomDevice::~RandomDevice()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ close(m_fd);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ // FIXME: Make this call fast by creating the pool in RandomDevice.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ // https://bugs.webkit.org/show_bug.cgi?id=170190
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ void RandomDevice::cryptographicallyRandomValues(unsigned char* buffer, size_t length)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#if OS(DARWIN)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- RELEASE_ASSERT(!CCRandomCopyBytes(kCCRandomDefault, buffer, length));
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#elif OS(UNIX)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ssize_t amountRead = 0;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ while (static_cast<size_t>(amountRead) < length) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ssize_t currentRead = read(m_fd, buffer + amountRead, length - amountRead);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -97,20 +77,6 @@ void RandomDevice::cryptographicallyRandomValues(unsigned char* buffer, size_t l
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ } else
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ amountRead += currentRead;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#elif OS(WINDOWS)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- // FIXME: We cannot ensure that Cryptographic Service Provider context and CryptGenRandom are safe across threads.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- // If it is safe, we can acquire context per RandomDevice.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- HCRYPTPROV hCryptProv = 0;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- if (!CryptAcquireContext(&hCryptProv, 0, MS_DEF_PROV, PROV_RSA_FULL, CRYPT_VERIFYCONTEXT))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- CRASH();
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- if (!CryptGenRandom(hCryptProv, length, buffer))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- CRASH();
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- CryptReleaseContext(hCryptProv, 0);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#else
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#error "This configuration doesn't have a strong source of randomness."
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-// WARNING: When adding new sources of OS randomness, the randomness must
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-// be of cryptographic quality!
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git Source/WTF/wtf/RandomDevice.h Source/WTF/wtf/RandomDevice.h
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 86636c9..410ccd0 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- Source/WTF/wtf/RandomDevice.h
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ Source/WTF/wtf/RandomDevice.h
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -34,12 +34,8 @@ namespace WTF {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ class RandomDevice {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ WTF_MAKE_NONCOPYABLE(RandomDevice);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ public:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#if OS(DARWIN) || OS(WINDOWS)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- RandomDevice() = default;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#else
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ RandomDevice();
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ~RandomDevice();
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ // This function attempts to fill buffer with randomness from the operating
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ // system. Rather than calling this function directly, consider calling
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -47,14 +43,7 @@ public:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ void cryptographicallyRandomValues(unsigned char* buffer, size_t length);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ private:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#if OS(DARWIN) || OS(WINDOWS)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#elif OS(UNIX)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ int m_fd { -1 };
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#else
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#error "This configuration doesn't have a strong source of randomness."
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-// WARNING: When adding new sources of OS randomness, the randomness must
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-// be of cryptographic quality!
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ };
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/www/webkit2-gtk/files/patch-Webcore-page-crypto.diff b/www/webkit2-gtk/files/patch-Webcore-page-crypto.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 0000000..4ef3260
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/www/webkit2-gtk/files/patch-Webcore-page-crypto.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,22 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git Source/WebCore/page/Crypto.cpp Source/WebCore/page/Crypto.cpp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index ed1278b..f94db1b 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- Source/WebCore/page/Crypto.cpp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ Source/WebCore/page/Crypto.cpp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -31,7 +31,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include "config.h"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include "Crypto.h"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#if OS(DARWIN)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#if OS(DARWIN) && (__MAC_OS_X_VERSION_MIN_REQUIRED > 1090)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include "CommonCryptoUtilities.h"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include "Document.h"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -60,7 +60,7 @@ ExceptionOr<void> Crypto::getRandomValues(ArrayBufferView& array)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return Exception { TypeMismatchError };
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (array.byteLength() > 65536)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return Exception { QuotaExceededError };
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#if OS(DARWIN)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#if OS(DARWIN) && (__MAC_OS_X_VERSION_MIN_REQUIRED > 1090)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ int rc = CCRandomCopyBytes(kCCRandomDefault, array.baseAddress(), array.byteLength());
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ RELEASE_ASSERT(rc == kCCSuccess);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #else
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/www/webkit2-gtk/files/patch-bundle-link-webcore.diff b/www/webkit2-gtk/files/patch-bundle-link-webcore.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 0000000..39c2fb3
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/www/webkit2-gtk/files/patch-bundle-link-webcore.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,11 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- Source/WebKit/PlatformGTK.cmake.orig 2017-09-29 02:02:31.000000000 +0800
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ Source/WebKit/PlatformGTK.cmake 2017-09-29 02:02:53.000000000 +0800
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1092,7 +1092,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ add_library(webkit2gtkinjectedbundle MODULE "${WEBKIT_DIR}/WebProcess/InjectedBundle/API/glib/WebKitInjectedBundleMain.cpp")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ADD_WEBKIT_PREFIX_HEADER(webkit2gtkinjectedbundle)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-target_link_libraries(webkit2gtkinjectedbundle WebKit)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++target_link_libraries(webkit2gtkinjectedbundle WebKit WebCore)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ target_include_directories(webkit2gtkinjectedbundle PRIVATE
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${WebKit_INCLUDE_DIRECTORIES}
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/www/webkit2-gtk/files/patch-enable-plugin-architecture-unix.diff b/www/webkit2-gtk/files/patch-enable-plugin-architecture-unix.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 0000000..c4b01c0
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/www/webkit2-gtk/files/patch-enable-plugin-architecture-unix.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,16 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- Source/WebKit/config.h.orig 2018-06-13 23:57:05.000000000 +0800
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ Source/WebKit/config.h 2018-06-13 23:59:35.000000000 +0800
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -55,10 +55,10 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #ifndef PLUGIN_ARCHITECTURE_UNSUPPORTED
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#if PLATFORM(MAC)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#define PLUGIN_ARCHITECTURE_MAC 1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#elif PLATFORM(GTK) && OS(UNIX) && !OS(MAC_OS_X)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#if PLATFORM(GTK) && OS(UNIX)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #define PLUGIN_ARCHITECTURE_UNIX 1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#elif PLATFORM(MAC)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#define PLUGIN_ARCHITECTURE_MAC 1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #else
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #define PLUGIN_ARCHITECTURE_UNSUPPORTED 1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #endif
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/www/webkit2-gtk/files/patch-name-conflicts.diff b/www/webkit2-gtk/files/patch-name-conflicts.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 0000000..f633e69
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/www/webkit2-gtk/files/patch-name-conflicts.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,46 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- Source/WebCore/page/SecurityOriginData.cpp.orig 2018-06-13 14:43:40.000000000 +0800
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ Source/WebCore/page/SecurityOriginData.cpp 2018-06-13 14:37:12.000000000 +0800
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -33,8 +33,6 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <wtf/text/CString.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <wtf/text/StringBuilder.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-using namespace WebCore;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ namespace WebCore {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ SecurityOriginData SecurityOriginData::fromSecurityOrigin(const SecurityOrigin& securityOrigin)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- Source/WebCore/page/TextIndicator.cpp.orig 2018-06-13 21:38:47.000000000 +0800
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ Source/WebCore/page/TextIndicator.cpp 2018-06-13 21:39:03.000000000 +0800
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -50,8 +50,6 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include "SelectionRect.h"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-using namespace WebCore;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ namespace WebCore {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ static bool initializeIndicator(TextIndicatorData&, Frame&, const Range&, FloatSize margin, bool indicatesCurrentSelection);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- Source/WebKit/WebProcess/InjectedBundle/API/gtk/DOM/GObjectEventListener.cpp.orig 2018-06-13 23:03:53.000000000 +0800
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ Source/WebKit/WebProcess/InjectedBundle/API/gtk/DOM/GObjectEventListener.cpp 2018-06-13 23:17:03.000000000 +0800
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -25,7 +25,9 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <WebCore/Event.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <wtf/HashMap.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-using namespace WebCore;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++using WebCore::Event;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++using WebCore::EventTarget;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++using WebCore::ScriptExecutionContext;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ namespace WebKit {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- Source/WebKit/WebProcess/InjectedBundle/API/gtk/DOM/GObjectNodeFilterCondition.cpp.orig 2018-06-13 23:18:03.000000000 +0800
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ Source/WebKit/WebProcess/InjectedBundle/API/gtk/DOM/GObjectNodeFilterCondition.cpp 2018-06-13 23:29:20.000000000 +0800
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -22,7 +22,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include "WebKitDOMNodePrivate.h"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <WebCore/NodeFilter.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-using namespace WebCore;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++using WebCore::Node;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ namespace WebKit {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/www/webkit2-gtk/files/patch-ramsize.diff b/www/webkit2-gtk/files/patch-ramsize.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 0000000..c4ba98d
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/www/webkit2-gtk/files/patch-ramsize.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,93 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git Source/WTF/wtf/RAMSize.cpp Source/WTF/wtf/RAMSize.cpp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 5d34d3b..3dd516c 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- Source/WTF/wtf/RAMSize.cpp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ Source/WTF/wtf/RAMSize.cpp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -29,41 +29,61 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include "StdLibExtras.h"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <mutex>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#if OS(WINDOWS)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#if OS(DARWIN)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#import <dispatch/dispatch.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#import <mach/host_info.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#import <mach/mach.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#import <mach/mach_error.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#import <math.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#elif OS(UNIX)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#include <unistd.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#elif OS(WINDOWS)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <windows.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#elif defined(USE_SYSTEM_MALLOC) && USE_SYSTEM_MALLOC
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#if OS(UNIX)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#include <sys/sysinfo.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#endif // OS(UNIX)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#else
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#include <bmalloc/bmalloc.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ namespace WTF {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#if OS(WINDOWS)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ static const size_t ramSizeGuess = 512 * MB;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ static size_t computeRAMSize()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#if OS(WINDOWS)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#if PLATFORM(IOS_SIMULATOR)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ // Pretend we have 512MB of memory to make cache sizes behave like on device.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ return ramSizeGuess;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#elif OS(DARWIN)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ host_basic_info_data_t hostInfo;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ mach_port_t host = mach_host_self();
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ mach_msg_type_number_t count = HOST_BASIC_INFO_COUNT;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ kern_return_t r = host_info(host, HOST_BASIC_INFO, (host_info_t)&hostInfo, &count);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ mach_port_deallocate(mach_task_self(), host);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ if (r != KERN_SUCCESS) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ LOG_ERROR("%s : host_info(%d) : %s.\n", __FUNCTION__, r, mach_error_string(r));
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ return ramSizeGuess;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ if (hostInfo.max_mem > std::numeric_limits<size_t>::max())
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ return std::numeric_limits<size_t>::max();
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ size_t sizeAccordingToKernel = static_cast<size_t>(hostInfo.max_mem);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ size_t multiple = 128 * MB;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ // Round up the memory size to a multiple of 128MB because max_mem may not be exactly 512MB
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ // (for example) and we have code that depends on those boundaries.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ return ((sizeAccordingToKernel + multiple - 1) / multiple) * multiple;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#elif OS(UNIX)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ long pages = sysconf(_SC_PHYS_PAGES);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ long pageSize = sysconf(_SC_PAGE_SIZE);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ if (pages == -1 || pageSize == -1)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ return ramSizeGuess;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ return pages * pageSize;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#elif OS(WINDOWS)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ MEMORYSTATUSEX status;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ status.dwLength = sizeof(status);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ bool result = GlobalMemoryStatusEx(&status);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (!result)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return ramSizeGuess;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return status.ullTotalPhys;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#elif defined(USE_SYSTEM_MALLOC) && USE_SYSTEM_MALLOC
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#if OS(UNIX)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- struct sysinfo si;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- sysinfo(&si);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- return si.totalram * si.mem_unit;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#else
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#error "Missing a platform specific way of determining the available RAM"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#endif // OS(UNIX)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#else
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- return bmalloc::api::availableMemory();
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -77,4 +97,4 @@ size_t ramSize()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return ramSize;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-} // namespace WTF
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++} // namespace WTF
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+\ No newline at end of file
</span></pre><pre style='margin:0'>
</pre>