<pre style='margin:0'>
David B. Evans (dbevans) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/544f91da74cd849930879373a6147aa7e563981f">https://github.com/macports/macports-ports/commit/544f91da74cd849930879373a6147aa7e563981f</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 544f91da74c webkit2-gtk: rebase existing patches
</span>544f91da74c is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 544f91da74cd849930879373a6147aa7e563981f
</span>Author: David B. Evans <devans@macports.org>
AuthorDate: Tue Aug 23 16:25:16 2022 -0700
<span style='display:block; white-space:pre;color:#404040;'> webkit2-gtk: rebase existing patches
</span>---
www/webkit2-gtk/files/patch-bundle-link-webcore.diff | 8 ++++----
www/webkit2-gtk/files/patch-enable-plugin-architecture-unix.diff | 2 +-
www/webkit2-gtk/files/patch-webkit2gtk-272-macports.diff | 8 ++++----
www/webkit2-gtk/files/patch-webkit2gtk-macports.diff | 6 +++---
4 files changed, 12 insertions(+), 12 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/www/webkit2-gtk/files/patch-bundle-link-webcore.diff b/www/webkit2-gtk/files/patch-bundle-link-webcore.diff
</span><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/files/patch-bundle-link-webcore.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/www/webkit2-gtk/files/patch-bundle-link-webcore.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -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/files/patch-enable-plugin-architecture-unix.diff b/www/webkit2-gtk/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/files/patch-enable-plugin-architecture-unix.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/www/webkit2-gtk/files/patch-enable-plugin-architecture-unix.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -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/files/patch-webkit2gtk-272-macports.diff b/www/webkit2-gtk/files/patch-webkit2gtk-272-macports.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index e76deffbf51..1acbf10ec3a 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/www/webkit2-gtk/files/patch-webkit2gtk-272-macports.diff
</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;'>@@ -44,7 +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;'>-@@ -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;'>@@ -56,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;'>@@ -65,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;'>@@ -73,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/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 bebb52b4926..2bef47e1e2c 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;'>@@ -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,7 +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;'>-@@ -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;'>@@ -178,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();
</pre><pre style='margin:0'>
</pre>