<pre style='margin:0'>
Ken (kencu) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/4334cbee9b695a40bde1766826eadba250a2ce16">https://github.com/macports/macports-ports/commit/4334cbee9b695a40bde1766826eadba250a2ce16</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 4334cbe webkit2-gtk: bump to 2.26.1
</span>4334cbe is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 4334cbee9b695a40bde1766826eadba250a2ce16
</span>Author: Ken Cunningham <kencu@macports.org>
AuthorDate: Sun Oct 20 16:18:11 2019 -0700
<span style='display:block; white-space:pre;color:#404040;'> webkit2-gtk: bump to 2.26.1
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> adjust patches
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> gtk2 support is now gone
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> moved all the older systems support into one block
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> prefer bmalloc for best security, but use
</span><span style='display:block; white-space:pre;color:#404040;'> SYSTEM_MALLOC on older systems as bmalloc does not build
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> switch to Ninja for much faster builds
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> the previous stripping of the static libraries
</span><span style='display:block; white-space:pre;color:#404040;'> no longer appears to be necessary as the build
</span><span style='display:block; white-space:pre;color:#404040;'> has changed to accomodate the previous issue.
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> remove the template depth limit
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> no longer seems needed, builds fine without this
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> switch to enchant2
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> make the minibrowser a default variant
</span><span style='display:block; white-space:pre;color:#404040;'> it's super-useful
</span>---
www/webkit2-gtk/Portfile | 248 +++++++++------------
www/webkit2-gtk/files/WebKit-icu-65.1-fix.patch | 62 ++++++
.../files/patch-WTF-wtf-Randomdevice.diff | 112 ++++------
...TF-wtf-spi-darwin-ProcessMemoryFootprint-h.diff | 13 ++
.../files/patch-Webcore-page-crypto.diff | 14 +-
www/webkit2-gtk/files/patch-ramsize.diff | 78 +++----
...ch-snowleopard-cmakelists-stdcformatmacros.diff | 3 +-
...atch-snowleopard-npruntime-redefine-cursor.diff | 17 --
...ource-wtf-wtf-osallocatorposix-cpp-map-jit.diff | 16 ++
...nix-cputimeunix-cpp-darwin-version-restore.diff | 79 +++++++
.../files/patch-webkit2gtk-macports.diff | 192 ++++++++++++++++
.../files/{ => unused}/PR-152650-2.patch | 0
www/webkit2-gtk/files/{ => unused}/PR-153138.patch | 0
www/webkit2-gtk/files/{ => unused}/PR-157574.patch | 33 +--
.../files/{ => unused}/patch-name-conflicts.diff | 11 +
.../{ => unused}/patch_bad_optional_access.diff | 0
16 files changed, 562 insertions(+), 316 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 dbfbd99..1be9fce 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;'>@@ -6,15 +6,17 @@
</span>
PortSystem 1.0
PortGroup active_variants 1.1
<span style='display:block; white-space:pre;background:#ffe0e0;'>-PortGroup cmake 1.0
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-PortGroup compiler_blacklist_versions 1.0
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-PortGroup cxx11 1.1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+PortGroup cmake 1.1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+compiler.cxx_standard 2017
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+cmake.generator Ninja
</span>
name webkit2-gtk
conflicts webkit2-gtk-devel
<span style='display:block; white-space:pre;background:#ffe0e0;'>-version 2.20.5
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 2
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-description Apple's WebKit2 HTML rendering library for GTK+3 (with optional support for GTK+2 plugins)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+version 2.26.1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+description Apple's WebKit2 HTML rendering library for GTK+3
</span> long_description ${description}
maintainers {devans @dbevans}
categories www gnome
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -28,11 +30,10 @@ distname webkitgtk-${version}
</span>
dist_subdir webkit-gtk
<span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums rmd160 6a4cda986d2a4c4762b0daf0ff2007cd95b72b79 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 15c0f8d26e9605afe0948d161ba5fd82efee8eda2debd409fd40a440ac3af990 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 16625200
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums rmd160 c5634e5a457a4eccc631043b9d7a61448f64278e \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 6b4b21801d2b1008422a1075dbd6fb4ae8b5127503faf657cf9671289d9cd155 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 19327444
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-# don't overwrite build dependencies provided by cmake portgroup
</span> depends_build-append \
port:gperf \
port:gtk-doc \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -40,14 +41,14 @@ depends_build-append \
</span> port:python27 \
port:py27-simplejson
<span style='display:block; white-space:pre;background:#ffe0e0;'>-depends_lib port:atk \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+depends_lib-append port:atk \
</span> port:at-spi2-atk \
port:bison \
path:lib/pkgconfig/cairo.pc:cairo \
port:flex \
port:fontconfig \
port:freetype \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- port:enchant \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:enchant2 \
</span> port:geoclue2 \
path:lib/pkgconfig/glib-2.0.pc:glib2 \
port:gobject-introspection \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -70,51 +71,35 @@ depends_lib port:atk \
</span> port:woff2 \
port:zlib
<span style='display:block; white-space:pre;background:#ffe0e0;'>-# PR-152650-2.patch: WIP to re-enable gtk-doc support
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# PR-153138.patch: https://bugs.webkit.org/show_bug.cgi?id=153138
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# PR-157574.patch: https://bugs.webkit.org/show_bug.cgi?id=157574
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# patch-name-conflicts.diff: avoid conflicts between Style in /usr/include/MacTypes.h
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# and WebCore::Style
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-patchfiles-append \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- PR-152650-2.patch \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- PR-153138.patch \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- PR-157574.patch \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- patch-bundle-link-webcore.diff \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- patch-enable-plugin-architecture-unix.diff \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- patch-name-conflicts.diff \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- patch_bad_optional_access.diff
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# Source/WTF/wtf/RAMSize.cpp has changed, and the Darwin parts were
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# stripped out. Replace it with the previous version
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-patchfiles-append \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- patch-ramsize.diff
</span>
<span style='display:block; white-space:pre;background:#e0ffe0;'>+# 1. add missing JavaScriptCore include directory used only on Apple webkit builds
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# 2. don't copy the ICU includes into the source tree
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# 3. add missing WebCore include directory used only on Apple webkit builds
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# 4. add a missing Apple-only header found in the WebKit project
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# 5. change some int64_t to gint64 to stop typedef errors in gstreamer
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+patchfiles-append patch-webkit2gtk-macports.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# enable Netscape plugin architecture on macOS
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# or can be explicitly disabled with the following addition if preferred
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# configure.args-append -DENABLE_NETSCAPE_PLUGIN_API=OFF
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+patchfiles-append patch-enable-plugin-architecture-unix.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# add a link library to WebCore. I am not sure this is still needed; builds and
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# runs without this patch.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+patchfiles-append patch-bundle-link-webcore.diff
</span>
<span style='display:block; white-space:pre;background:#e0ffe0;'>+# https://gitlab.gnome.org/GNOME/jhbuild/commit/e8b48870602c3a8e474e54cf1c6151b98651aae9
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+patchfiles-append WebKit-icu-65.1-fix.patch
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-# Build out-of-tree
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-configure.post_args ../${worksrcdir}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-default configure.dir {${workpath}/build}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-default build.dir {${workpath}/build}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# it is preferred to use the WebKit built in bmalloc if it builds on a given os.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# it has improved security features, but not all systems can build it at present.
</span>
configure.args-append \
-DPORT=GTK \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- -DUSE_SYSTEM_MALLOC=ON \
</span> -DENABLE_INTROSPECTION=ON \
-DENABLE_MINIBROWSER=OFF \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- -DENABLE_PLUGIN_PROCESS_GTK2=OFF \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- -DENABLE_VIDEO=ON
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# TODO: File a bug about this not working
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-configure.args-append -DENABLE_GTKDOC=OFF
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# <rdar://problem/24031030>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-configure.optflags -Os
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# clang 3.4, 503.0.35, and 600.0.57 (error: call to 'make_unique' is ambiguous, error: call to 'exchange' is ambiguous)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# compiler.blacklist-append {clang < 602} macports-clang-3.4
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# clang 3.3 (error: no type named 'make_index_sequence' in namespace 'std')
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-compiler.fallback-append macports-clang-5.0
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-compiler.blacklist-append {clang < 602} macports-clang-3.4 macports-clang-3.3
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DENABLE_VIDEO=ON \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DUSE_SYSTEM_MALLOC=OFF
</span>
pre-configure {
if {![variant_isset quartz] && ![variant_isset x11]} {
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -122,137 +107,108 @@ pre-configure {
</span> }
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-post-configure {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # https://bugs.webkit.org/show_bug.cgi?id=153176
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- reinplace {s|\.\./\.\./lib/libWTFGTK\.a||} \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ${build.dir}/Source/WebKit/CMakeFiles/WebKit.dir/link.txt
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- reinplace {s|[\./]*\.\./lib/lib[^\.]*\.a||g} \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ${build.dir}/Source/JavaScriptCore/CMakeFiles/LLIntOffsetsExtractor.dir/link.txt \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ${build.dir}/Source/JavaScriptCore/shell/CMakeFiles/jsc.dir/link.txt \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ${build.dir}/Source/WebKit/CMakeFiles/StorageProcess.dir/link.txt \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ${build.dir}/Source/WebKit/CMakeFiles/NetworkProcess.dir/link.txt \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ${build.dir}/Source/WebKit/CMakeFiles/webkit2gtkinjectedbundle.dir/link.txt \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ${build.dir}/Source/WebKit/CMakeFiles/WebProcess.dir/link.txt
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if {[variant_isset x11]} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # ENABLE_PLUGIN_PROCESS is only enabled with +x11
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- reinplace {s|[\./]*\.\./lib/lib[^\.]*\.a||g} \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ${build.dir}/Source/WebKit/CMakeFiles/PluginProcess.dir/link.txt
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if {[variant_isset gtk2]} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- reinplace {s|\.\./\.\./lib/libWTFGTK\.a||} \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ${build.dir}/Source/WebKit/CMakeFiles/WebKitPluginProcess2.dir/link.txt
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- reinplace {s|-Wl,-all_load||g} \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ${build.dir}/Source/WebKit/CMakeFiles/WebKitPluginProcess2.dir/link.txt
</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;'>- if {[variant_isset minibrowser]} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- reinplace {s|[\./]*\.\./lib/lib[^\.]*\.a||g} \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ${build.dir}/Tools/MiniBrowser/gtk/CMakeFiles/MiniBrowser.dir/link.txt
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+if {![variant_isset quartz]} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ default_variants-append +x11
</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;'>+# this is nice to have, and should be the default
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+default_variants-append +minibrowser
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+variant quartz conflicts x11 {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ require_active_variants port:gtk3 quartz
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.args-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DENABLE_QUARTZ_TARGET=ON \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DENABLE_X11_TARGET=OFF \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DENABLE_OPENGL=OFF
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# OPENGL does not work with +quartz, eg: https://trac.macports.org/ticket/52495
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# OPENGL must be explicitly turned off, otherwise GLX is found, but X11 is not, and:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# CMake Error at Source/cmake/OptionsGTK.cmake:280 (message):
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# Either GLX or EGL is needed for ENABLE_OPENGL.
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>- # https://bugs.webkit.org/show_bug.cgi?id=153192
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- reinplace {s|\.\./\.\./lib/libWTFGTK\.a|-Wl,-all_load ../../lib/libWTFGTK.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:#ffe0e0;'>-# https://trac.macports.org/ticket/41560#comment:2
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-configure.cflags-append -ftemplate-depth=256
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-configure.cxxflags-append -ftemplate-depth=256
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+variant x11 conflicts quartz {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ require_active_variants port:gtk3 x11
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-if {![variant_isset quartz]} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- default_variants-append +x11 +gtk2
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.args-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DENABLE_QUARTZ_TARGET=OFF \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DENABLE_X11_TARGET=ON \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DENABLE_OPENGL=ON
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_lib-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:mesa \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:xorg-libXt
</span> }
<span style='display:block; white-space:pre;background:#ffe0e0;'>-# fix build with +quartz variant
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# see https://trac.macports.org/ticket/56724
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# TO DO: is there a more elegant fix ?
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-if {[variant_isset quartz]} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.args-append -DUSE_GSTREAMER_GL=OFF
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+variant minibrowser description {Build and install MiniBrowser (for testing)} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.args-delete -DENABLE_MINIBROWSER=OFF
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.args-append -DENABLE_MINIBROWSER=ON
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_run-append port:adwaita-icon-theme
</span> }
# fix build on older systems
if {${os.platform} eq "darwin" && ${os.major} <= 13} {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- # disable Apple internal security libraries, available only on new systems
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- patchfiles-append patch-Webcore-page-crypto.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # the only compiler I know that works here is macports-clang-5.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # macports-clang-9.0 does not work. There may be others in between that work.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # to be discovered as time allows. Input appreciated from interested parties.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ compiler.whitelist macports-clang-5.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # on older systems (to?), Webkit's bmalloc implementation does not build so patch tweaked
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # TO DO: test and enable bmalloc on all systems that can build it
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.args-replace -DUSE_SYSTEM_MALLOC=OFF -DUSE_SYSTEM_MALLOC=ON
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patchfiles-append patch-ramsize.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Source/WTF/wtf/unix/CPUTimeUnix.cpp : add back the previous Darwin compat version
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patchfiles-append patch-source-wtf-wtf-unix-cputimeunix-cpp-darwin-version-restore.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # some Darwin versions don't have MAP_JIT; only use it if available
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patchfiles-append patch-source-wtf-wtf-osallocatorposix-cpp-map-jit.diff
</span>
# gl cocoa build continues to fail due to use of API not available on darwin 12 or earlier
# so gstreamergl is not available at present for darwin 12 or earlier
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ # todo clarify further where this is exactly needed
</span> configure.args-append -DUSE_GSTREAMER_GL=OFF
<span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # ENABLE_SUBTLE_CRYPTO used to be off by default, but now is on by default
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # there are > 100 instances of #if ENABLE(SUBTLE_CRYPTO)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # fails up to darwin 13
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.args-append -DENABLE_SUBTLE_CRYPTO=OFF
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # the darwin build uses security features that were Apple internal only, but
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # the unix version does not, and seems to build OK so use that
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # 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:#ffe0e0;'>- # the unix build behind - FIXME: sort the ifdefs out
</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;'>+ # restrict special process memory kernel calls to 10.9+ that support them
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patchfiles-append patch-WTF-wtf-spi-darwin-ProcessMemoryFootprint-h.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # ENABLE_WEB_CRYPTO previously failed up to darwin 13
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # TO DO: restest this and see if still needed
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.args-append -DENABLE_WEB_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 are Apple internal only, but
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # the unix version does not
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # FIXME: sort the ifdefs out
</span> # https://bugs.webkit.org/show_bug.cgi?id=157554
<span style='display:block; white-space:pre;background:#ffe0e0;'>- patchfiles-append patch-WTF-wtf-Randomdevice.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patchfiles-append patch-WTF-wtf-Randomdevice.diff
</span>
# add dep for newer ruby and spec this for build
# https://trac.macports.org/ticket/52016
<span style='display:block; white-space:pre;background:#ffe0e0;'>- depends_build-append port:ruby24
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.args-append -DRUBY_EXECUTABLE=${prefix}/bin/ruby2.4
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if { ${os.major} < 11 } {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # disabling JIT fixes the following build error on 10.6.8
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # offlineasm: No magic values found. Skipping assembly file generation.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.args-append -DENABLE_JIT=OFF
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_build-append port:ruby25
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.args-append -DRUBY_EXECUTABLE=${prefix}/bin/ruby2.5
</span>
# fix missing PRId64 definitions on systems
# that don't define __STDC_FORMAT_MACROS by default
# https://bugs.webkit.org/show_bug.cgi?id=156596
# https://trac.macports.org/ticket/52016
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ # also added defn for TARGET_OS_IOS to avoid innumerable warnings
</span> patchfiles-append patch-snowleopard-cmakelists-stdcformatmacros.diff
# special case: fix build on 10.6 with macports-libstdc++
# contents of snowmath.h should someday become part of gcc6 cmath
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ # TODO: remove this?
</span> if { ${configure.cxx_stdlib} eq "macports-libstdc++" && ${os.major} < 11 } {
configure.cxxflags-append -D_GLIBCXX_USE_C99_MATH_TR1=1
configure.cxxflags-append -include ${filespath}/snowmath.h
}
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-variant quartz conflicts x11 gtk2 {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- require_active_variants port:gtk3 quartz
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.args-append \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- -DENABLE_QUARTZ_TARGET=ON \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- -DENABLE_X11_TARGET=OFF \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- -DENABLE_OPENGL=OFF \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- -DENABLE_GRAPHICS_CONTEXT_3D=OFF
</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;'>-variant x11 conflicts quartz {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- require_active_variants port:gtk3 x11
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.args-append \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- -DENABLE_QUARTZ_TARGET=OFF \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- -DENABLE_X11_TARGET=ON \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- -DENABLE_OPENGL=ON
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- depends_lib-append \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:mesa \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:xorg-libXt
</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;'>-variant minibrowser description {Build and install MiniBrowser (for testing)} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.args-delete -DENABLE_MINIBROWSER=OFF
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.args-append -DENABLE_MINIBROWSER=ON
</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;'>-variant gtk2 conflicts quartz description {Enable support for GTK+2 plugins} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- require_active_variants port:gtk2 x11
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- depends_lib-append port:gtk2
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.args-delete -DENABLE_PLUGIN_PROCESS_GTK2=OFF
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.args-append -DENABLE_PLUGIN_PROCESS_GTK2=ON
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> livecheck.type regex
livecheck.url http://webkitgtk.org/releases/
livecheck.regex "webkitgtk-(\\d+\\.\\d*\[02468\](?:\\.\\d+)*)"
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/www/webkit2-gtk/files/WebKit-icu-65.1-fix.patch b/www/webkit2-gtk/files/WebKit-icu-65.1-fix.patch
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 0000000..4bab12d
</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/WebKit-icu-65.1-fix.patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,62 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+------------------------------------------------------------------------
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+r250747 | commit-queue@webkit.org | 2019-10-05 05:51:37 +0800 (六, 05 10月 2019) | 16 lines
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Fix build with icu 65.1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+https://bugs.webkit.org/show_bug.cgi?id=202600
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Patch by Heiko Becker <heirecka@exherbo.org> on 2019-10-04
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Reviewed by Konstantin Tokarev.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Source/WebCore:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+* dom/Document.cpp:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+(WebCore::isValidNameNonASCII):
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+(WebCore::Document::parseQualifiedName):
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Source/WTF:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+* wtf/URLHelpers.cpp:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+(WTF::URLHelpers::allCharactersInIDNScriptWhiteList):
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Index: Source/WTF/wtf/URLHelpers.cpp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+===================================================================
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- Source/WTF/wtf/URLHelpers.cpp (revision 250746)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ Source/WTF/wtf/URLHelpers.cpp (revision 250747)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -301,7 +301,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ Optional<UChar32> previousCodePoint;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ while (i < length) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ UChar32 c;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- U16_NEXT(buffer, i, length, c)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ U16_NEXT(buffer, i, length, c);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ UErrorCode error = U_ZERO_ERROR;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ UScriptCode script = uscript_getScript(c, &error);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (error != U_ZERO_ERROR) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Index: Source/WebCore/dom/Document.cpp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+===================================================================
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- Source/WebCore/dom/Document.cpp (revision 250746)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ Source/WebCore/dom/Document.cpp (revision 250747)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -4954,12 +4954,12 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ unsigned i = 0;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ UChar32 c;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- U16_NEXT(characters, i, length, c)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ U16_NEXT(characters, i, length, c);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (!isValidNameStart(c))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return false;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ while (i < length) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- U16_NEXT(characters, i, length, c)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ U16_NEXT(characters, i, length, c);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (!isValidNamePart(c))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return false;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -5019,7 +5019,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ for (unsigned i = 0; i < length; ) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ UChar32 c;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- U16_NEXT(qualifiedName, i, length, c)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ U16_NEXT(qualifiedName, i, length, c);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (c == ':') {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (sawColon)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return Exception { InvalidCharacterError };
</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-WTF-wtf-Randomdevice.diff b/www/webkit2-gtk/files/patch-WTF-wtf-Randomdevice.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index 07092e8..bfd2ee9 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/www/webkit2-gtk/files/patch-WTF-wtf-Randomdevice.diff
</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;'>@@ -1,115 +1,87 @@
</span> diff --git Source/WTF/wtf/RandomDevice.cpp Source/WTF/wtf/RandomDevice.cpp
<span style='display:block; white-space:pre;background:#ffe0e0;'>-index 61d6057..90fa30c 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 89165f03..99251674 100644
</span> --- Source/WTF/wtf/RandomDevice.cpp
+++ Source/WTF/wtf/RandomDevice.cpp
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -30,24 +30,12 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -30,7 +30,7 @@
</span> #include <stdint.h>
#include <stdlib.h>
<span style='display:block; white-space:pre;background:#ffe0e0;'>--#if !OS(DARWIN) && OS(UNIX)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#if !OS(DARWIN) && !OS(FUCHSIA) && OS(UNIX)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#if (1)
</span> #include <errno.h>
#include <fcntl.h>
#include <unistd.h>
<span style='display:block; white-space:pre;background:#ffe0e0;'>--#endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--#if OS(WINDOWS)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--#include <windows.h>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--#include <wincrypt.h> // windows.h must be included before wincrypt.h.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--#endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -41,7 +41,7 @@
</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> -#if OS(DARWIN)
<span style='display:block; white-space:pre;background:#ffe0e0;'>--#include "CommonCryptoSPI.h"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--#endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#if (0)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <CommonCrypto/CommonCryptoError.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <CommonCrypto/CommonRandom.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -52,7 +52,7 @@
</span>
namespace WTF {
<span style='display:block; white-space:pre;background:#ffe0e0;'>--#if !OS(DARWIN) && OS(UNIX)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#if !OS(DARWIN) && !OS(FUCHSIA) && OS(UNIX)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#if (1)
</span> NEVER_INLINE NO_RETURN_DUE_TO_CRASH static void crashUnableToOpenURandom()
{
CRASH();
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -57,9 +45,7 @@ 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;'>- CRASH();
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -64,7 +64,7 @@ NEVER_INLINE NO_RETURN_DUE_TO_CRASH static void crashUnableToReadFromURandom()
</span> }
<span style='display:block; white-space:pre;background:#ffe0e0;'>--#endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #endif
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>--#if !OS(DARWIN) && !OS(WINDOWS)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#if !OS(DARWIN) && !OS(FUCHSIA) && !OS(WINDOWS)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#if (1)
</span> RandomDevice::RandomDevice()
{
int ret = 0;
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -70,22 +56,16 @@ RandomDevice::RandomDevice()
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if (m_fd < 0)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- crashUnableToOpenURandom(); // We need /dev/urandom for this API to work...
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -77,7 +77,7 @@ RandomDevice::RandomDevice()
</span> }
<span style='display:block; white-space:pre;background:#ffe0e0;'>--#endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #endif
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>--#if !OS(DARWIN) && !OS(WINDOWS)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#if !OS(DARWIN) && !OS(FUCHSIA) && !OS(WINDOWS)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#if (1)
</span> RandomDevice::~RandomDevice()
{
close(m_fd);
<span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--#endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- // FIXME: Make this call fast by creating the pool in RandomDevice.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -88,11 +88,11 @@ RandomDevice::~RandomDevice()
</span> // https://bugs.webkit.org/show_bug.cgi?id=170190
void RandomDevice::cryptographicallyRandomValues(unsigned char* buffer, size_t length)
{
-#if OS(DARWIN)
<span style='display:block; white-space:pre;background:#ffe0e0;'>-- RELEASE_ASSERT(!CCRandomCopyBytes(kCCRandomDefault, buffer, length));
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#if (0)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ RELEASE_ASSERT(!CCRandomGenerateBytes(buffer, length));
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #elif OS(FUCHSIA)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ zx_cprng_draw(buffer, length);
</span> -#elif OS(UNIX)
<span style='display:block; white-space:pre;background:#e0ffe0;'>++#elif (1)
</span> ssize_t amountRead = 0;
while (static_cast<size_t>(amountRead) < length) {
ssize_t currentRead = read(m_fd, buffer + amountRead, length - amountRead);
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -97,20 +77,6 @@ void RandomDevice::cryptographicallyRandomValues(unsigned char* buffer, size_t l
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- } else
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- amountRead += currentRead;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--#elif OS(WINDOWS)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- // FIXME: We cannot ensure that Cryptographic Service Provider context and CryptGenRandom are safe across threads.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- // If it is safe, we can acquire context per RandomDevice.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- HCRYPTPROV hCryptProv = 0;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- if (!CryptAcquireContext(&hCryptProv, 0, MS_DEF_PROV, PROV_RSA_FULL, CRYPT_VERIFYCONTEXT))
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- CRASH();
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- if (!CryptGenRandom(hCryptProv, length, buffer))
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- CRASH();
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- CryptReleaseContext(hCryptProv, 0);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--#else
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--#error "This configuration doesn't have a strong source of randomness."
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--// WARNING: When adding new sources of OS randomness, the randomness must
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--// be of cryptographic quality!
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--#endif
</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> diff --git Source/WTF/wtf/RandomDevice.h Source/WTF/wtf/RandomDevice.h
<span style='display:block; white-space:pre;background:#ffe0e0;'>-index 86636c9..410ccd0 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 411bde3e..9c9c6da8 100644
</span> --- Source/WTF/wtf/RandomDevice.h
+++ Source/WTF/wtf/RandomDevice.h
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -34,12 +34,8 @@ namespace WTF {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- class RandomDevice {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -35,7 +35,7 @@ class RandomDevice {
</span> WTF_MAKE_NONCOPYABLE(RandomDevice);
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ WTF_MAKE_FAST_ALLOCATED;
</span> public:
<span style='display:block; white-space:pre;background:#ffe0e0;'>--#if OS(DARWIN) || OS(WINDOWS)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- RandomDevice() = default;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--#else
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#if OS(DARWIN) || OS(FUCHSIA) || OS(WINDOWS)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#if (0)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ RandomDevice() = default;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #else
</span> RandomDevice();
<span style='display:block; white-space:pre;background:#ffe0e0;'>- ~RandomDevice();
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--#endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- // This function attempts to fill buffer with randomness from the operating
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- // system. Rather than calling this function directly, consider calling
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -47,14 +43,7 @@ public:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -48,8 +48,8 @@ public:
</span> void cryptographicallyRandomValues(unsigned char* buffer, size_t length);
private:
<span style='display:block; white-space:pre;background:#ffe0e0;'>--#if OS(DARWIN) || OS(WINDOWS)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#if OS(DARWIN) || OS(FUCHSIA) || OS(WINDOWS)
</span> -#elif OS(UNIX)
<span style='display:block; white-space:pre;background:#e0ffe0;'>++#if (0)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#elif (1)
</span> int m_fd { -1 };
<span style='display:block; white-space:pre;background:#ffe0e0;'>--#else
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--#error "This configuration doesn't have a strong source of randomness."
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--// WARNING: When adding new sources of OS randomness, the randomness must
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--// be of cryptographic quality!
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--#endif
</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><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;color:#808080;'>diff --git a/www/webkit2-gtk/files/patch-WTF-wtf-spi-darwin-ProcessMemoryFootprint-h.diff b/www/webkit2-gtk/files/patch-WTF-wtf-spi-darwin-ProcessMemoryFootprint-h.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 0000000..fef61cc
</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-spi-darwin-ProcessMemoryFootprint-h.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,13 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git Source/WTF/wtf/spi/darwin/ProcessMemoryFootprint.h Source/WTF/wtf/spi/darwin/ProcessMemoryFootprint.h
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 90852df6..525ace42 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- Source/WTF/wtf/spi/darwin/ProcessMemoryFootprint.h
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ Source/WTF/wtf/spi/darwin/ProcessMemoryFootprint.h
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -27,7 +27,7 @@
</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;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#if !PLATFORM(IOS_FAMILY_SIMULATOR) && __has_include(<libproc.h>)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#if !PLATFORM(IOS_FAMILY_SIMULATOR) && __has_include(<libproc.h>) && (__MAC_OS_X_VERSION_MIN_REQUIRED >= 1090)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # include <libproc.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # if RUSAGE_INFO_CURRENT >= 4
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # define HAS_MAX_FOOTPRINT
</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><span style='display:block; white-space:pre;color:#808080;'>index 4ef3260..eaf2901 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/www/webkit2-gtk/files/patch-Webcore-page-crypto.diff
</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;'>@@ -1,22 +1,22 @@
</span> diff --git Source/WebCore/page/Crypto.cpp Source/WebCore/page/Crypto.cpp
<span style='display:block; white-space:pre;background:#ffe0e0;'>-index ed1278b..f94db1b 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 69c36e97..07969aad 100644
</span> --- Source/WebCore/page/Crypto.cpp
+++ Source/WebCore/page/Crypto.cpp
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -31,7 +31,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include "config.h"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include "Crypto.h"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -36,7 +36,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <JavaScriptCore/ArrayBufferView.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <wtf/CryptographicallyRandomNumber.h>
</span>
-#if OS(DARWIN)
+#if OS(DARWIN) && (__MAC_OS_X_VERSION_MIN_REQUIRED > 1090)
#include "CommonCryptoUtilities.h"
#endif
<span style='display:block; white-space:pre;background:#ffe0e0;'>- #include "Document.h"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -60,7 +60,7 @@ ExceptionOr<void> Crypto::getRandomValues(ArrayBufferView& array)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -58,7 +58,7 @@ ExceptionOr<void> Crypto::getRandomValues(ArrayBufferView& array)
</span> return Exception { TypeMismatchError };
if (array.byteLength() > 65536)
return Exception { QuotaExceededError };
-#if OS(DARWIN)
+#if OS(DARWIN) && (__MAC_OS_X_VERSION_MIN_REQUIRED > 1090)
<span style='display:block; white-space:pre;background:#ffe0e0;'>- int rc = CCRandomCopyBytes(kCCRandomDefault, array.baseAddress(), array.byteLength());
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ auto rc = CCRandomGenerateBytes(array.baseAddress(), array.byteLength());
</span> RELEASE_ASSERT(rc == kCCSuccess);
#else
<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><span style='display:block; white-space:pre;color:#808080;'>index c4ba98d..f1bc41b 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/www/webkit2-gtk/files/patch-ramsize.diff
</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;'>@@ -1,43 +1,35 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git Source/WTF/wtf/RAMSize.cpp Source/WTF/wtf/RAMSize.cpp
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-index 5d34d3b..3dd516c 100644
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- Source/WTF/wtf/RAMSize.cpp
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ Source/WTF/wtf/RAMSize.cpp
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -29,41 +29,61 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include "StdLibExtras.h"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- Source/WTF/wtf/RAMSize.cpp.orig 2019-10-14 22:59:02.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ Source/WTF/wtf/RAMSize.cpp 2019-10-14 23:02:19.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -29,6 +29,15 @@
</span> #include <mutex>
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <wtf/StdLibExtras.h>
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>--#if OS(WINDOWS)
</span> +#if OS(DARWIN)
+#import <dispatch/dispatch.h>
+#import <mach/host_info.h>
+#import <mach/mach.h>
+#import <mach/mach_error.h>
+#import <math.h>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+#elif OS(UNIX)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#include <unistd.h>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#elif 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;'>++#else
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #if OS(WINDOWS)
</span> #include <windows.h>
<span style='display:block; white-space:pre;background:#ffe0e0;'>--#elif defined(USE_SYSTEM_MALLOC) && USE_SYSTEM_MALLOC
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--#if OS(UNIX)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--#include <sys/sysinfo.h>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--#endif // OS(UNIX)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--#else
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--#include <bmalloc/bmalloc.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;'>+@@ -39,6 +47,8 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <bmalloc/bmalloc.h>
</span> #endif
<span style='display:block; white-space:pre;background:#e0ffe0;'>++#endif //OS(DARWIN)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span> namespace WTF {
<span style='display:block; white-space:pre;background:#ffe0e0;'>--#if OS(WINDOWS)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- static const size_t ramSizeGuess = 512 * MB;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--#endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #if OS(WINDOWS)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -47,6 +57,29 @@
</span>
static size_t computeRAMSize()
{
<span style='display:block; white-space:pre;background:#ffe0e0;'>--#if OS(WINDOWS)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#if PLATFORM(IOS_SIMULATOR)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ // Pretend we have 512MB of memory to make cache sizes behave like on device.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ return ramSizeGuess;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#elif OS(DARWIN)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#if OS(DARWIN)
</span> + host_basic_info_data_t hostInfo;
+
+ mach_port_t host = mach_host_self();
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -58,36 +50,18 @@ index 5d34d3b..3dd516c 100644
</span> + // Round up the memory size to a multiple of 128MB because max_mem may not be exactly 512MB
+ // (for example) and we have code that depends on those boundaries.
+ return ((sizeAccordingToKernel + multiple - 1) / multiple) * multiple;
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+#elif OS(UNIX)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ long pages = sysconf(_SC_PHYS_PAGES);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ long pageSize = sysconf(_SC_PAGE_SIZE);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ if (pages == -1 || pageSize == -1)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ return ramSizeGuess;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ return pages * pageSize;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#elif OS(WINDOWS)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#else
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #if OS(WINDOWS)
</span> MEMORYSTATUSEX status;
status.dwLength = sizeof(status);
<span style='display:block; white-space:pre;background:#ffe0e0;'>- bool result = GlobalMemoryStatusEx(&status);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if (!result)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- return ramSizeGuess;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- return status.ullTotalPhys;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--#elif defined(USE_SYSTEM_MALLOC) && USE_SYSTEM_MALLOC
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--#if OS(UNIX)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- struct sysinfo si;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- sysinfo(&si);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- return si.totalram * si.mem_unit;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--#else
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--#error "Missing a platform specific way of determining the available RAM"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--#endif // OS(UNIX)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--#else
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- return bmalloc::api::availableMemory();
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -65,6 +98,9 @@
</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> #endif
<span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#endif //OS(DARWIN)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span> }
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -77,4 +97,4 @@ size_t ramSize()
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- return ramSize;
</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;'>--} // namespace WTF
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+} // namespace WTF
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-\ No newline at end of file
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size_t ramSize()
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/www/webkit2-gtk/files/patch-snowleopard-cmakelists-stdcformatmacros.diff b/www/webkit2-gtk/files/patch-snowleopard-cmakelists-stdcformatmacros.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index 0130a2b..9b45bf3 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/www/webkit2-gtk/files/patch-snowleopard-cmakelists-stdcformatmacros.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/www/webkit2-gtk/files/patch-snowleopard-cmakelists-stdcformatmacros.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,10 +1,11 @@
</span> --- CMakeLists.txt.orig 2017-08-14 17:41:03.000000000 -0700
+++ CMakeLists.txt 2017-08-14 17:43:39.000000000 -0700
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -18,6 +18,8 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -18,6 +18,9 @@
</span> set(ENABLE_TOOLS ON)
endif ()
+add_definitions(-D__STDC_FORMAT_MACROS)
<span style='display:block; white-space:pre;background:#e0ffe0;'>++add_definitions(-DTARGET_OS_IOS=0)
</span> +
# -----------------------------------------------------------------------------
# Determine which port will be built
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/www/webkit2-gtk/files/patch-snowleopard-npruntime-redefine-cursor.diff b/www/webkit2-gtk/files/patch-snowleopard-npruntime-redefine-cursor.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 5a62ef0..0000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/www/webkit2-gtk/files/patch-snowleopard-npruntime-redefine-cursor.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,17 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- Source/WebCore/bridge/npruntime_internal.h.orig 2017-08-14 21:56:11.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ Source/WebCore/bridge/npruntime_internal.h 2017-08-14 21:57:40.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -30,8 +30,14 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include "npruntime.h"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #if defined(MOZ_X11)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ #define Cursor QD_Cursor
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include <X11/Xresource.h>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+// should there be...?
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+// #undef Cursor
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #undef None
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #undef Above
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #undef Below
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/www/webkit2-gtk/files/patch-source-wtf-wtf-osallocatorposix-cpp-map-jit.diff b/www/webkit2-gtk/files/patch-source-wtf-wtf-osallocatorposix-cpp-map-jit.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 0000000..f5970bc
</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-source-wtf-wtf-osallocatorposix-cpp-map-jit.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;'>+diff --git Source/WTF/wtf/posix/OSAllocatorPosix.cpp Source/WTF/wtf/posix/OSAllocatorPosix.cpp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index a5eb8d44..051c439e 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- Source/WTF/wtf/posix/OSAllocatorPosix.cpp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ Source/WTF/wtf/posix/OSAllocatorPosix.cpp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -72,9 +72,11 @@ void* OSAllocator::reserveAndCommit(size_t bytes, Usage usage, bool writable, bo
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ int flags = MAP_PRIVATE | MAP_ANON;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #if OS(DARWIN)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#if defined(MAP_JIT)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (executable)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ flags |= MAP_JIT;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #endif
</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;'>+ int fd = usage;
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/www/webkit2-gtk/files/patch-source-wtf-wtf-unix-cputimeunix-cpp-darwin-version-restore.diff b/www/webkit2-gtk/files/patch-source-wtf-wtf-unix-cputimeunix-cpp-darwin-version-restore.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 0000000..47be932
</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-source-wtf-wtf-unix-cputimeunix-cpp-darwin-version-restore.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,79 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git Source/WTF/wtf/unix/CPUTimeUnix.cpp Source/WTF/wtf/unix/CPUTimeUnix.cpp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 27990893..fe279865 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- Source/WTF/wtf/unix/CPUTimeUnix.cpp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ Source/WTF/wtf/unix/CPUTimeUnix.cpp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -26,6 +26,68 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include "config.h"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include "CPUTime.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;'>++#import <mach/mach.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#import <mach/mach_time.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#import <mach/task.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#import <mach/task_info.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#import <mach/thread_info.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#import <sys/time.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#include <wtf/Optional.h>
</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;'>++static const int64_t microsecondsPerSecond = 1000000;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++static int64_t timeValueToMicroseconds(const time_value_t& value)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++{
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ int64_t result = value.seconds;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ result *= microsecondsPerSecond;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ result += value.microseconds;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ return result;
</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;'>++Optional<CPUTime> CPUTime::get()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++{
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ // Account for current threads.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ task_thread_times_info threadInfoData;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ mach_msg_type_number_t threadInfoCount = TASK_THREAD_TIMES_INFO_COUNT;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ kern_return_t result = task_info(mach_task_self(), TASK_THREAD_TIMES_INFO, reinterpret_cast<task_info_t>(&threadInfoData), &threadInfoCount);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ if (result != KERN_SUCCESS)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ return nullopt;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ int64_t userTime = timeValueToMicroseconds(threadInfoData.user_time);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ int64_t systemTime = timeValueToMicroseconds(threadInfoData.system_time);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ // Account for termined threads.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ task_basic_info taskInfoData;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ mach_msg_type_number_t taskInfoCount = TASK_BASIC_INFO_COUNT;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ result = task_info(mach_task_self(), TASK_BASIC_INFO, reinterpret_cast<task_info_t>(&taskInfoData), &taskInfoCount);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ if (result != KERN_SUCCESS)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ return nullopt;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ userTime += timeValueToMicroseconds(taskInfoData.user_time);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ systemTime += timeValueToMicroseconds(taskInfoData.system_time);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ return CPUTime { MonotonicTime::now(), Seconds::fromMicroseconds(userTime), Seconds::fromMicroseconds(systemTime) };
</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;'>++Seconds CPUTime::forCurrentThread()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++{
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ mach_msg_type_number_t infoCount = THREAD_BASIC_INFO_COUNT;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ thread_basic_info_data_t info;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ mach_port_t threadPort = mach_thread_self();
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ thread_info(threadPort, THREAD_BASIC_INFO, reinterpret_cast<thread_info_t>(&info), &infoCount);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ mach_port_deallocate(mach_task_self(), threadPort);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ return Seconds(info.user_time.seconds + info.system_time.seconds) + Seconds::fromMicroseconds(info.user_time.microseconds + info.system_time.microseconds);
</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;'>++#else //OS(DARWIN)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <sys/resource.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <sys/time.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <time.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -54,3 +114,4 @@ Seconds CPUTime::forCurrentThread()
</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;'>++#endif //OS(DARWIN)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+\ No newline at end of file
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/www/webkit2-gtk/files/patch-webkit2gtk-macports.diff b/www/webkit2-gtk/files/patch-webkit2gtk-macports.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 0000000..9ffaadb
</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-webkit2gtk-macports.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,192 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+commit 504d7c6714f59b27028a43949f0088f9c19b39d7
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Author: ken-cunningham-webuse <ken.cunningham.webuse@gmail.com>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Date: Sun Oct 13 16:03:12 2019 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ webkit2-gtk: patchset to enable build on MacPorts
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ presently Mojave against 10.14 SDK, building X11
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git Source/JavaScriptCore/shell/PlatformGTK.cmake Source/JavaScriptCore/shell/PlatformGTK.cmake
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index c4ac7c9a..cf2fc2d6 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- Source/JavaScriptCore/shell/PlatformGTK.cmake
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ Source/JavaScriptCore/shell/PlatformGTK.cmake
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1,3 +1,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ list(APPEND jsc_LIBRARIES
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${GLIB_LIBRARIES}
</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;'>++list(APPEND jsc_PRIVATE_INCLUDE_DIRECTORIES
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ ${WTF_DIR}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git Source/WTF/CMakeLists.txt Source/WTF/CMakeLists.txt
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 7c615c55..dd221b1a 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- Source/WTF/CMakeLists.txt
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ Source/WTF/CMakeLists.txt
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -6,6 +6,6 @@ add_subdirectory(wtf)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Apple builds have the ICU headers checked into ${WTF_DIR}/icu
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Copy them into ${ICU_INCLUDE_DIRS} so the build behaves like find_package was used
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-if (APPLE)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++if (DISABLEAPPLE)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ file(COPY ${WTF_DIR}/icu/unicode DESTINATION ${ICU_INCLUDE_DIRS})
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ endif ()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git Source/WebCore/CMakeLists.txt Source/WebCore/CMakeLists.txt
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index a5b62f40..440ef671 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- Source/WebCore/CMakeLists.txt
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ Source/WebCore/CMakeLists.txt
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -173,6 +173,10 @@ set(WebCore_SYSTEM_INCLUDE_DIRECTORIES
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${ZLIB_INCLUDE_DIRS}
</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;'>++list(APPEND WebCore_SYSTEM_INCLUDE_DIRECTORIES
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ ${PAL_DIR}
</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;'>+ set(WebCore_IDL_INCLUDES
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ css
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ dom
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git Source/WebCore/PAL/pal/spi/cocoa/CommonCryptoSPI.h Source/WebCore/PAL/pal/spi/cocoa/CommonCryptoSPI.h
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+new file mode 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 00000000..cf113819
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ Source/WebCore/PAL/pal/spi/cocoa/CommonCryptoSPI.h
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -0,0 +1,117 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++/*
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ * Copyright (C) 2013-2019 Apple Inc. All rights reserved.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ *
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ * Redistribution and use in source and binary forms, with or without
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ * modification, are permitted provided that the following conditions
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ * are met:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ * 1. Redistributions of source code must retain the above copyright
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ * notice, this list of conditions and the following disclaimer.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ * 2. Redistributions in binary form must reproduce the above copyright
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ * notice, this list of conditions and the following disclaimer in the
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ * documentation and/or other materials provided with the distribution.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ *
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ * THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS CONTRIBUTORS ``AS IS''
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR ITS CONTRIBUTORS
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ * THE POSSIBILITY OF SUCH DAMAGE.
</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;'>++#pragma once
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#if USE(APPLE_INTERNAL_SDK)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#include <CommonCrypto/CommonCryptorSPI.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#include <CommonCrypto/CommonDigestSPI.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#include <CommonCrypto/CommonECCryptor.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#include <CommonCrypto/CommonKeyDerivationSPI.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#include <CommonCrypto/CommonRSACryptor.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#include <CommonCrypto/CommonRSACryptorSPI.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#else
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#ifndef _CC_RSACRYPTOR_H_
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++enum {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ kCCDigestNone = 0,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ kCCDigestSHA1 = 8,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ kCCDigestSHA224 = 9,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ kCCDigestSHA256 = 10,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ kCCDigestSHA384 = 11,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ kCCDigestSHA512 = 12,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++};
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++typedef uint32_t CCDigestAlgorithm;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++enum {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ ccRSAKeyPublic = 0,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ ccRSAKeyPrivate = 1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++};
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++typedef uint32_t CCRSAKeyType;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++enum {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ ccPKCS1Padding = 1001,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ ccOAEPPadding = 1002,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ ccRSAPSSPadding = 1005
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++};
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++typedef uint32_t CCAsymmetricPadding;
</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;'>++typedef struct _CCRSACryptor *CCRSACryptorRef;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++extern "C" CCCryptorStatus CCRSACryptorEncrypt(CCRSACryptorRef publicKey, CCAsymmetricPadding padding, const void *plainText, size_t plainTextLen, void *cipherText, size_t *cipherTextLen, const void *tagData, size_t tagDataLen, CCDigestAlgorithm digestType);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++extern "C" CCCryptorStatus CCRSACryptorDecrypt(CCRSACryptorRef privateKey, CCAsymmetricPadding padding, const void *cipherText, size_t cipherTextLen, void *plainText, size_t *plainTextLen, const void *tagData, size_t tagDataLen, CCDigestAlgorithm digestType);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++extern "C" CCCryptorStatus CCRSACryptorSign(CCRSACryptorRef privateKey, CCAsymmetricPadding padding, const void *hashToSign, size_t hashSignLen, CCDigestAlgorithm digestType, size_t saltLen, void *signedData, size_t *signedDataLen);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++extern "C" CCCryptorStatus CCRSACryptorVerify(CCRSACryptorRef publicKey, CCAsymmetricPadding padding, const void *hash, size_t hashLen, CCDigestAlgorithm digestType, size_t saltLen, const void *signedData, size_t signedDataLen);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++extern "C" CCCryptorStatus CCRSACryptorGeneratePair(size_t keysize, uint32_t e, CCRSACryptorRef *publicKey, CCRSACryptorRef *privateKey);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++extern "C" CCRSACryptorRef CCRSACryptorGetPublicKeyFromPrivateKey(CCRSACryptorRef privkey);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++extern "C" void CCRSACryptorRelease(CCRSACryptorRef key);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++extern "C" CCCryptorStatus CCRSAGetKeyComponents(CCRSACryptorRef rsaKey, uint8_t *modulus, size_t *modulusLength, uint8_t *exponent, size_t *exponentLength, uint8_t *p, size_t *pLength, uint8_t *q, size_t *qLength);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++extern "C" CCRSAKeyType CCRSAGetKeyType(CCRSACryptorRef key);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++extern "C" CCCryptorStatus CCRSACryptorImport(const void *keyPackage, size_t keyPackageLen, CCRSACryptorRef *key);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++extern "C" CCCryptorStatus CCRSACryptorExport(CCRSACryptorRef key, void *out, size_t *outLen);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++extern "C" CCCryptorStatus CCRSAGetCRTComponentsSizes(CCRSACryptorRef rsaKey, size_t *dpSize, size_t *dqSize, size_t *qinvSize);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++extern "C" CCCryptorStatus CCRSAGetCRTComponents(CCRSACryptorRef rsaKey, void *dp, size_t dpSize, void *dq, size_t dqSize, void *qinv, size_t qinvSize);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#ifndef _CC_ECCRYPTOR_H_
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++enum {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ ccECKeyPublic = 0,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ ccECKeyPrivate = 1,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++};
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++typedef uint32_t CCECKeyType;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++enum {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ kCCImportKeyBinary = 0,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++};
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++typedef uint32_t CCECKeyExternalFormat;
</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;'>++typedef struct _CCECCryptor *CCECCryptorRef;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++extern "C" CCCryptorStatus CCECCryptorGeneratePair(size_t keysize, CCECCryptorRef *publicKey, CCECCryptorRef *privateKey);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++extern "C" void CCECCryptorRelease(CCECCryptorRef key);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++extern "C" CCCryptorStatus CCECCryptorImportKey(CCECKeyExternalFormat format, const void *keyPackage, size_t keyPackageLen, CCECKeyType keyType, CCECCryptorRef *key);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++extern "C" CCCryptorStatus CCECCryptorExportKey(CCECKeyExternalFormat format, void *keyPackage, size_t *keyPackageLen, CCECKeyType keyType, CCECCryptorRef key);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++extern "C" int CCECGetKeySize(CCECCryptorRef key);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++extern "C" CCCryptorStatus CCECCryptorCreateFromData(size_t keySize, uint8_t *qX, size_t qXLength, uint8_t *qY, size_t qYLength, CCECCryptorRef *ref);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++extern "C" CCCryptorStatus CCECCryptorGetKeyComponents(CCECCryptorRef ecKey, size_t *keySize, uint8_t *qX, size_t *qXLength, uint8_t *qY, size_t *qYLength, uint8_t *d, size_t *dLength);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++extern "C" CCCryptorStatus CCECCryptorComputeSharedSecret(CCECCryptorRef privateKey, CCECCryptorRef publicKey, void *out, size_t *outLen);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++extern "C" CCCryptorStatus CCECCryptorSignHash(CCECCryptorRef privateKey, const void *hashToSign, size_t hashSignLen, void *signedData, size_t *signedDataLen);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++extern "C" CCCryptorStatus CCECCryptorVerifyHash(CCECCryptorRef publicKey, const void *hash, size_t hashLen, const void *signedData, size_t signedDataLen, uint32_t *valid);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#ifndef CommonCrypto_CommonNistKeyDerivation_h
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++enum {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ kCCKDFAlgorithmHKDF = 6
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++};
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++typedef uint32_t CCKDFAlgorithm;
</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;'>++extern "C" CCStatus CCKeyDerivationHMac(CCKDFAlgorithm algorithm, CCDigestAlgorithm digest, unsigned rounds, const void *keyDerivationKey, size_t keyDerivationKeyLen, const void *label, size_t labelLen, const void *context, size_t contextLen, const void *iv, size_t ivLen, const void *salt, size_t saltLen, void *derivedKey, size_t derivedKeyLen);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++extern "C" CCCryptorStatus CCCryptorGCM(CCOperation op, CCAlgorithm alg, const void* key, size_t keyLength, const void* iv, size_t ivLen, const void* aData, size_t aDataLen, const void* dataIn, size_t dataInLength, void* dataOut, void* tag, size_t* tagLength);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++extern "C" CCCryptorStatus CCRSACryptorCreateFromData(CCRSAKeyType keyType, const uint8_t *modulus, size_t modulusLength, const uint8_t *exponent, size_t exponentLength, const uint8_t *p, size_t pLength, const uint8_t *q, size_t qLength, CCRSACryptorRef *ref);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#endif // !USE(APPLE_INTERNAL_SDK)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git Source/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamer.cpp Source/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamer.cpp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index ab37ee04..eb03d330 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- Source/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamer.cpp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ Source/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamer.cpp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -493,7 +493,7 @@ MediaTime MediaPlayerPrivateGStreamer::platformDuration() const
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (GST_STATE(m_pipeline.get()) < GST_STATE_PAUSED)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return MediaTime::invalidTime();
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- int64_t duration = 0;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ gint64 duration = 0;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (!gst_element_query_duration(m_pipeline.get(), GST_FORMAT_TIME, &duration) || !GST_CLOCK_TIME_IS_VALID(duration)) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ GST_DEBUG_OBJECT(pipeline(), "Time duration query failed for %s", m_url.string().utf8().data());
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return MediaTime::positiveInfiniteTime();
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1372,7 +1372,7 @@ void MediaPlayerPrivateGStreamer::handleMessage(GstMessage* message)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ GUniqueOutPtr<GstStructure> responseHeaders;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (gst_structure_get(structure, "response-headers", GST_TYPE_STRUCTURE, &responseHeaders.outPtr(), nullptr)) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ const char* contentLengthHeaderName = httpHeaderNameString(HTTPHeaderName::ContentLength).utf8().data();
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- uint64_t contentLength = 0;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ guint64 contentLength = 0;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (!gst_structure_get_uint64(responseHeaders.get(), contentLengthHeaderName, &contentLength)) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ // souphttpsrc sets a string for Content-Length, so
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ // handle it here, until we remove the webkit+ protocol
</span><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/unused/PR-152650-2.patch
</span>similarity index 100%
rename from www/webkit2-gtk/files/PR-152650-2.patch
rename to www/webkit2-gtk/files/unused/PR-152650-2.patch
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/www/webkit2-gtk/files/PR-153138.patch b/www/webkit2-gtk/files/unused/PR-153138.patch
</span>similarity index 100%
rename from www/webkit2-gtk/files/PR-153138.patch
rename to www/webkit2-gtk/files/unused/PR-153138.patch
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/www/webkit2-gtk/files/PR-157574.patch b/www/webkit2-gtk/files/unused/PR-157574.patch
</span>similarity index 72%
rename from www/webkit2-gtk/files/PR-157574.patch
rename to www/webkit2-gtk/files/unused/PR-157574.patch
<span style='display:block; white-space:pre;color:#808080;'>index 0945b98..d395c59 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/unused/PR-157574.patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,15 +1,12 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git a/Source/JavaScriptCore/API/WebKitAvailability.h b/Source/JavaScriptCore/API/WebKitAvailability.h
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-index ab53183..1310dec 100644
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- Source/JavaScriptCore/API/WebKitAvailability.h
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ Source/JavaScriptCore/API/WebKitAvailability.h
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -27,57 +27,12 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #define __WebKitAvailability__
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- Source/JavaScriptCore/API/WebKitAvailability.h.orig 2018-08-20 01:32:25.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ Source/JavaScriptCore/API/WebKitAvailability.h 2018-08-20 01:35:33.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -28,46 +28,8 @@
</span>
#if defined(__APPLE__)
<span style='display:block; white-space:pre;background:#ffe0e0;'>--
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> -#include <AvailabilityMacros.h>
#include <CoreFoundation/CoreFoundation.h>
<span style='display:block; white-space:pre;background:#ffe0e0;'>--
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> -#if !TARGET_OS_IPHONE && __MAC_OS_X_VERSION_MIN_REQUIRED < 101100
-/* To support availability macros that mention newer OS X versions when building on older OS X versions,
- we provide our own definitions of the underlying macros that the availability macros expand to. We're
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -35,8 +32,8 @@ index ab53183..1310dec 100644
</span> -
-#ifndef __AVAILABILITY_INTERNAL__MAC_10_10
-#define __AVAILABILITY_INTERNAL__MAC_10_10
<span style='display:block; white-space:pre;background:#ffe0e0;'>- #endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-
</span> -#ifndef AVAILABLE_MAC_OS_X_VERSION_10_9_AND_LATER
-#define AVAILABLE_MAC_OS_X_VERSION_10_9_AND_LATER
-#endif
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -47,16 +44,6 @@ index ab53183..1310dec 100644
</span> -
-#endif /* !TARGET_OS_IPHONE && __MAC_OS_X_VERSION_MIN_REQUIRED < 101100 */
-
<span style='display:block; white-space:pre;background:#ffe0e0;'>--#if defined(BUILDING_GTK__)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #undef CF_AVAILABLE
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #define CF_AVAILABLE(_mac, _ios)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #undef CF_ENUM_AVAILABLE
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #define CF_ENUM_AVAILABLE(_mac, _ios)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--#endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--#else
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--#define CF_AVAILABLE(_mac, _ios)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--#define CF_ENUM_AVAILABLE(_mac, _ios)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--#endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #endif /* __WebKitAvailability__ */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #if defined(BUILDING_GTK__)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #undef JSC_API_AVAILABLE
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #define JSC_API_AVAILABLE(...)
</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/unused/patch-name-conflicts.diff
</span>similarity index 83%
rename from www/webkit2-gtk/files/patch-name-conflicts.diff
rename to www/webkit2-gtk/files/unused/patch-name-conflicts.diff
<span style='display:block; white-space:pre;color:#808080;'>index f633e69..2763ceb 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/www/webkit2-gtk/files/patch-name-conflicts.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/www/webkit2-gtk/files/unused/patch-name-conflicts.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -44,3 +44,14 @@
</span>
namespace WebKit {
<span style='display:block; white-space:pre;background:#e0ffe0;'>+--- Source/WebCore/html/HTMLKeygenElement.cpp.orig 2018-06-26 08:48:28.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ Source/WebCore/html/HTMLKeygenElement.cpp 2018-06-26 08:48:39.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -39,7 +39,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <wtf/NeverDestroyed.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <wtf/StdLibExtras.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 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;color:#808080;'>diff --git a/www/webkit2-gtk/files/patch_bad_optional_access.diff b/www/webkit2-gtk/files/unused/patch_bad_optional_access.diff
</span>similarity index 100%
rename from www/webkit2-gtk/files/patch_bad_optional_access.diff
rename to www/webkit2-gtk/files/unused/patch_bad_optional_access.diff
</pre><pre style='margin:0'>
</pre>