<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/19e24d4b5a794deb81b259e1f915848fed19c1ae">https://github.com/macports/macports-ports/commit/19e24d4b5a794deb81b259e1f915848fed19c1ae</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit 19e24d4b5a794deb81b259e1f915848fed19c1ae
</span>Author: Ken Cunningham <kencu@macports.org>
AuthorDate: Mon Jun 1 23:32:54 2020 -0700
<span style='display:block; white-space:pre;color:#404040;'> webkit2-gtk: bump to 2.28.2
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> a few new patches, as always
</span>---
www/webkit2-gtk/Portfile | 23 +++---
www/webkit2-gtk/files/WebKit-icu-65.1-fix.patch | 62 ----------------
.../files/patch-Webcore-page-crypto.diff | 4 +-
.../patch-layertreehost-remove-invalidate.diff | 15 ----
...ch-webkit2gtk-2282-unprotected-egl-changes.diff | 71 ++++++++++++++++++
.../files/patch-webkit2gtk-272-macports.diff | 83 ++++++++++++++++++++++
.../files/patch-webkit2gtk-macports.diff | 25 ++++---
...rce-javascriptcore-tools-jsdollarvm-handle.diff | 13 ----
8 files changed, 182 insertions(+), 114 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/www/webkit2-gtk/Portfile b/www/webkit2-gtk/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 087e30c..01d20e3 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/www/webkit2-gtk/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/www/webkit2-gtk/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -13,8 +13,8 @@ cmake.generator Ninja
</span>
name webkit2-gtk
conflicts webkit2-gtk-devel
<span style='display:block; white-space:pre;background:#ffe0e0;'>-version 2.26.2
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+version 2.28.2
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 0
</span>
description Apple's WebKit2 HTML rendering library for GTK+3
long_description ${description}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -30,9 +30,9 @@ distname webkitgtk-${version}
</span>
dist_subdir webkit-gtk
<span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums rmd160 1ebf95153ab962154595ec19ed3a58e55b1521f8 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 6b80f0637a80818559ac8fd50db3b394f41cb61904fb9b3ed65fa51635806512 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 19330000
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums rmd160 a626f58cf30b6dd1ef8a63c165ce85770c4da675 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 b9d23525cfd8d22c37b5d964a9fe9a8ce7583042a2f8d3922e71e6bbc68c30bd \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 21427772
</span>
depends_build-append \
port:gperf \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -79,13 +79,11 @@ depends_lib-append port:atk \
</span> # 5. change some int64_t to gint64 to stop typedef errors in gstreamer
patchfiles-append patch-webkit2gtk-macports.diff
<span style='display:block; white-space:pre;background:#ffe0e0;'>-# fix name collision that breaks build with clang-9.0
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-patchfiles-append patch-webkit2gtk-source-javascriptcore-tools-jsdollarvm-handle.diff
</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:#ffe0e0;'>-# remove a definition from a header that was accidentally left behind in 2.26.2
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# this can be removed in 2.27.x
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# see: https://trac.macports.org/ticket/59704#comment:10
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-patchfiles-append patch-layertreehost-remove-invalidate.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# and a few more for 282
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+patchfiles-append patch-webkit2gtk-2282-unprotected-egl-changes.diff
</span>
# enable Netscape plugin architecture on macOS
# or can be explicitly disabled with the following addition if preferred
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -96,9 +94,6 @@ patchfiles-append patch-enable-plugin-architecture-unix.diff
</span> # runs without this patch.
patchfiles-append patch-bundle-link-webcore.diff
<span style='display:block; white-space:pre;background:#ffe0e0;'>-# https://gitlab.gnome.org/GNOME/jhbuild/commit/e8b48870602c3a8e474e54cf1c6151b98651aae9
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-patchfiles-append WebKit-icu-65.1-fix.patch
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> # it is preferred to use the WebKit built in bmalloc if it builds on a given os.
# it has improved security features, but not all systems can build it at present.
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/www/webkit2-gtk/files/WebKit-icu-65.1-fix.patch b/www/webkit2-gtk/files/WebKit-icu-65.1-fix.patch
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 4bab12d..0000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/www/webkit2-gtk/files/WebKit-icu-65.1-fix.patch
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,62 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-------------------------------------------------------------------------
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-r250747 | commit-queue@webkit.org | 2019-10-05 05:51:37 +0800 (六, 05 10月 2019) | 16 lines
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Fix build with icu 65.1
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-https://bugs.webkit.org/show_bug.cgi?id=202600
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Patch by Heiko Becker <heirecka@exherbo.org> on 2019-10-04
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Reviewed by Konstantin Tokarev.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Source/WebCore:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-* dom/Document.cpp:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-(WebCore::isValidNameNonASCII):
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-(WebCore::Document::parseQualifiedName):
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Source/WTF:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-* wtf/URLHelpers.cpp:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-(WTF::URLHelpers::allCharactersInIDNScriptWhiteList):
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Index: Source/WTF/wtf/URLHelpers.cpp
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-===================================================================
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- Source/WTF/wtf/URLHelpers.cpp (revision 250746)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ Source/WTF/wtf/URLHelpers.cpp (revision 250747)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -301,7 +301,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- Optional<UChar32> previousCodePoint;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- while (i < length) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- UChar32 c;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- U16_NEXT(buffer, i, length, c)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ U16_NEXT(buffer, i, length, c);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- UErrorCode error = U_ZERO_ERROR;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- UScriptCode script = uscript_getScript(c, &error);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if (error != U_ZERO_ERROR) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Index: Source/WebCore/dom/Document.cpp
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-===================================================================
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- Source/WebCore/dom/Document.cpp (revision 250746)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ Source/WebCore/dom/Document.cpp (revision 250747)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -4954,12 +4954,12 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- unsigned i = 0;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- UChar32 c;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- U16_NEXT(characters, i, length, c)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ U16_NEXT(characters, i, length, c);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if (!isValidNameStart(c))
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- return false;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- while (i < length) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- U16_NEXT(characters, i, length, c)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ U16_NEXT(characters, i, length, c);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if (!isValidNamePart(c))
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- return false;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -5019,7 +5019,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- for (unsigned i = 0; i < length; ) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- UChar32 c;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- U16_NEXT(qualifiedName, i, length, c)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ U16_NEXT(qualifiedName, i, length, c);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if (c == ':') {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if (sawColon)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- return Exception { InvalidCharacterError };
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-------------------------------------------------------------------------
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/www/webkit2-gtk/files/patch-Webcore-page-crypto.diff b/www/webkit2-gtk/files/patch-Webcore-page-crypto.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index eaf2901..e33df9d 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/www/webkit2-gtk/files/patch-Webcore-page-crypto.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/www/webkit2-gtk/files/patch-Webcore-page-crypto.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -8,9 +8,9 @@ index 69c36e97..07969aad 100644
</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;'>-
</span> @@ -58,7 +58,7 @@ ExceptionOr<void> Crypto::getRandomValues(ArrayBufferView& array)
return Exception { TypeMismatchError };
if (array.byteLength() > 65536)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/www/webkit2-gtk/files/patch-layertreehost-remove-invalidate.diff b/www/webkit2-gtk/files/patch-layertreehost-remove-invalidate.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 9787806..0000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/www/webkit2-gtk/files/patch-layertreehost-remove-invalidate.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,15 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-This definition from the header was subsequently removed in 2.27.1 but was left behind
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-in this header for 2.26.2. This causes an error building +quartz.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-see: https://trac.macports.org/ticket/59704#comment:10
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-kencu@macports.org
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- Source/WebKit/WebProcess/WebPage/CoordinatedGraphics/LayerTreeHost.h.orig 2019-11-19 23:19:08.000000000 -0800
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ Source/WebKit/WebProcess/WebPage/CoordinatedGraphics/LayerTreeHost.h 2019-11-19 23:19:22.000000000 -0800
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -212,7 +212,6 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- inline void LayerTreeHost::cancelPendingLayerFlush() { }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- inline void LayerTreeHost::setRootCompositingLayer(WebCore::GraphicsLayer*) { }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- inline void LayerTreeHost::setViewOverlayRootLayer(WebCore::GraphicsLayer*) { }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--inline void LayerTreeHost::invalidate() { }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- inline void LayerTreeHost::scrollNonCompositedContents(const WebCore::IntRect&) { }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- inline void LayerTreeHost::forceRepaint() { }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- inline bool LayerTreeHost::forceRepaintAsync(CallbackID) { return false; }
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/www/webkit2-gtk/files/patch-webkit2gtk-2282-unprotected-egl-changes.diff b/www/webkit2-gtk/files/patch-webkit2gtk-2282-unprotected-egl-changes.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 0000000..dad9f0f
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/www/webkit2-gtk/files/patch-webkit2gtk-2282-unprotected-egl-changes.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,71 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+These changes were added in
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+<https://github.com/WebKit/webkit/commit/c7d6af038dcbfac95d0af4f43fbb945d73f6b1bb>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+they don't compile, as they use EGL unprotected, but even when some of them were protected by USE(EGL) there were
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ errors when trying to play videos in the MiniBrowser. So I added protection to all the addition bits in
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ the commit that were not initially protected.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+kencu@macports.org
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git Source/WebCore/platform/graphics/gstreamer/GRefPtrGStreamer.cpp Source/WebCore/platform/graphics/gstreamer/GRefPtrGStreamer.cpp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index ad632205..29a9eace 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- Source/WebCore/platform/graphics/gstreamer/GRefPtrGStreamer.cpp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ Source/WebCore/platform/graphics/gstreamer/GRefPtrGStreamer.cpp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -23,7 +23,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #if USE(GSTREAMER)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <gst/gst.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#if USE(GSTREAMER_GL)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#if USE(WPE_VIDEO_PLANE_DISPLAY_DMABUF)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <gst/gl/egl/gsteglimage.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -508,6 +508,7 @@ template<> void derefGPtr<GstGLContext>(GstGLContext* ptr)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ gst_object_unref(GST_OBJECT(ptr));
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#if USE(WPE_VIDEO_PLANE_DISPLAY_DMABUF)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ template <> GRefPtr<GstEGLImage> adoptGRef(GstEGLImage* ptr)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return GRefPtr<GstEGLImage>(ptr, GRefPtrAdopt);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -525,6 +526,7 @@ template <> void derefGPtr<GstEGLImage>(GstEGLImage* ptr)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (ptr)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ gst_egl_image_unref(ptr);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#endif //USE(WPE_VIDEO_PLANE_DISPLAY_DMABUF)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #endif // USE(GSTREAMER_GL)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git Source/WebCore/platform/graphics/gstreamer/GRefPtrGStreamer.h Source/WebCore/platform/graphics/gstreamer/GRefPtrGStreamer.h
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index d940f8ca..bda2f024 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- Source/WebCore/platform/graphics/gstreamer/GRefPtrGStreamer.h
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ Source/WebCore/platform/graphics/gstreamer/GRefPtrGStreamer.h
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -30,9 +30,13 @@ typedef struct _WebKitWebSrc WebKitWebSrc;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #if USE(GSTREAMER_GL)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ typedef struct _GstGLDisplay GstGLDisplay;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ typedef struct _GstGLContext GstGLContext;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#if USE(WPE_VIDEO_PLANE_DISPLAY_DMABUF)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ typedef struct _GstEGLImage GstEGLImage;
</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;'>++#endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ namespace WTF {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ template<> GRefPtr<GstPlugin> adoptGRef(GstPlugin* ptr);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -133,9 +137,12 @@ template<> GRefPtr<GstGLContext> adoptGRef(GstGLContext* ptr);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ template<> GstGLContext* refGPtr<GstGLContext>(GstGLContext* ptr);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ template<> void derefGPtr<GstGLContext>(GstGLContext* ptr);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#if USE(WPE_VIDEO_PLANE_DISPLAY_DMABUF)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ template<> GRefPtr<GstEGLImage> adoptGRef(GstEGLImage* ptr);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ template<> GstEGLImage* refGPtr<GstEGLImage>(GstEGLImage* ptr);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ template<> void derefGPtr<GstEGLImage>(GstEGLImage* ptr);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#endif // USE(WPE_VIDEO_PLANE_DISPLAY_DMABUF)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ } // namespace WTF
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/www/webkit2-gtk/files/patch-webkit2gtk-272-macports.diff b/www/webkit2-gtk/files/patch-webkit2gtk-272-macports.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 0000000..e76deff
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/www/webkit2-gtk/files/patch-webkit2gtk-272-macports.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,83 @@
</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.orig 2019-11-22 04:57:54.000000000 -0800
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ ./Source/WebKit/UIProcess/API/glib/WebKitProtocolHandler.cpp 2019-11-27 05:52:39.000000000 -0800
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -333,9 +333,10 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ " </tbody></tr>",
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ webGLEnabled(request) ? "Yes" : "No");
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#if USE(GLX)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ auto glContext = GLContext::createOffscreenContext();
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ glContext->makeContextCurrent();
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ g_string_append_printf(html,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ " <tbody><tr>"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ " <td><div class=\"titlename\">API</div></td>"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -349,7 +350,7 @@
</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;'>+ nativeInterface());
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#if USE(GLX)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ g_string_append_printf(html,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ " <tbody><tr>"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ " <td><div class=\"titlename\">GL_RENDERER</div></td>"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -377,7 +378,6 @@
</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;'>+ reinterpret_cast<const char*>(glGetString(GL_SHADING_LANGUAGE_VERSION)));
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #if USE(OPENGL_ES)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ g_string_append_printf(html,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ " <tbody><tr>"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -402,6 +402,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ extensions->str);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ g_string_free(extensions, TRUE);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ bool isGLX = false;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #if USE(GLX)
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/www/webkit2-gtk/files/patch-webkit2gtk-macports.diff b/www/webkit2-gtk/files/patch-webkit2gtk-macports.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index 9ffaadb..8ed52bf 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/www/webkit2-gtk/files/patch-webkit2gtk-macports.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/www/webkit2-gtk/files/patch-webkit2gtk-macports.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -168,11 +168,9 @@ index 00000000..cf113819
</span> +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);
+
+#endif // !USE(APPLE_INTERNAL_SDK)
<span style='display:block; white-space:pre;background:#ffe0e0;'>-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:#ffe0e0;'>-index ab37ee04..eb03d330 100644
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- Source/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamer.cpp
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ Source/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamer.cpp
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -493,7 +493,7 @@ MediaTime MediaPlayerPrivateGStreamer::platformDuration() const
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- Source/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamer.cpp.orig 2019-11-26 03:02:20.000000000 -0800
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ Source/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamer.cpp 2019-11-26 14:56:04.000000000 -0800
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -795,7 +795,7 @@
</span> if (GST_STATE(m_pipeline.get()) < GST_STATE_PAUSED)
return MediaTime::invalidTime();
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -181,12 +179,23 @@ index ab37ee04..eb03d330 100644
</span> if (!gst_element_query_duration(m_pipeline.get(), GST_FORMAT_TIME, &duration) || !GST_CLOCK_TIME_IS_VALID(duration)) {
GST_DEBUG_OBJECT(pipeline(), "Time duration query failed for %s", m_url.string().utf8().data());
return MediaTime::positiveInfiniteTime();
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -1372,7 +1372,7 @@ void MediaPlayerPrivateGStreamer::handleMessage(GstMessage* message)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -2332,7 +2332,7 @@
</span> GUniqueOutPtr<GstStructure> responseHeaders;
if (gst_structure_get(structure, "response-headers", GST_TYPE_STRUCTURE, &responseHeaders.outPtr(), nullptr)) {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- const char* contentLengthHeaderName = httpHeaderNameString(HTTPHeaderName::ContentLength).utf8().data();
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ CString contentLengthHeaderName = httpHeaderNameString(HTTPHeaderName::ContentLength).utf8();
</span> - uint64_t contentLength = 0;
+ guint64 contentLength = 0;
<span style='display:block; white-space:pre;background:#ffe0e0;'>- if (!gst_structure_get_uint64(responseHeaders.get(), contentLengthHeaderName, &contentLength)) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (!gst_structure_get_uint64(responseHeaders.get(), contentLengthHeaderName.data(), &contentLength)) {
</span> // souphttpsrc sets a string for Content-Length, so
// handle it here, until we remove the webkit+ protocol
<span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -3707,8 +3707,8 @@ Optional<VideoPlaybackQualityMetrics> MediaPlayerPrivateGStreamer::videoPlayback
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (!webkitGstCheckVersion(1, 17, 0) && !m_fpsSink)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return WTF::nullopt;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- uint64_t totalVideoFrames = 0;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- uint64_t droppedVideoFrames = 0;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ guint64 totalVideoFrames = 0;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ guint64 droppedVideoFrames = 0;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (webkitGstCheckVersion(1, 17, 0)) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ GUniqueOutPtr<GstStructure> stats;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ g_object_get(m_videoSink.get(), "stats", &stats.outPtr(), nullptr);
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/www/webkit2-gtk/files/patch-webkit2gtk-source-javascriptcore-tools-jsdollarvm-handle.diff b/www/webkit2-gtk/files/patch-webkit2gtk-source-javascriptcore-tools-jsdollarvm-handle.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index d4dffb6..0000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/www/webkit2-gtk/files/patch-webkit2gtk-source-javascriptcore-tools-jsdollarvm-handle.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,13 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git Source/JavaScriptCore/tools/JSDollarVM.cpp Source/JavaScriptCore/tools/JSDollarVM.cpp
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-index 92ffb85b..481763fa 100644
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- Source/JavaScriptCore/tools/JSDollarVM.cpp
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ Source/JavaScriptCore/tools/JSDollarVM.cpp
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -179,7 +179,7 @@ private:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- class ElementHandleOwner : public WeakHandleOwner {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- WTF_MAKE_FAST_ALLOCATED;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- public:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- bool isReachableFromOpaqueRoots(Handle<JSC::Unknown> handle, void*, SlotVisitor& visitor, const char** reason) override
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ bool isReachableFromOpaqueRoots(JSC::Handle<JSC::Unknown> handle, void*, SlotVisitor& visitor, const char** reason) override
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if (UNLIKELY(reason))
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- *reason = "JSC::Element is opaque root";
</span></pre><pre style='margin:0'>
</pre>