<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/07e779f4eaa486e6c89c571cfe717774ed67932f">https://github.com/macports/macports-ports/commit/07e779f4eaa486e6c89c571cfe717774ed67932f</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 07e779f4eaa gtk4: relax compilation errors; drop clang blacklist
</span>07e779f4eaa is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 07e779f4eaa486e6c89c571cfe717774ed67932f
</span>Author: Christopher Nielsen <mascguy@github.com>
AuthorDate: Mon Aug 21 19:51:57 2023 -0400
<span style='display:block; white-space:pre;color:#404040;'> gtk4: relax compilation errors; drop clang blacklist
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> - Block unexpected meson subproject download
</span><span style='display:block; white-space:pre;color:#404040;'> - Drop defunct patches
</span><span style='display:block; white-space:pre;color:#404040;'> - Rev-bump to rebuild everywhere
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Fixes: https://trac.macports.org/ticket/67985
</span>---
gnome/gtk4/Portfile | 25 +++++++++----------
gnome/gtk4/files/patch-meson-build-debug.diff | 29 ++++++++++++++++++++++
...-meson-dont-werror-on-missing-declarations.diff | 14 -----------
gnome/gtk4/files/patch-testsuite-python.diff | 8 ------
4 files changed, 41 insertions(+), 35 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/gnome/gtk4/Portfile b/gnome/gtk4/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index fe77f971875..07e7d635b8e 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/gnome/gtk4/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/gnome/gtk4/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -2,7 +2,6 @@
</span>
PortSystem 1.0
PortGroup active_variants 1.1
<span style='display:block; white-space:pre;background:#ffe0e0;'>-PortGroup compiler_blacklist_versions 1.0
</span> PortGroup legacysupport 1.1
PortGroup meson 1.0
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -17,7 +16,7 @@ set my_name gtk4
</span> set gname gtk
version 4.12.0
<span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 1
</span>
categories gnome
license LGPL-2.1+
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -40,27 +39,31 @@ checksums rmd160 8078132e8d9f30130c9c92a3249e1649d2fecdee \
</span> sha256 a6d10829f405b1afc0b65e2a9642c04126a1d1b638d11c6d97426da4f84f1f6f \
size 16918992
<span style='display:block; white-space:pre;background:#e0ffe0;'>+# Disable unexpected download of subprojects
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+meson.wrap_mode nodownload
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> set python_branch 3.11
set python_version [string map {. {}} ${python_branch}]
set port_ver_major [lindex [split ${version} .] 0]
<span style='display:block; white-space:pre;background:#ffe0e0;'>-# Specify name of executable for 'rst2man'
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# Specify name of executable for 'rst2man'. MacPorts-specific.
</span> patchfiles-append patch-docs-rst2man.diff
<span style='display:block; white-space:pre;background:#ffe0e0;'>-#patchfiles-append patch-testsuite-python.diff
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-patchfiles-append patch-meson-dont-werror-on-missing-declarations.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# Don't allow build to promote warnings to errors. Full details in patchfile.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# See: https://trac.macports.org/ticket/67985
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+patchfiles-append patch-meson-build-debug.diff
</span>
<span style='display:block; white-space:pre;background:#e0ffe0;'>+# Fix builds for 10.12 and earlier, due to use of NSPasteboardType.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# See: https://gitlab.gnome.org/GNOME/gtk/-/merge_requests/5813
</span> patchfiles-append patch-quartz-nspasteboardtype.diff
# Upstream patch to fix conflicting declarations between libepoxy/OpenGL
<span style='display:block; white-space:pre;background:#ffe0e0;'>-# https://gitlab.gnome.org/GNOME/gtk/-/merge_requests/6208
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# See: https://gitlab.gnome.org/GNOME/gtk/-/merge_requests/6208
</span> patchfiles-append patch-epoxy-opengl.diff
post-patch {
reinplace "s|@@PYTHON_VERSION@@|${python_branch}|" \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- docs/reference/gtk/meson.build \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- testsuite/introspection/meson.build
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ docs/reference/gtk/meson.build
</span>
# build assumes python3 exists
reinplace "s|^#!/usr/bin/env python3|#!${prefix}/bin/python${python_branch}|" \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -113,10 +116,6 @@ license_noconflict gobject-introspection
</span> compiler.c_standard 2011
compiler.cxx_standard 2017
<span style='display:block; white-space:pre;background:#ffe0e0;'>-# error: suggest braces around initialization of subobject
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-compiler.blacklist-append \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- {clang < 1200}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> configure.args-append \
-Dbuild-examples=false \
-Dbuild-tests=false \
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/gnome/gtk4/files/patch-meson-build-debug.diff b/gnome/gtk4/files/patch-meson-build-debug.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..235deed4eeb
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/gnome/gtk4/files/patch-meson-build-debug.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;'>+#==================================================================================================
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+#
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# Patch to change the behavior of warning promotion, which is presently enabled for all types of
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# debug builds. That includes 'debugoptimized', which one might argue isn't a developer build.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+#
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# So, we tweak upstream's logic slightly, only enabling maximum strictness for a pure-debug
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# build.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+#
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# This allows us to avoid having to selectively disable one or more specific warning options,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# since they're no longer promoted to error (via '-Werror=xxx').
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+#
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# Ultimately I plan to collaborate with upstream, to see if they'd be willing to accept this.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# (Either verbatim, or via a slightly different approach.)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+#
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# Author: Christopher Nielsen
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# Date: 2023-08-21
</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;'>+--- meson.build.orig 2023-08-21 19:09:21.000000000 -0400
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ meson.build 2023-08-21 19:14:10.000000000 -0400
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -317,7 +317,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 'write-strings',
</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 get_option('buildtype').startswith('debug')
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ if get_option('buildtype') == 'debug'
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ foreach warning: extra_warnings
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ test_cflags += '-Werror=@0@'.format(warning)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ endforeach
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/gnome/gtk4/files/patch-meson-dont-werror-on-missing-declarations.diff b/gnome/gtk4/files/patch-meson-dont-werror-on-missing-declarations.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 5613994d612..00000000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/gnome/gtk4/files/patch-meson-dont-werror-on-missing-declarations.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,14 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-GLIB uses the technique of defining the macro to nothing
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-if it can't be used on a given compiler. But having this
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-defined to nothing generates a Werror, so that can't work.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- meson.build.orig 2022-11-02 00:37:51.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ meson.build 2022-11-02 00:38:13.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -306,7 +306,6 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 'int-to-pointer-cast',
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 'main',
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 'missing-braces',
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- 'missing-declarations',
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 'missing-prototypes',
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 'nonnull',
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 'pointer-to-int-cast',
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/gnome/gtk4/files/patch-testsuite-python.diff b/gnome/gtk4/files/patch-testsuite-python.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 5502138f740..00000000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/gnome/gtk4/files/patch-testsuite-python.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,8 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- testsuite/introspection/meson.build.orig 2022-08-20 21:37:49.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ testsuite/introspection/meson.build 2022-08-20 21:43:21.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -1,4 +1,4 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--py = import('python').find_installation('python3', modules: ['gi'])
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+py = import('python').find_installation('python@@PYTHON_VERSION@@', modules: ['gi'])
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- env = environment()
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- env.prepend('GI_TYPELIB_PATH',
</span></pre><pre style='margin:0'>
</pre>