<pre style='margin:0'>
Christopher Nielsen (mascguy) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/a54af3f702c940d22aaf2820ee6f5aa860a8dd00">https://github.com/macports/macports-ports/commit/a54af3f702c940d22aaf2820ee6f5aa860a8dd00</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 a54af3f702c webkit2-gtk-devel: reconcile with webkit2-gtk
</span>a54af3f702c is described below
<span style='display:block; white-space:pre;color:#808000;'>commit a54af3f702c940d22aaf2820ee6f5aa860a8dd00
</span>Author: Christopher Nielsen <mascguy@github.com>
AuthorDate: Tue Aug 30 14:25:10 2022 -0400
<span style='display:block; white-space:pre;color:#404040;'> webkit2-gtk-devel: reconcile with webkit2-gtk
</span>---
www/webkit2-gtk-devel/Portfile | 52 +++++++++++------
.../files/NSApplicationActivationPolicy.h | 4 --
.../files/NSApplicationActivationPolicy.mm | 10 ----
.../files/patch-WTF-wtf-getVTablePointer.diff | 37 ++++++++++++
.../files/patch-bool_narrowed.diff | 11 ++++
.../files/patch-bundle-link-webcore.diff | 8 +--
.../patch-enable-plugin-architecture-unix.diff | 2 +-
www/webkit2-gtk-devel/files/patch-sources-gtk.diff | 13 -----
.../files/patch-web-process-main.diff | 18 ------
.../patch-webkit2gtk-2282-os-log-availability.diff | 22 +++++++
...ch-webkit2gtk-2282-unprotected-egl-changes.diff | 68 ++++++++++++++++++++++
.../files/patch-webkit2gtk-272-macports.diff | 17 ++----
.../files/patch-webkit2gtk-macports.diff | 29 +++++----
.../patch-webkit2gtk-specify-installed-dylibs.diff | 29 +++++++++
.../files/process-executable-path.diff | 30 ----------
15 files changed, 223 insertions(+), 127 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 bc8646756a0..f93749b0b1f 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,14 +7,17 @@
</span> PortSystem 1.0
PortGroup active_variants 1.1
PortGroup cmake 1.1
<span style='display:block; white-space:pre;background:#e0ffe0;'>+PortGroup legacysupport 1.1
</span>
compiler.cxx_standard 2017
cmake.generator Ninja
<span style='display:block; white-space:pre;background:#e0ffe0;'>+# Fix compilation for Angle subproject: platform.h: error: 'TARGET_OS_OSX' is not defined
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+legacysupport.newest_darwin_requires_legacy 15
</span>
name webkit2-gtk-devel
conflicts webkit2-gtk
<span style='display:block; white-space:pre;background:#ffe0e0;'>-version 2.27.3
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 3
</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,13 +33,14 @@ distname webkitgtk-${version}
</span>
dist_subdir webkit-gtk
<span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums rmd160 b297a1aaae881d702d4b95f15fffc261c2608087 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 5390d0b41957834202893887f1ac04e3264b6a3d98160d4166e3c8c16bdb7492 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 20912420
</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 \
port:gtk-doc \
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:perl5.34 \
</span> port:pkgconfig \
port:python27 \
port:py27-simplejson
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -60,6 +64,7 @@ depends_lib-append port:atk \
</span> path:lib/pkgconfig/harfbuzz-icu.pc:harfbuzz-icu \
port:hyphen \
port:icu \
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ path:include/turbojpeg.h:libjpeg-turbo \
</span> port:libnotify \
port:libpng \
port:libsecret \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -82,6 +87,12 @@ patchfiles-append patch-webkit2gtk-macports.diff
</span> # and a few more for webkit2-gtk-2.27.2
patchfiles-append patch-webkit2gtk-272-macports.diff
<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><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# os log is only available on newer systems.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+patchfiles-append patch-webkit2gtk-2282-os-log-availability.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> # enable Netscape plugin architecture on macOS
# or can be explicitly disabled with the following addition if preferred
# configure.args-append -DENABLE_NETSCAPE_PLUGIN_API=OFF
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -91,15 +102,17 @@ 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;'>-# allow the webkit executables typically located in libexec to be
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# dynamically located, this is useful for app bundling
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-patchfiles-append process-executable-path.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# Fix incompatibility with XCode 12:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# https://bugs.webkit.org/show_bug.cgi?id=207871
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+patchfiles-append patch-WTF-wtf-getVTablePointer.diff
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-# add new sources for NSApplicationActivationPolicy.mm
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-patchfiles-append patch-sources-gtk.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# Fix build errors due to -WWc++11-narrowing
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# https://bugs.webkit.org/show_bug.cgi?id=211193
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+patchfiles-append patch-bool_narrowed.diff
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-# patch web process to add call to SetActivationPolicyProhibited
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-patchfiles-append patch-web-process-main.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# Explicitly specify installed dylib paths to g-ir-compile
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# Fixes dlopen errors in apps using webkit2gtk introspection
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+patchfiles-append patch-webkit2gtk-specify-installed-dylibs.diff
</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;background:#e0e0e0;'>@@ -109,7 +122,8 @@ configure.args-append \
</span> -DENABLE_INTROSPECTION=ON \
-DENABLE_MINIBROWSER=OFF \
-DENABLE_VIDEO=ON \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- -DUSE_SYSTEM_MALLOC=OFF
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DUSE_SYSTEM_MALLOC=OFF \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DPERL_EXECUTABLE=${prefix}/bin/perl5.34
</span>
pre-configure {
if {![variant_isset quartz] && ![variant_isset x11]} {
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -117,11 +131,6 @@ pre-configure {
</span> }
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-post-patch {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- file copy ${filespath}/NSApplicationActivationPolicy.h ${worksrcpath}/Source/WebKit/WebProcess/gtk/NSApplicationActivationPolicy.h
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- file copy ${filespath}/NSApplicationActivationPolicy.mm ${worksrcpath}/Source/WebKit/WebProcess/gtk/NSApplicationActivationPolicy.mm
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> if {![variant_isset quartz]} {
default_variants-append +x11
}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -170,6 +179,11 @@ variant minibrowser description {Build and install MiniBrowser (for testing)} {
</span> # help wanted, if suitably motivated
universal_variant no
<span style='display:block; white-space:pre;background:#e0ffe0;'>+# Fix builds if ccache happens to be installed when configure.ccache=no
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+if {![option configure.ccache]} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ build.env-append CCACHE_DIR=${workpath}/.ccache
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> # the above code presently builds as-in on 10.13 and up
if {${os.platform} eq "darwin" && ${os.major} <= 16} {
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -178,7 +192,7 @@ if {${os.platform} eq "darwin" && ${os.major} <= 16} {
</span> patchfiles-append patch-ramsize.diff
# Source/WTF/wtf/unix/CPUTimeUnix.cpp : add back a previous Darwin compat version
<span style='display:block; white-space:pre;background:#ffe0e0;'>- patchfiles-append patch-source-wtf-wtf-unix-cputimeunix-cpp-darwin-version-restore.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patchfiles-append patch-source-wtf-wtf-unix-cputimeunix-cpp-darwin-version-restore.diff
</span>
# some Darwin versions don't have MAP_JIT; only use it if available
patchfiles-append patch-source-wtf-wtf-osallocatorposix-cpp-map-jit.diff
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/www/webkit2-gtk-devel/files/NSApplicationActivationPolicy.h b/www/webkit2-gtk-devel/files/NSApplicationActivationPolicy.h
</span>deleted file mode 100755
<span style='display:block; white-space:pre;color:#808080;'>index 728594282ca..00000000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/www/webkit2-gtk-devel/files/NSApplicationActivationPolicy.h
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,4 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-// This is the C "trampoline" function that will be used
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-// to invoke a specific Objective-C method FROM C++
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-void SetActivationPolicyProhibited ();
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/www/webkit2-gtk-devel/files/NSApplicationActivationPolicy.mm b/www/webkit2-gtk-devel/files/NSApplicationActivationPolicy.mm
</span>deleted file mode 100755
<span style='display:block; white-space:pre;color:#808080;'>index ce1d75c141b..00000000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/www/webkit2-gtk-devel/files/NSApplicationActivationPolicy.mm
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,10 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-#include "config.h"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-#import "NSApplicationActivationPolicy.h"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-#import <AppKit/AppKit.h>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-// C "trampoline" function to invoke Objective-C method
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-void SetActivationPolicyProhibited ()
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-{
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- [NSApp setActivationPolicy: NSApplicationActivationPolicyProhibited];
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- return;
</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-devel/files/patch-WTF-wtf-getVTablePointer.diff b/www/webkit2-gtk-devel/files/patch-WTF-wtf-getVTablePointer.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..1aae3e8c964
</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-getVTablePointer.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,37 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git Source/WTF/wtf/PointerPreparations.h Source/WTF/wtf/PointerPreparations.h
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index ef20a5e48512..ef9495169ff4 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- Source/WTF/wtf/PointerPreparations.h
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ Source/WTF/wtf/PointerPreparations.h
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -34,16 +34,16 @@ namespace WTF {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #if COMPILER_HAS_CLANG_BUILTIN(__builtin_get_vtable_pointer)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ template<typename T>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-ALWAYS_INLINE void* getVTablePointer(T* o) { return __builtin_get_vtable_pointer(o); }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ALWAYS_INLINE const void* getVTablePointer(T* o) { return __builtin_get_vtable_pointer(o); }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #else // not COMPILER_HAS_CLANG_BUILTIN(__builtin_get_vtable_pointer)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #if CPU(ARM64E)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ template<typename T>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-ALWAYS_INLINE void* getVTablePointer(T* o) { return __builtin_ptrauth_auth(*(reinterpret_cast<void**>(o)), ptrauth_key_cxx_vtable_pointer, 0); }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ALWAYS_INLINE const void* getVTablePointer(T* o) { return __builtin_ptrauth_auth(*(reinterpret_cast<void**>(o)), ptrauth_key_cxx_vtable_pointer, 0); }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #else // not CPU(ARM64E)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ template<typename T>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-ALWAYS_INLINE void* getVTablePointer(T* o) { return (*(reinterpret_cast<void**>(o))); }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ALWAYS_INLINE const void* getVTablePointer(T* o) { return (*(reinterpret_cast<void**>(o))); }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #endif // not CPU(ARM64E)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #endif // not COMPILER_HAS_CLANG_BUILTIN(__builtin_get_vtable_pointer)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git Source/WebCore/bindings/scripts/CodeGeneratorJS.pm Source/WebCore/bindings/scripts/CodeGeneratorJS.pm
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 35db4d28ccd6..03dd9c161a83 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- Source/WebCore/bindings/scripts/CodeGeneratorJS.pm
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ Source/WebCore/bindings/scripts/CodeGeneratorJS.pm
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -4881,7 +4881,7 @@ END
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ push(@implContent, <<END) if $vtableNameGnu;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #if ENABLE(BINDING_INTEGRITY)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- void* actualVTablePointer = getVTablePointer(impl.ptr());
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ const void* actualVTablePointer = getVTablePointer(impl.ptr());
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #if PLATFORM(WIN)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ void* expectedVTablePointer = ${vtableRefWin};
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #else
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/www/webkit2-gtk-devel/files/patch-bool_narrowed.diff b/www/webkit2-gtk-devel/files/patch-bool_narrowed.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..b35c18fdb0b
</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-bool_narrowed.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/style/StyleResolver.cpp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ Source/WebCore/style/StyleResolver.cpp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -107,7 +107,7 @@ Resolver::Resolver(Document& document)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (view)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ m_mediaQueryEvaluator = MediaQueryEvaluator { view->mediaType() };
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ else
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- m_mediaQueryEvaluator = MediaQueryEvaluator { "all" };
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ m_mediaQueryEvaluator = MediaQueryEvaluator { "all", false };
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (root) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ m_rootDefaultStyle = styleForElement(*root, m_document.renderStyle(), nullptr, RuleMatchingBehavior::MatchOnlyUserAgentRules).renderStyle;
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/www/webkit2-gtk-devel/files/patch-bundle-link-webcore.diff b/www/webkit2-gtk-devel/files/patch-bundle-link-webcore.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index 39c2fb3fc53..454ff9cb2ac 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/www/webkit2-gtk-devel/files/patch-bundle-link-webcore.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/www/webkit2-gtk-devel/files/patch-bundle-link-webcore.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;'>---- Source/WebKit/PlatformGTK.cmake.orig 2017-09-29 02:02:31.000000000 +0800
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ Source/WebKit/PlatformGTK.cmake 2017-09-29 02:02:53.000000000 +0800
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -1092,7 +1092,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- Source/WebKit/PlatformGTK.cmake.orig 2020-02-04 02:24:08.000000000 -0800
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ Source/WebKit/PlatformGTK.cmake 2022-08-23 16:17:18.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -576,7 +576,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Commands for building the built-in injected bundle.
</span> add_library(webkit2gtkinjectedbundle MODULE "${WEBKIT_DIR}/WebProcess/InjectedBundle/API/glib/WebKitInjectedBundleMain.cpp")
ADD_WEBKIT_PREFIX_HEADER(webkit2gtkinjectedbundle)
-target_link_libraries(webkit2gtkinjectedbundle WebKit)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/www/webkit2-gtk-devel/files/patch-enable-plugin-architecture-unix.diff b/www/webkit2-gtk-devel/files/patch-enable-plugin-architecture-unix.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index c4b01c04f8b..8f4401906d7 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/www/webkit2-gtk-devel/files/patch-enable-plugin-architecture-unix.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/www/webkit2-gtk-devel/files/patch-enable-plugin-architecture-unix.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,6 +1,6 @@
</span> --- Source/WebKit/config.h.orig 2018-06-13 23:57:05.000000000 +0800
+++ Source/WebKit/config.h 2018-06-13 23:59:35.000000000 +0800
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -55,10 +55,10 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -49,10 +49,10 @@
</span> #endif
#ifndef PLUGIN_ARCHITECTURE_UNSUPPORTED
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/www/webkit2-gtk-devel/files/patch-sources-gtk.diff b/www/webkit2-gtk-devel/files/patch-sources-gtk.diff
</span>deleted file mode 100755
<span style='display:block; white-space:pre;color:#808080;'>index 450ffe33e34..00000000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/www/webkit2-gtk-devel/files/patch-sources-gtk.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;'>---- Source/WebKit/PlatformGTK.cmake.orig 2019-11-08 10:28:00.000000000 +0100
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ Source/WebKit/PlatformGTK.cmake 2020-07-21 15:22:28.000000000 +0200
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -32,6 +32,10 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- "SourcesGTK.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;'>-+find_library(APPKIT_FRAMEWORK NAMES AppKit)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+target_link_libraries(WebKit PRIVATE ${APPKIT_FRAMEWORK})
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+list(APPEND WebKit_SOURCES WebProcess/gtk/NSApplicationActivationPolicy.mm)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- list(APPEND WebKit_MESSAGES_IN_FILES
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- UIProcess/ViewGestureController.messages.in
</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-devel/files/patch-web-process-main.diff b/www/webkit2-gtk-devel/files/patch-web-process-main.diff
</span>deleted file mode 100755
<span style='display:block; white-space:pre;color:#808080;'>index c004732578e..00000000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/www/webkit2-gtk-devel/files/patch-web-process-main.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,18 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- Source/WebKit/WebProcess/gtk/WebProcessMainGtk.cpp.orig 2020-07-21 13:09:21.000000000 +0200
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ Source/WebKit/WebProcess/gtk/WebProcessMainGtk.cpp 2020-07-21 15:27:56.000000000 +0200
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -33,6 +33,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include <gtk/gtk.h>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include <libintl.h>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include <libsoup/soup.h>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#include "NSApplicationActivationPolicy.h"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #if PLATFORM(X11)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include <X11/Xlib.h>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -57,6 +58,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- bindtextdomain(GETTEXT_PACKAGE, LOCALEDIR);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- bind_textdomain_codeset(GETTEXT_PACKAGE, "UTF-8");
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ SetActivationPolicyProhibited ();
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- return true;
</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-devel/files/patch-webkit2gtk-2282-os-log-availability.diff b/www/webkit2-gtk-devel/files/patch-webkit2gtk-2282-os-log-availability.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..9c12d69184d
</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-2282-os-log-availability.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,22 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git Source/ThirdParty/ANGLE/src/common/debug.cpp Source/ThirdParty/ANGLE/src/common/debug.cpp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index c26815d3..b07914be 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- Source/ThirdParty/ANGLE/src/common/debug.cpp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ Source/ThirdParty/ANGLE/src/common/debug.cpp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -21,7 +21,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # include <android/log.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#if defined(ANGLE_PLATFORM_APPLE)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#if defined(ANGLE_PLATFORM_APPLE) && MAC_OS_X_VERSION_MAX_ALLOWED > 101200
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # include <os/log.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;'>+@@ -232,7 +232,7 @@ void Trace(LogSeverity severity, const char *message)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ __android_log_print(android_priority, "ANGLE", "%s: %s\n", LogSeverityName(severity),
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ str.c_str());
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#elif defined(ANGLE_PLATFORM_APPLE)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#elif defined(ANGLE_PLATFORM_APPLE) && MAC_OS_X_VERSION_MAX_ALLOWED > 101200
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (__builtin_available(macOS 10.12, iOS 10.0, *))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ os_log_type_t apple_log_type = OS_LOG_TYPE_DEFAULT;
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/www/webkit2-gtk-devel/files/patch-webkit2gtk-2282-unprotected-egl-changes.diff b/www/webkit2-gtk-devel/files/patch-webkit2gtk-2282-unprotected-egl-changes.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..6c35a2c3b4a
</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-2282-unprotected-egl-changes.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,68 @@
</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;'>+
</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-devel/files/patch-webkit2gtk-272-macports.diff b/www/webkit2-gtk-devel/files/patch-webkit2gtk-272-macports.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index 1c392419bd2..1acbf10ec3a 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/www/webkit2-gtk-devel/files/patch-webkit2gtk-272-macports.diff
</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;'>@@ -44,16 +44,7 @@ diff --git Source/WebKit/UIProcess/API/glib/WebKitProtocolHandler.cpp Source/Web
</span> index 57e8a557..45df4cf6 100644
--- ./Source/WebKit/UIProcess/API/glib/WebKitProtocolHandler.cpp.orig 2019-11-22 04:57:54.000000000 -0800
+++ ./Source/WebKit/UIProcess/API/glib/WebKitProtocolHandler.cpp 2019-11-27 05:52:39.000000000 -0800
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -273,7 +273,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- " <td><div class=\"titlename\">Type</div></td>"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- " <td>%s</td>"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- " </tbody></tr>",
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- PlatformDisplay::sharedDisplay().type() == PlatformDisplay::Type::Wayland ? "Wayland" : "X11");
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ "X11");
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- auto rect = IntRect(screenRect(nullptr));
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -333,9 +333,10 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -354,9 +354,10 @@
</span> " </tbody></tr>",
webGLEnabled(request) ? "Yes" : "No");
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -65,7 +56,7 @@ index 57e8a557..45df4cf6 100644
</span> g_string_append_printf(html,
" <tbody><tr>"
" <td><div class=\"titlename\">API</div></td>"
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -349,7 +350,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -370,7 +371,7 @@
</span> " <td>%s</td>"
" </tbody></tr>",
nativeInterface());
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -74,7 +65,7 @@ index 57e8a557..45df4cf6 100644
</span> g_string_append_printf(html,
" <tbody><tr>"
" <td><div class=\"titlename\">GL_RENDERER</div></td>"
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -377,7 +378,6 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -398,7 +399,6 @@
</span> " <td>%s</td>"
" </tbody></tr>",
reinterpret_cast<const char*>(glGetString(GL_SHADING_LANGUAGE_VERSION)));
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -82,7 +73,7 @@ index 57e8a557..45df4cf6 100644
</span> #if USE(OPENGL_ES)
g_string_append_printf(html,
" <tbody><tr>"
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -402,6 +402,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -423,6 +423,7 @@
</span> extensions->str);
g_string_free(extensions, TRUE);
#endif
<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><span style='display:block; white-space:pre;color:#808080;'>index e3823f01bdd..2bef47e1e2c 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/www/webkit2-gtk-devel/files/patch-webkit2gtk-macports.diff
</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;'>@@ -33,7 +33,7 @@ diff --git Source/WebCore/CMakeLists.txt Source/WebCore/CMakeLists.txt
</span> index a5b62f40..440ef671 100644
--- Source/WebCore/CMakeLists.txt
+++ Source/WebCore/CMakeLists.txt
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -173,6 +173,10 @@ set(WebCore_SYSTEM_INCLUDE_DIRECTORIES
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -178,6 +178,10 @@ set(WebCore_SYSTEM_INCLUDE_DIRECTORIES
</span> ${ZLIB_INCLUDE_DIRS}
)
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -169,19 +169,7 @@ index 00000000..cf113819
</span> +#endif // !USE(APPLE_INTERNAL_SDK)
--- Source/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamer.cpp.orig 2019-11-26 03:02:20.000000000 -0800
+++ Source/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamer.cpp 2019-11-26 14:56:04.000000000 -0800
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -153,9 +153,9 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- // gstglapi.h may include eglplatform.h and it includes X.h, which
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- // defines None, breaking MediaPlayer::None enum
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--#if PLATFORM(X11) && GST_GL_HAVE_PLATFORM_EGL
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#if PLATFORM(X11)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #undef None
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--#endif // PLATFORM(X11) && GST_GL_HAVE_PLATFORM_EGL
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#endif // PLATFORM(X11)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include "VideoTextureCopierGStreamer.h"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #endif // USE(GSTREAMER_GL)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -795,7 +795,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1504,7 +1504,7 @@
</span> if (GST_STATE(m_pipeline.get()) < GST_STATE_PAUSED)
return MediaTime::invalidTime();
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -190,7 +178,7 @@ index 00000000..cf113819
</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;'>-@@ -2332,7 +2332,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -2267,7 +2267,7 @@
</span> GUniqueOutPtr<GstStructure> responseHeaders;
if (gst_structure_get(structure, "response-headers", GST_TYPE_STRUCTURE, &responseHeaders.outPtr(), nullptr)) {
CString contentLengthHeaderName = httpHeaderNameString(HTTPHeaderName::ContentLength).utf8();
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -199,3 +187,14 @@ index 00000000..cf113819
</span> if (!gst_structure_get_uint64(responseHeaders.get(), contentLengthHeaderName.data(), &contentLength)) {
// 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-devel/files/patch-webkit2gtk-specify-installed-dylibs.diff b/www/webkit2-gtk-devel/files/patch-webkit2gtk-specify-installed-dylibs.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..4835e65a084
</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-specify-installed-dylibs.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,29 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- Source/WebKit/PlatformGTK.cmake.orig 2022-08-26 16:20:42.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ Source/WebKit/PlatformGTK.cmake 2022-08-26 16:48:49.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -727,13 +727,13 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ add_custom_command(
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ OUTPUT ${CMAKE_BINARY_DIR}/WebKit2-${WEBKITGTK_API_VERSION}.typelib
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ DEPENDS ${CMAKE_BINARY_DIR}/WebKit2-${WEBKITGTK_API_VERSION}.gir
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- COMMAND ${INTROSPECTION_COMPILER} --includedir=${CMAKE_BINARY_DIR} ${CMAKE_BINARY_DIR}/WebKit2-${WEBKITGTK_API_VERSION}.gir -o ${CMAKE_BINARY_DIR}/WebKit2-${WEBKITGTK_API_VERSION}.typelib
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ COMMAND ${INTROSPECTION_COMPILER} --includedir=${CMAKE_BINARY_DIR} ${CMAKE_BINARY_DIR}/WebKit2-${WEBKITGTK_API_VERSION}.gir -o ${CMAKE_BINARY_DIR}/WebKit2-${WEBKITGTK_API_VERSION}.typelib --shared-library=${CMAKE_INSTALL_NAME_DIR}/libwebkit2gtk-${WEBKITGTK_API_VERSION}.dylib
</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;'>+ add_custom_command(
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ OUTPUT ${CMAKE_BINARY_DIR}/WebKit2WebExtension-${WEBKITGTK_API_VERSION}.typelib
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ DEPENDS ${CMAKE_BINARY_DIR}/WebKit2WebExtension-${WEBKITGTK_API_VERSION}.gir
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- COMMAND ${INTROSPECTION_COMPILER} --includedir=${CMAKE_BINARY_DIR} ${CMAKE_BINARY_DIR}/WebKit2WebExtension-${WEBKITGTK_API_VERSION}.gir -o ${CMAKE_BINARY_DIR}/WebKit2WebExtension-${WEBKITGTK_API_VERSION}.typelib
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ COMMAND ${INTROSPECTION_COMPILER} --includedir=${CMAKE_BINARY_DIR} ${CMAKE_BINARY_DIR}/WebKit2WebExtension-${WEBKITGTK_API_VERSION}.gir -o ${CMAKE_BINARY_DIR}/WebKit2WebExtension-${WEBKITGTK_API_VERSION}.typelib --shared-library=${CMAKE_INSTALL_NAME_DIR}/libwebkit2gtk-${WEBKITGTK_API_VERSION}.dylib
</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;'>+ ADD_TYPELIB(${CMAKE_BINARY_DIR}/WebKit2-${WEBKITGTK_API_VERSION}.typelib)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- Source/JavaScriptCore/PlatformGTK.cmake.orig 2022-08-26 16:56:19.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ Source/JavaScriptCore/PlatformGTK.cmake 2022-08-26 16:58:25.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -101,7 +101,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ add_custom_command(
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ OUTPUT ${CMAKE_BINARY_DIR}/JavaScriptCore-${WEBKITGTK_API_VERSION}.typelib
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ DEPENDS ${CMAKE_BINARY_DIR}/JavaScriptCore-${WEBKITGTK_API_VERSION}.gir
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- COMMAND ${INTROSPECTION_COMPILER} --includedir=${CMAKE_BINARY_DIR} ${CMAKE_BINARY_DIR}/JavaScriptCore-${WEBKITGTK_API_VERSION}.gir -o ${CMAKE_BINARY_DIR}/JavaScriptCore-${WEBKITGTK_API_VERSION}.typelib
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ COMMAND ${INTROSPECTION_COMPILER} --includedir=${CMAKE_BINARY_DIR} ${CMAKE_BINARY_DIR}/JavaScriptCore-${WEBKITGTK_API_VERSION}.gir -o ${CMAKE_BINARY_DIR}/JavaScriptCore-${WEBKITGTK_API_VERSION}.typelib --shared-library=${CMAKE_INSTALL_NAME_DIR}/libjavascriptcoregtk-${WEBKITGTK_API_VERSION}.dylib
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ VERBATIM
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ )
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/www/webkit2-gtk-devel/files/process-executable-path.diff b/www/webkit2-gtk-devel/files/process-executable-path.diff
</span>deleted file mode 100755
<span style='display:block; white-space:pre;color:#808080;'>index 972b33910ec..00000000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/www/webkit2-gtk-devel/files/process-executable-path.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,30 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- Source/WebKit/Shared/glib/ProcessExecutablePathGLib.cpp.orig 2019-02-18 10:10:26.000000000 +0100
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ Source/WebKit/Shared/glib/ProcessExecutablePathGLib.cpp 2020-05-22 14:17:01.000000000 +0200
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -33,7 +33,6 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- namespace WebKit {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--#if ENABLE(DEVELOPER_MODE)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- static String getExecutablePath()
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- CString executablePath = getCurrentExecutablePath();
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -41,11 +40,9 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- return FileSystem::directoryName(FileSystem::stringFromFileSystemRepresentation(executablePath.data()));
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- return { };
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--#endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- static String findWebKitProcess(const char* processName)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--#if ENABLE(DEVELOPER_MODE)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- static const char* execDirectory = g_getenv("WEBKIT_EXEC_PATH");
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if (execDirectory) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- String processPath = FileSystem::pathByAppendingComponent(FileSystem::stringFromFileSystemRepresentation(execDirectory), processName);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -59,7 +56,6 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if (FileSystem::fileExists(processPath))
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- return processPath;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--#endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- return FileSystem::pathByAppendingComponent(FileSystem::stringFromFileSystemRepresentation(PKGLIBEXECDIR), processName);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span></pre><pre style='margin:0'>
</pre>