<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/bd8c2d51c49c338b2799de6faa6dc5f4f2793346">https://github.com/macports/macports-ports/commit/bd8c2d51c49c338b2799de6faa6dc5f4f2793346</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 bd8c2d5 webkit2-gtk-devel: update to 2.27.2
</span>bd8c2d5 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit bd8c2d51c49c338b2799de6faa6dc5f4f2793346
</span>Author: Ken Cunningham <kencu@macports.org>
AuthorDate: Fri Oct 25 08:42:12 2019 -0700
<span style='display:block; white-space:pre;color:#404040;'> webkit2-gtk-devel: update to 2.27.2
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> patches are getting more and more hacky
</span><span style='display:block; white-space:pre;color:#404040;'> would be nice if there was interest in upstreaming these
</span><span style='display:block; white-space:pre;color:#404040;'> if not, webkit2-gtk will eventually collapse on MacPorts
</span>---
www/webkit2-gtk-devel/Portfile | 206 +++++++++------------
.../files/patch-WTF-wtf-Randomdevice.diff | 34 ++--
...TF-wtf-spi-darwin-ProcessMemoryFootprint-h.diff | 13 ++
.../files/patch-Webcore-page-crypto.diff | 16 +-
www/webkit2-gtk-devel/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 | 6 +-
...nix-cputimeunix-cpp-darwin-version-restore.diff | 10 +-
...tform-audio-directconvolver-disable-veclib.diff | 11 ++
.../files/patch-webkit2gtk-272-macports.diff | 55 ++++++
.../files/patch-webkit2gtk-macports.diff | 192 +++++++++++++++++++
.../files/{ => unused}/PR-152650-2.patch | 0
.../files/{ => unused}/PR-153138.patch | 0
.../files/{ => unused}/PR-157574.patch | 0
.../files/{ => unused}/patch-name-conflicts.diff | 0
.../files/unused/patch_bad_optional_access.diff | 15 ++
17 files changed, 436 insertions(+), 220 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/www/webkit2-gtk-devel/Portfile b/www/webkit2-gtk-devel/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index e35c964..18063d9 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/www/webkit2-gtk-devel/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/www/webkit2-gtk-devel/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -7,15 +7,18 @@
</span> PortSystem 1.0
PortGroup active_variants 1.1
PortGroup cmake 1.1
<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;'>+
</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-devel
conflicts webkit2-gtk
<span style='display:block; white-space:pre;background:#ffe0e0;'>-version 2.21.91
</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.27.2
</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}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-maintainers {devans @dbevans}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+maintainers {devans @dbevans} {kencu @kencu}
</span> categories www gnome
platforms darwin freebsd
license LGPL-2+ BSD
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -27,9 +30,9 @@ distname webkitgtk-${version}
</span>
dist_subdir webkit-gtk
<span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums rmd160 b4fa75420cc790fa9e3b341fd823ceb44c8d0ff5 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 d9a35a84232c5d6ad7d0bb704918e110d30f8592f233770c830431a384c3bb0c \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 17080704
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums rmd160 71b5519e9e4734f1b29725e33e27b6b4e87b01ee \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 05382bcf96b20d59ca9657265fd3aa46ab8887b5c7fcd286ca43b9362d7a8198 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 20793524
</span>
depends_build-append \
port:gperf \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -45,7 +48,7 @@ depends_lib-append port:atk \
</span> 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;'>@@ -68,50 +71,36 @@ depends_lib-append 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 -- fixes namespace collisions with MacTypes.h
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</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;'>-
</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:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# Source/WTF/wtf/unix/CPUTimeUnix.cpp has changed, and the Darwin parts
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# were stripped out. Add back the previous Darwin version
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-patchfiles-append \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- patch-source-wtf-wtf-unix-cputimeunix-cpp-darwin-version-restore.diff
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# some Darwin versions don't have MAP_JIT
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-patchfiles-append \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- patch-source-wtf-wtf-osallocatorposix-cpp-map-jit.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</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;'>+# and a few more for webkit2-gtk-2.27.2
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+patchfiles-append patch-webkit2gtk-272-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;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</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 > 1000 had errors that are not fully worked out, possibly compiler bug, blacklist for now
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-compiler.blacklist-append {clang < 902.0.39.2} {clang >= 1000} macports-clang-3.4 macports-clang-3.3
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-compiler.fallback-append macports-clang-5.0 macports-clang-3.7
</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;'>@@ -119,59 +108,26 @@ 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:#ffe0e0;'>-
</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;'>-}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</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:#ffe0e0;'>-
</span> if {![variant_isset quartz]} {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- default_variants-append +x11 +gtk2
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ default_variants-append +x11
</span> }
<span style='display:block; white-space:pre;background:#ffe0e0;'>-variant quartz conflicts x11 gtk2 {
</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> require_active_variants port:gtk3 quartz
configure.args-append \
-DENABLE_QUARTZ_TARGET=ON \
-DENABLE_X11_TARGET=OFF \
<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:#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;'>- # 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;'>- configure.args-append -DUSE_GSTREAMER_GL=OFF
</span> }
variant x11 conflicts quartz {
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -190,60 +146,72 @@ variant x11 conflicts quartz {
</span> variant minibrowser description {Build and install MiniBrowser (for testing)} {
configure.args-delete -DENABLE_MINIBROWSER=OFF
configure.args-append -DENABLE_MINIBROWSER=ON
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_run-append port:adwaita-icon-theme
</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;'>- 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:#e0ffe0;'>+# the above code presently builds as-in on 10.13 and up
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+if {${os.platform} eq "darwin" && ${os.major} <= 16} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</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;'>+ # the first generated error is a name collision with MacTypes.h
</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;'>+ # build of bmalloc fails up to 10.12 https://trac.macports.org/ticket/59447
</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;'>+ # Source/WTF/wtf/unix/CPUTimeUnix.cpp : add back a 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:#ffe0e0;'>-# fix build on older systems
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-if {${os.platform} eq "darwin" && ${os.major} <= 13} {
</span><span style='display:block; white-space:pre;background:#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
# todo clarify further where this is exactly needed
configure.args-append -DUSE_GSTREAMER_GL=OFF
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ # for the webcore/page/crypt code to flow correctly,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # ENABLE_WEB_CRYPTO has to be ON for 10.10+ and OFF for 10.9 and less
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {${os.major} <= 13} {
</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> # disable Apple internal security libraries, available only on new systems
<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;'>+ patchfiles-append patch-Webcore-page-crypto.diff
</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:#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:#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;'>+ # 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 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>
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ # disable veclib on 10.7 and 10.8. There is a definition for
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # class complex<> in the vForce.h header that collides with libc++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # if anyone has a more elegant fix for this, please volunteer it
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# if {${os.major} == 11 || ${os.major} == 12} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patchfiles-append patch-webcore-platform-audio-directconvolver-disable-veclib.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# }
</span>
# add dep for newer ruby and spec this for build
# https://trac.macports.org/ticket/52016
<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:#e0e0e0;'>@@ -252,4 +220,4 @@ if {${os.platform} eq "darwin" && ${os.major} <= 13} {
</span>
livecheck.type regex
livecheck.url http://webkitgtk.org/releases/
<span style='display:block; white-space:pre;background:#ffe0e0;'>-livecheck.regex "webkitgtk-(\\d+(?:\\.\\d+)+)"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+livecheck.regex "webkitgtk-(\\d+\\.\\d*\[13579\](?:\\.\\d+)*)"
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/www/webkit2-gtk-devel/files/patch-WTF-wtf-Randomdevice.diff b/www/webkit2-gtk-devel/files/patch-WTF-wtf-Randomdevice.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index bbd5052..bfd2ee9 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/www/webkit2-gtk-devel/files/patch-WTF-wtf-Randomdevice.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/www/webkit2-gtk-devel/files/patch-WTF-wtf-Randomdevice.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,6 +1,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-diff -u Source/WTF/wtf/RandomDevice.cpp.orig Source/WTF/wtf/RandomDevice.cpp
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- Source/WTF/wtf/RandomDevice.cpp.orig 2018-08-31 20:57:40.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ Source/WTF/wtf/RandomDevice.cpp 2018-08-31 21:01:02.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git Source/WTF/wtf/RandomDevice.cpp Source/WTF/wtf/RandomDevice.cpp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 89165f03..99251674 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- Source/WTF/wtf/RandomDevice.cpp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ Source/WTF/wtf/RandomDevice.cpp
</span> @@ -30,7 +30,7 @@
#include <stdint.h>
#include <stdlib.h>
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -16,10 +17,10 @@ diff -u Source/WTF/wtf/RandomDevice.cpp.orig Source/WTF/wtf/RandomDevice.cpp
</span>
-#if OS(DARWIN)
+#if (0)
<span style='display:block; white-space:pre;background:#ffe0e0;'>- #include "CommonCryptoSPI.h"
</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> #endif
<span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -51,7 +51,7 @@
</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:#e0e0e0;'>@@ -28,7 +29,7 @@ diff -u Source/WTF/wtf/RandomDevice.cpp.orig Source/WTF/wtf/RandomDevice.cpp
</span> NEVER_INLINE NO_RETURN_DUE_TO_CRASH static void crashUnableToOpenURandom()
{
CRASH();
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -63,7 +63,7 @@
</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> }
#endif
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -37,7 +38,7 @@ diff -u Source/WTF/wtf/RandomDevice.cpp.orig Source/WTF/wtf/RandomDevice.cpp
</span> RandomDevice::RandomDevice()
{
int ret = 0;
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -76,7 +76,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -77,7 +77,7 @@ RandomDevice::RandomDevice()
</span> }
#endif
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -46,13 +47,13 @@ diff -u Source/WTF/wtf/RandomDevice.cpp.orig Source/WTF/wtf/RandomDevice.cpp
</span> RandomDevice::~RandomDevice()
{
close(m_fd);
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -87,11 +87,11 @@
</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)
+#if (0)
<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;'>+ RELEASE_ASSERT(!CCRandomGenerateBytes(buffer, length));
</span> #elif OS(FUCHSIA)
zx_cprng_draw(buffer, length);
-#elif OS(UNIX)
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -60,19 +61,20 @@ diff -u Source/WTF/wtf/RandomDevice.cpp.orig Source/WTF/wtf/RandomDevice.cpp
</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;'>-diff -u Source/WTF/wtf/RandomDevice.h.orig Source/WTF/wtf/RandomDevice.h
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- Source/WTF/wtf/RandomDevice.h.orig 2018-08-31 21:02:42.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ Source/WTF/wtf/RandomDevice.h 2018-08-31 21:03:23.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -34,7 +34,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- class RandomDevice {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git Source/WTF/wtf/RandomDevice.h Source/WTF/wtf/RandomDevice.h
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 411bde3e..9c9c6da8 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- Source/WTF/wtf/RandomDevice.h
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ Source/WTF/wtf/RandomDevice.h
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -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:
-#if OS(DARWIN) || OS(FUCHSIA) || OS(WINDOWS)
+#if (0)
RandomDevice() = default;
#else
RandomDevice();
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -47,8 +47,8 @@
</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;color:#808080;'>diff --git a/www/webkit2-gtk-devel/files/patch-WTF-wtf-spi-darwin-ProcessMemoryFootprint-h.diff b/www/webkit2-gtk-devel/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-devel/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-devel/files/patch-Webcore-page-crypto.diff b/www/webkit2-gtk-devel/files/patch-Webcore-page-crypto.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index 4ef3260..e33df9d 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/www/webkit2-gtk-devel/files/patch-Webcore-page-crypto.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/www/webkit2-gtk-devel/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)
<span style='display:block; white-space:pre;background:#ffe0e0;'>- #include "CommonCryptoUtilities.h"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <CommonCrypto/CommonCryptor.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <CommonCrypto/CommonRandom.h>
</span> #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;'>+@@ -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-devel/files/patch-ramsize.diff b/www/webkit2-gtk-devel/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-devel/files/patch-ramsize.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/www/webkit2-gtk-devel/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-devel/files/patch-snowleopard-cmakelists-stdcformatmacros.diff b/www/webkit2-gtk-devel/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-devel/files/patch-snowleopard-cmakelists-stdcformatmacros.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/www/webkit2-gtk-devel/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-devel/files/patch-snowleopard-npruntime-redefine-cursor.diff b/www/webkit2-gtk-devel/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-devel/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-devel/files/patch-source-wtf-wtf-osallocatorposix-cpp-map-jit.diff b/www/webkit2-gtk-devel/files/patch-source-wtf-wtf-osallocatorposix-cpp-map-jit.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index e824b22..8040dc7 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/www/webkit2-gtk-devel/files/patch-source-wtf-wtf-osallocatorposix-cpp-map-jit.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/www/webkit2-gtk-devel/files/patch-source-wtf-wtf-osallocatorposix-cpp-map-jit.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,7 +1,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git Source/WTF/wtf/OSAllocatorPosix.cpp Source/WTF/wtf/OSAllocatorPosix.cpp
</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> index a5eb8d44..051c439e 100644
<span style='display:block; white-space:pre;background:#ffe0e0;'>---- Source/WTF/wtf/OSAllocatorPosix.cpp
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ Source/WTF/wtf/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;'>++++ Source/WTF/wtf/posix/OSAllocatorPOSIX.cpp
</span> @@ -72,9 +72,11 @@ void* OSAllocator::reserveAndCommit(size_t bytes, Usage usage, bool writable, bo
int flags = MAP_PRIVATE | MAP_ANON;
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/www/webkit2-gtk-devel/files/patch-source-wtf-wtf-unix-cputimeunix-cpp-darwin-version-restore.diff b/www/webkit2-gtk-devel/files/patch-source-wtf-wtf-unix-cputimeunix-cpp-darwin-version-restore.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index 7a8e598..47be932 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/www/webkit2-gtk-devel/files/patch-source-wtf-wtf-unix-cputimeunix-cpp-darwin-version-restore.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/www/webkit2-gtk-devel/files/patch-source-wtf-wtf-unix-cputimeunix-cpp-darwin-version-restore.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -2,7 +2,7 @@ diff --git Source/WTF/wtf/unix/CPUTimeUnix.cpp Source/WTF/wtf/unix/CPUTimeUnix.c
</span> index 27990893..fe279865 100644
--- Source/WTF/wtf/unix/CPUTimeUnix.cpp
+++ Source/WTF/wtf/unix/CPUTimeUnix.cpp
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -26,6 +26,66 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -26,6 +26,68 @@
</span> #include "config.h"
#include "CPUTime.h"
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -14,6 +14,8 @@ index 27990893..fe279865 100644
</span> +#import <mach/thread_info.h>
+#import <sys/time.h>
+
<span style='display:block; white-space:pre;background:#e0ffe0;'>++#include <wtf/Optional.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span> +namespace WTF {
+
+static const int64_t microsecondsPerSecond = 1000000;
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -26,14 +28,14 @@ index 27990893..fe279865 100644
</span> + return result;
+}
+
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+std::optional<CPUTime> CPUTime::get()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++Optional<CPUTime> CPUTime::get()
</span> +{
+ // Account for current threads.
+ task_thread_times_info threadInfoData;
+ mach_msg_type_number_t threadInfoCount = TASK_THREAD_TIMES_INFO_COUNT;
+ kern_return_t result = task_info(mach_task_self(), TASK_THREAD_TIMES_INFO, reinterpret_cast<task_info_t>(&threadInfoData), &threadInfoCount);
+ if (result != KERN_SUCCESS)
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+ return std::nullopt;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ return nullopt;
</span> +
+ int64_t userTime = timeValueToMicroseconds(threadInfoData.user_time);
+ int64_t systemTime = timeValueToMicroseconds(threadInfoData.system_time);
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -43,7 +45,7 @@ index 27990893..fe279865 100644
</span> + mach_msg_type_number_t taskInfoCount = TASK_BASIC_INFO_COUNT;
+ result = task_info(mach_task_self(), TASK_BASIC_INFO, reinterpret_cast<task_info_t>(&taskInfoData), &taskInfoCount);
+ if (result != KERN_SUCCESS)
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+ return std::nullopt;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ return nullopt;
</span> +
+ userTime += timeValueToMicroseconds(taskInfoData.user_time);
+ systemTime += timeValueToMicroseconds(taskInfoData.system_time);
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/www/webkit2-gtk-devel/files/patch-webcore-platform-audio-directconvolver-disable-veclib.diff b/www/webkit2-gtk-devel/files/patch-webcore-platform-audio-directconvolver-disable-veclib.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 0000000..76dd310
</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-devel/files/patch-webcore-platform-audio-directconvolver-disable-veclib.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,11 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- Source/WebCore/platform/audio/DirectConvolver.cpp.orig 2019-10-24 21:10:45.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ Source/WebCore/platform/audio/DirectConvolver.cpp 2019-10-24 21:11:19.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -32,7 +32,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include "DirectConvolver.h"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#if OS(DARWIN)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#if OS(DARWIN) && 0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <Accelerate/Accelerate.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/www/webkit2-gtk-devel/files/patch-webkit2gtk-272-macports.diff b/www/webkit2-gtk-devel/files/patch-webkit2gtk-272-macports.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 0000000..11c9420
</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-devel/files/patch-webkit2gtk-272-macports.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,55 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git Source/WebKit/NetworkProcess/NetworkLoadParameters.h Source/WebKit/NetworkProcess/NetworkLoadParameters.h
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index de74d33a..fb021faa 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- Source/WebKit/NetworkProcess/NetworkLoadParameters.h
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ Source/WebKit/NetworkProcess/NetworkLoadParameters.h
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -35,6 +35,9 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <WebCore/SecurityOrigin.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <wtf/ProcessID.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++/* audit_token_t */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#include <mach/message.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ namespace WebKit {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ enum class PreconnectOnly { No, Yes };
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git Source/WebKit/Platform/IPC/ArgumentCoders.h Source/WebKit/Platform/IPC/ArgumentCoders.h
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index f1ea1ecb..12ceec79 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- Source/WebKit/Platform/IPC/ArgumentCoders.h
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ Source/WebKit/Platform/IPC/ArgumentCoders.h
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -34,6 +34,9 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <wtf/Unexpected.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <wtf/WallTime.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++/* audit_token_t */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#include <mach/message.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ namespace IPC {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ // An argument coder works on POD types
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git Source/WebKit/Shared/SandboxExtension.h Source/WebKit/Shared/SandboxExtension.h
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 5839d3fc..6f110183 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- Source/WebKit/Shared/SandboxExtension.h
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ Source/WebKit/Shared/SandboxExtension.h
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -33,6 +33,9 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <wtf/Vector.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <wtf/text/WTFString.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++/* audit_token_t */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#include <mach/message.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ namespace IPC {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ class Encoder;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ class Decoder;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git Source/WebKit/UIProcess/API/glib/WebKitProtocolHandler.cpp Source/WebKit/UIProcess/API/glib/WebKitProtocolHandler.cpp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 57e8a557..45df4cf6 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- Source/WebKit/UIProcess/API/glib/WebKitProtocolHandler.cpp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ Source/WebKit/UIProcess/API/glib/WebKitProtocolHandler.cpp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -272,7 +272,7 @@ void WebKitProtocolHandler::handleGPU(WebKitURISchemeRequest* request)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ " <td><div class=\"titlename\">Type</div></td>"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ " <td>%s</td>"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ " </tbody></tr>",
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- PlatformDisplay::sharedDisplay().type() == PlatformDisplay::Type::Wayland ? "Wayland" : "X11");
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ "X11");
</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;'>+ auto rect = IntRect(screenRect(nullptr));
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/www/webkit2-gtk-devel/files/patch-webkit2gtk-macports.diff b/www/webkit2-gtk-devel/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-devel/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-devel/files/PR-152650-2.patch b/www/webkit2-gtk-devel/files/unused/PR-152650-2.patch
</span>similarity index 100%
rename from www/webkit2-gtk-devel/files/PR-152650-2.patch
rename to www/webkit2-gtk-devel/files/unused/PR-152650-2.patch
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/www/webkit2-gtk-devel/files/PR-153138.patch b/www/webkit2-gtk-devel/files/unused/PR-153138.patch
</span>similarity index 100%
rename from www/webkit2-gtk-devel/files/PR-153138.patch
rename to www/webkit2-gtk-devel/files/unused/PR-153138.patch
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/www/webkit2-gtk-devel/files/PR-157574.patch b/www/webkit2-gtk-devel/files/unused/PR-157574.patch
</span>similarity index 100%
rename from www/webkit2-gtk-devel/files/PR-157574.patch
rename to www/webkit2-gtk-devel/files/unused/PR-157574.patch
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/www/webkit2-gtk-devel/files/patch-name-conflicts.diff b/www/webkit2-gtk-devel/files/unused/patch-name-conflicts.diff
</span>similarity index 100%
rename from www/webkit2-gtk-devel/files/patch-name-conflicts.diff
rename to www/webkit2-gtk-devel/files/unused/patch-name-conflicts.diff
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/www/webkit2-gtk-devel/files/unused/patch_bad_optional_access.diff b/www/webkit2-gtk-devel/files/unused/patch_bad_optional_access.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 0000000..508b5fd
</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-devel/files/unused/patch_bad_optional_access.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,15 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- Source/WTF/wtf/Optional.h (revision 235660)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ Source/WTF/wtf/Optional.h (revision 235661)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -278,12 +278,4 @@
</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;'>+-// 20.5.8, class bad_optional_access
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-class bad_optional_access : public std::logic_error {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-public:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- explicit bad_optional_access(const std::string& what_arg) : std::logic_error{what_arg} {}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- explicit bad_optional_access(const char* what_arg) : std::logic_error{what_arg} {}
</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;'>+ template <class T>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ union storage_t
</span></pre><pre style='margin:0'>
</pre>