<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/26758bf93b6ae4277423e4ce3b4dcf334c6ccad2">https://github.com/macports/macports-ports/commit/26758bf93b6ae4277423e4ce3b4dcf334c6ccad2</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit 26758bf93b6ae4277423e4ce3b4dcf334c6ccad2
</span>Author: Kirill A. Korinsky <kirill@korins.ky>
AuthorDate: Tue Sep 6 13:34:10 2022 +0200
<span style='display:block; white-space:pre;color:#404040;'> webkit-gtk: fix build with glibc 2.68+
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> This fix is backported to webkit-gtk-2.0 without testing
</span>---
www/webkit-gtk-2.0/Portfile | 13 ++--
www/webkit-gtk-2.0/files/glibc-2.68.patch | 116 ++++++++++++++++++++++++++++++
www/webkit-gtk-2.0/files/gtk-doc.patch | 19 +++++
www/webkit-gtk/Portfile | 12 ++--
www/webkit-gtk/files/glibc-2.68.patch | 116 ++++++++++++++++++++++++++++++
5 files changed, 266 insertions(+), 10 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/www/webkit-gtk-2.0/Portfile b/www/webkit-gtk-2.0/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index f78be8b340e..1c98eff9919 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/www/webkit-gtk-2.0/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/www/webkit-gtk-2.0/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -7,7 +7,7 @@ PortGroup compiler_blacklist_versions 1.0
</span>
name webkit-gtk-2.0
version 2.0.4
<span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 10
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 11
</span> description Apple's WebKit HTML rendering library for GTK+
long_description ${description}
maintainers nomaintainer
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -24,7 +24,8 @@ dist_subdir webkit-gtk
</span>
checksums sha1 3b9ddbdc61e38b5c8fdd108e891b7db5fb12d55a \
rmd160 19643cac3f53928757a7c3fe8ea33f144a581456 \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 bd1550b7f6e1a55f803efe7d64438163ff6c04f02186002cb81d0c090aac734f
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 bd1550b7f6e1a55f803efe7d64438163ff6c04f02186002cb81d0c090aac734f \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 9849620
</span>
depends_lib \
path:lib/pkgconfig/glib-2.0.pc:glib2 \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -60,6 +61,7 @@ depends_build \
</span> patchfiles \
clang-assertions.patch \
case-insensitive.patch \
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ gtk-doc.patch \
</span> our-icu.patch \
execinfo.patch \
ruby-1.8.patch \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -68,7 +70,8 @@ patchfiles \
</span> tiger.patch \
quartz-webcore.patch \
patch-freetype-includes.diff \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- bison3.patch
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ bison3.patch \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ glibc-2.68.patch
</span>
conflicts_build google-test
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -126,7 +129,7 @@ subport webkit-gtk3-2.0 {
</span> }
if {${name} eq ${subport}} {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- conflicts webkit-gtk webkit-gtk-devel
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ conflicts webkit-gtk
</span>
depends_lib-append path:lib/pkgconfig/gtk+-2.0.pc:gtk2
configure.args-append --with-gtk=2.0
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -139,7 +142,7 @@ configure.universal_args-delete --disable-dependency-tracking
</span> # clang 3.4+ fail (error: no template named 'allocateCell'; did you mean 'validateCell' (https://trac.macports.org/ticket/43987))
# Ideally we'd just do this, but https://trac.macports.org/ticket/51549
# compiler.whitelist {clang >= 300 <= 503} macports-clang-3.3
<span style='display:block; white-space:pre;background:#ffe0e0;'>-compiler.blacklist-append *gcc*
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+compiler.blacklist-append *gcc*
</span> compiler.blacklist-append {clang < 300} {clang > 503}
compiler.blacklist-append macports-clang-3.4 macports-clang-3.7
compiler.fallback-append macports-clang-3.3
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/www/webkit-gtk-2.0/files/glibc-2.68.patch b/www/webkit-gtk-2.0/files/glibc-2.68.patch
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..ffa0c8d733e
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/www/webkit-gtk-2.0/files/glibc-2.68.patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,116 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- ./Source/WTF/wtf/gobject/GRefPtr.h.orig 2022-09-06 01:44:06.000000000 +0200
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ ./Source/WTF/wtf/gobject/GRefPtr.h 2022-09-06 01:44:18.000000000 +0200
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -28,9 +28,8 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <wtf/RefPtr.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <algorithm>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#include <glib-object.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#include <glib.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-extern "C" void g_object_unref(gpointer);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-extern "C" gpointer g_object_ref_sink(gpointer);
</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;'>+ enum GRefPtrAdoptType { GRefPtrAdopt };
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- ./Source/WebKit/gtk/GNUmakefile.am.orig 2022-09-06 02:17:35.000000000 +0200
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ ./Source/WebKit/gtk/GNUmakefile.am 2022-09-06 02:19:21.000000000 +0200
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -183,7 +183,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ webkitgtk_built_sources += \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ DerivedSources/webkit/webkitenumtypes.cpp \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ DerivedSources/webkit/webkitenumtypes.h \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- DerivedSources/webkit/webkitmarshal.cpp \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ DerivedSources/webkit/webkitmarshal.c \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ DerivedSources/webkit/webkitmarshal.h \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ $(webkitgtk_built_h_api)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -346,15 +346,13 @@
</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;'>+ WEBKIT_MARSHAL_LIST = $(WebKit)/webkitmarshal.list
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-$(GENSOURCES_WEBKIT)/webkitmarshal.cpp: stamp-webkitmarshal.cpp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++$(GENSOURCES_WEBKIT)/webkitmarshal.c: stamp-webkitmarshal.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ @true
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ $(GENSOURCES_WEBKIT)/webkitmarshal.h: stamp-webkitmarshal.h
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ @true
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-stamp-webkitmarshal.cpp: $(WEBKIT_MARSHAL_LIST)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- $(AM_V_GEN) echo "extern \"C\" {" > $(GENSOURCES_WEBKIT)/webkitmarshal.cpp && \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- $(GLIB_GENMARSHAL) --prefix=webkit_marshal $(WEBKIT_MARSHAL_LIST) --body >> $(GENSOURCES_WEBKIT)/webkitmarshal.cpp && \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- echo '}' >> $(GENSOURCES_WEBKIT)/webkitmarshal.cpp && \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++stamp-webkitmarshal.c: $(WEBKIT_MARSHAL_LIST)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ $(GLIB_GENMARSHAL) --prefix=webkit_marshal $(WEBKIT_MARSHAL_LIST) --body > $(GENSOURCES_WEBKIT)/webkitmarshal.c && \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ echo timestamp > $(@F)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ stamp-webkitmarshal.h: $(WEBKIT_MARSHAL_LIST)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -414,7 +412,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Files that will be cleaned
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ CLEANFILES += \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ $(BUILT_SOURCES) \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- $(top_builddir)/stamp-webkitmarshal.cpp \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ $(top_builddir)/stamp-webkitmarshal.c \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ $(top_builddir)/stamp-webkitmarshal.h \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ $(top_builddir)/stamp-webkitenumtypes.cpp \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ $(top_builddir)/stamp-webkitenumtypes.h \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- ./Source/WebKit2/GNUmakefile.am.orig 2022-09-06 02:20:35.000000000 +0200
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ ./Source/WebKit2/GNUmakefile.am 2022-09-06 02:21:21.000000000 +0200
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -490,15 +490,13 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ WEBKIT2_MARSHAL_LIST = $(WebKit2)/UIProcess/API/gtk/webkit2marshal.list
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-$(GENSOURCES_WEBKIT2)/webkit2gtk/webkit2/WebKitMarshal.cpp: stamp-webkit2marshal.cpp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++$(GENSOURCES_WEBKIT2)/webkit2gtk/webkit2/WebKitMarshal.c: stamp-webkit2marshal.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ @true
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ $(GENSOURCES_WEBKIT2)/webkit2gtk/webkit2/WebKitMarshal.h: stamp-webkit2marshal.h
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ @true
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-stamp-webkit2marshal.cpp: $(WEBKIT2_MARSHAL_LIST)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- $(AM_V_GEN) echo "extern \"C\" {" > $(webkit2gtk_built_headers_dir)/WebKitMarshal.cpp && \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- $(GLIB_GENMARSHAL) --prefix=webkit_marshal $(WEBKIT2_MARSHAL_LIST) --body >> $(webkit2gtk_built_headers_dir)/WebKitMarshal.cpp && \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- echo '}' >> $(webkit2gtk_built_headers_dir)/WebKitMarshal.cpp && \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++stamp-webkit2marshal.c: $(WEBKIT2_MARSHAL_LIST)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ $(GLIB_GENMARSHAL) --prefix=webkit_marshal $(WEBKIT2_MARSHAL_LIST) --body > $(webkit2gtk_built_headers_dir)/WebKitMarshal.c && \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ echo timestamp > $(@F)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ stamp-webkit2marshal.h: $(WEBKIT2_MARSHAL_LIST)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -508,7 +506,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ CLEANFILES += \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ $(BUILT_SOURCES) \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ $(top_builddir)/stamp-webkit2enumtypes \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- $(top_builddir)/stamp-webkit2marshal.cpp \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ $(top_builddir)/stamp-webkit2marshal.c \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ $(top_builddir)/stamp-webkit2marshal.h \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ $(top_builddir)/Programs/WebKitNetworkProcess \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ $(top_builddir)/Programs/WebKitWebProcess
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- ./Source/WebKit2/GNUmakefile.list.am.orig 2022-09-06 02:29:31.000000000 +0200
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ ./Source/WebKit2/GNUmakefile.list.am 2022-09-06 02:30:03.000000000 +0200
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -166,7 +166,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ webkit2gtk_built_sources += \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ DerivedSources/WebKit2/webkit2gtk/webkit2/WebKitEnumTypes.cpp \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ DerivedSources/WebKit2/webkit2gtk/webkit2/WebKitEnumTypes.h \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- DerivedSources/WebKit2/webkit2gtk/webkit2/WebKitMarshal.cpp \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ DerivedSources/WebKit2/webkit2gtk/webkit2/WebKitMarshal.c \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ DerivedSources/WebKit2/webkit2gtk/webkit2/WebKitMarshal.h \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ DerivedSources/WebKit2/webkit2gtk/webkit2/WebKitVersion.h
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- ./Source/WebCore/accessibility/atk/WebKitAccessibleHyperlink.cpp.orig 2022-09-06 12:15:54.000000000 +0200
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ ./Source/WebCore/accessibility/atk/WebKitAccessibleHyperlink.cpp 2022-09-06 12:16:13.000000000 +0200
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -390,7 +390,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ GType webkitAccessibleHyperlinkGetType()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- static volatile gsize typeVolatile = 0;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ static gsize typeVolatile = 0;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (g_once_init_enter(&typeVolatile)) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ static const GTypeInfo tinfo = {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- ./Source/WebCore/accessibility/atk/WebKitAccessibleWrapperAtk.cpp.orig 2022-09-06 12:17:42.000000000 +0200
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ ./Source/WebCore/accessibility/atk/WebKitAccessibleWrapperAtk.cpp 2022-09-06 12:17:55.000000000 +0200
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1015,7 +1015,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ GType
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ webkitAccessibleGetType(void)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- static volatile gsize typeVolatile = 0;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ static gsize typeVolatile = 0;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (g_once_init_enter(&typeVolatile)) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ static const GTypeInfo tinfo = {
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/www/webkit-gtk-2.0/files/gtk-doc.patch b/www/webkit-gtk-2.0/files/gtk-doc.patch
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..b9f5c869dbd
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/www/webkit-gtk-2.0/files/gtk-doc.patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,19 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Fix configure failure:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+gtkdocize: GTK_DOC_CHECK not called in ./configure.ac
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+https://aur.archlinux.org/cgit/aur.git/tree/gtk-doc.patch?h=webkitgtk
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- configure.ac.orig
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ configure.ac
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -36,6 +36,13 @@ AM_INIT_AUTOMAKE([foreign subdir-objects dist-xz no-dist-gzip tar-ustar])
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ AM_MAINTAINER_MODE([enable])
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ m4_include([Source/autotools/SetupAutomake.m4])
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++# check for gtk-doc
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++m4_ifdef([GTK_DOC_CHECK], [
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++GTK_DOC_CHECK([1.14],[--flavour no-tmpl])
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++],[
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++AM_CONDITIONAL([ENABLE_GTK_DOC], false)
</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;'>+ # Processing of configuration files
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ######################################################################################
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/www/webkit-gtk/Portfile b/www/webkit-gtk/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 885be66fe3e..ab1589ececc 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/www/webkit-gtk/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/www/webkit-gtk/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -11,7 +11,7 @@ PortGroup muniversal 1.0
</span> name webkit-gtk
epoch 2
version 2.4.11
<span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 4
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 5
</span> description Apple's WebKit HTML rendering library for GTK+
long_description ${description}
maintainers nomaintainer
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -27,7 +27,8 @@ distname webkitgtk-${version}
</span> dist_subdir webkit-gtk
checksums rmd160 e1f72498f911465f5ba152313dd9c62ae8d5eee6 \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 588aea051bfbacced27fdfe0335a957dca839ebe36aa548df39c7bbafdb65bf7
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 588aea051bfbacced27fdfe0335a957dca839ebe36aa548df39c7bbafdb65bf7 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 9869100
</span>
depends_build port:pkgconfig \
port:gtk-doc \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -78,7 +79,8 @@ patchfiles clang-assertions.patch \
</span> remove-cf-available.patch \
RenderThemeGtk2-toRenderBox.patch \
patch-icu_fix.diff \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- bison-3.7.patch
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ bison-3.7.patch \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ glibc-2.68.patch
</span>
conflicts_build google-test
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -86,7 +88,7 @@ compiler.cxx_standard 2011
</span>
# https://trac.macports.org/ticket/36329
configure.perl /usr/bin/perl
<span style='display:block; white-space:pre;background:#ffe0e0;'>-configure.python ${prefix}/bin/python2.7
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+configure.python ${prefix}/bin/python2.7
</span>
# --disable-webkit2: https://bugs.webkit.org/show_bug.cgi?id=126416
# --disable-web-audio: https://bugs.webkit.org/show_bug.cgi?id=126438
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -137,7 +139,7 @@ subport webkit-gtk3 {
</span> }
if {${name} eq ${subport}} {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- conflicts webkit-gtk-devel webkit-gtk-2.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ conflicts webkit-gtk-2.0
</span> depends_lib-append path:lib/pkgconfig/gtk+-2.0.pc:gtk2
configure.args-append --with-gtk=2.0
}
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/www/webkit-gtk/files/glibc-2.68.patch b/www/webkit-gtk/files/glibc-2.68.patch
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..ffa0c8d733e
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/www/webkit-gtk/files/glibc-2.68.patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,116 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- ./Source/WTF/wtf/gobject/GRefPtr.h.orig 2022-09-06 01:44:06.000000000 +0200
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ ./Source/WTF/wtf/gobject/GRefPtr.h 2022-09-06 01:44:18.000000000 +0200
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -28,9 +28,8 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <wtf/RefPtr.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <algorithm>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#include <glib-object.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#include <glib.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-extern "C" void g_object_unref(gpointer);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-extern "C" gpointer g_object_ref_sink(gpointer);
</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;'>+ enum GRefPtrAdoptType { GRefPtrAdopt };
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- ./Source/WebKit/gtk/GNUmakefile.am.orig 2022-09-06 02:17:35.000000000 +0200
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ ./Source/WebKit/gtk/GNUmakefile.am 2022-09-06 02:19:21.000000000 +0200
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -183,7 +183,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ webkitgtk_built_sources += \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ DerivedSources/webkit/webkitenumtypes.cpp \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ DerivedSources/webkit/webkitenumtypes.h \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- DerivedSources/webkit/webkitmarshal.cpp \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ DerivedSources/webkit/webkitmarshal.c \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ DerivedSources/webkit/webkitmarshal.h \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ $(webkitgtk_built_h_api)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -346,15 +346,13 @@
</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;'>+ WEBKIT_MARSHAL_LIST = $(WebKit)/webkitmarshal.list
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-$(GENSOURCES_WEBKIT)/webkitmarshal.cpp: stamp-webkitmarshal.cpp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++$(GENSOURCES_WEBKIT)/webkitmarshal.c: stamp-webkitmarshal.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ @true
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ $(GENSOURCES_WEBKIT)/webkitmarshal.h: stamp-webkitmarshal.h
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ @true
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-stamp-webkitmarshal.cpp: $(WEBKIT_MARSHAL_LIST)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- $(AM_V_GEN) echo "extern \"C\" {" > $(GENSOURCES_WEBKIT)/webkitmarshal.cpp && \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- $(GLIB_GENMARSHAL) --prefix=webkit_marshal $(WEBKIT_MARSHAL_LIST) --body >> $(GENSOURCES_WEBKIT)/webkitmarshal.cpp && \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- echo '}' >> $(GENSOURCES_WEBKIT)/webkitmarshal.cpp && \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++stamp-webkitmarshal.c: $(WEBKIT_MARSHAL_LIST)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ $(GLIB_GENMARSHAL) --prefix=webkit_marshal $(WEBKIT_MARSHAL_LIST) --body > $(GENSOURCES_WEBKIT)/webkitmarshal.c && \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ echo timestamp > $(@F)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ stamp-webkitmarshal.h: $(WEBKIT_MARSHAL_LIST)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -414,7 +412,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Files that will be cleaned
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ CLEANFILES += \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ $(BUILT_SOURCES) \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- $(top_builddir)/stamp-webkitmarshal.cpp \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ $(top_builddir)/stamp-webkitmarshal.c \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ $(top_builddir)/stamp-webkitmarshal.h \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ $(top_builddir)/stamp-webkitenumtypes.cpp \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ $(top_builddir)/stamp-webkitenumtypes.h \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- ./Source/WebKit2/GNUmakefile.am.orig 2022-09-06 02:20:35.000000000 +0200
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ ./Source/WebKit2/GNUmakefile.am 2022-09-06 02:21:21.000000000 +0200
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -490,15 +490,13 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ WEBKIT2_MARSHAL_LIST = $(WebKit2)/UIProcess/API/gtk/webkit2marshal.list
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-$(GENSOURCES_WEBKIT2)/webkit2gtk/webkit2/WebKitMarshal.cpp: stamp-webkit2marshal.cpp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++$(GENSOURCES_WEBKIT2)/webkit2gtk/webkit2/WebKitMarshal.c: stamp-webkit2marshal.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ @true
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ $(GENSOURCES_WEBKIT2)/webkit2gtk/webkit2/WebKitMarshal.h: stamp-webkit2marshal.h
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ @true
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-stamp-webkit2marshal.cpp: $(WEBKIT2_MARSHAL_LIST)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- $(AM_V_GEN) echo "extern \"C\" {" > $(webkit2gtk_built_headers_dir)/WebKitMarshal.cpp && \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- $(GLIB_GENMARSHAL) --prefix=webkit_marshal $(WEBKIT2_MARSHAL_LIST) --body >> $(webkit2gtk_built_headers_dir)/WebKitMarshal.cpp && \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- echo '}' >> $(webkit2gtk_built_headers_dir)/WebKitMarshal.cpp && \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++stamp-webkit2marshal.c: $(WEBKIT2_MARSHAL_LIST)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ $(GLIB_GENMARSHAL) --prefix=webkit_marshal $(WEBKIT2_MARSHAL_LIST) --body > $(webkit2gtk_built_headers_dir)/WebKitMarshal.c && \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ echo timestamp > $(@F)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ stamp-webkit2marshal.h: $(WEBKIT2_MARSHAL_LIST)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -508,7 +506,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ CLEANFILES += \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ $(BUILT_SOURCES) \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ $(top_builddir)/stamp-webkit2enumtypes \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- $(top_builddir)/stamp-webkit2marshal.cpp \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ $(top_builddir)/stamp-webkit2marshal.c \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ $(top_builddir)/stamp-webkit2marshal.h \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ $(top_builddir)/Programs/WebKitNetworkProcess \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ $(top_builddir)/Programs/WebKitWebProcess
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- ./Source/WebKit2/GNUmakefile.list.am.orig 2022-09-06 02:29:31.000000000 +0200
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ ./Source/WebKit2/GNUmakefile.list.am 2022-09-06 02:30:03.000000000 +0200
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -166,7 +166,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ webkit2gtk_built_sources += \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ DerivedSources/WebKit2/webkit2gtk/webkit2/WebKitEnumTypes.cpp \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ DerivedSources/WebKit2/webkit2gtk/webkit2/WebKitEnumTypes.h \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- DerivedSources/WebKit2/webkit2gtk/webkit2/WebKitMarshal.cpp \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ DerivedSources/WebKit2/webkit2gtk/webkit2/WebKitMarshal.c \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ DerivedSources/WebKit2/webkit2gtk/webkit2/WebKitMarshal.h \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ DerivedSources/WebKit2/webkit2gtk/webkit2/WebKitVersion.h
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- ./Source/WebCore/accessibility/atk/WebKitAccessibleHyperlink.cpp.orig 2022-09-06 12:15:54.000000000 +0200
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ ./Source/WebCore/accessibility/atk/WebKitAccessibleHyperlink.cpp 2022-09-06 12:16:13.000000000 +0200
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -390,7 +390,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ GType webkitAccessibleHyperlinkGetType()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- static volatile gsize typeVolatile = 0;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ static gsize typeVolatile = 0;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (g_once_init_enter(&typeVolatile)) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ static const GTypeInfo tinfo = {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- ./Source/WebCore/accessibility/atk/WebKitAccessibleWrapperAtk.cpp.orig 2022-09-06 12:17:42.000000000 +0200
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ ./Source/WebCore/accessibility/atk/WebKitAccessibleWrapperAtk.cpp 2022-09-06 12:17:55.000000000 +0200
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1015,7 +1015,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ GType
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ webkitAccessibleGetType(void)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- static volatile gsize typeVolatile = 0;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ static gsize typeVolatile = 0;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (g_once_init_enter(&typeVolatile)) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ static const GTypeInfo tinfo = {
</span></pre><pre style='margin:0'>
</pre>