<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/502d34348b6133cb39714ddb2624a78175ce6bd1">https://github.com/macports/macports-ports/commit/502d34348b6133cb39714ddb2624a78175ce6bd1</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 502d34348b6 gtk-vnc: patch for python3; explicitly disable sasl2
</span>502d34348b6 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 502d34348b6133cb39714ddb2624a78175ce6bd1
</span>Author: Christopher Nielsen <mascguy@github.com>
AuthorDate: Wed Apr 17 17:30:31 2024 -0400
<span style='display:block; white-space:pre;color:#404040;'> gtk-vnc: patch for python3; explicitly disable sasl2
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> - Also add missing deps
</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/69757
</span>---
gnome/gtk-vnc/Portfile | 47 ++++++++++++++++++++--------
gnome/gtk-vnc/files/patch-meson-python3.diff | 11 +++++++
2 files changed, 45 insertions(+), 13 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/gnome/gtk-vnc/Portfile b/gnome/gtk-vnc/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index be0a022293e..14d54bf13b5 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/gnome/gtk-vnc/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/gnome/gtk-vnc/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -6,7 +6,7 @@ PortGroup meson 1.0
</span>
name gtk-vnc
version 1.3.1
<span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 2
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 3
</span> maintainers {danchr @danchr} openmaintainer
categories gnome devel
license {LGPL GPL-3}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -33,38 +33,55 @@ checksums rmd160 ea70671da05ef0024e93858c1ee41387470a4243 \
</span> sha256 512763ac4e0559d0158b6682ca5dd1a3bd633f082f5e4349d7158e6b5f80f1ce \
size 222204
<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><span style='display:block; white-space:pre;background:#e0ffe0;'>+set py_ver 3.12
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+set py_ver_nodot [string map {. {}} ${py_ver}]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> depends_build-append \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- port:pkgconfig \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:gettext \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ path:lib/pkgconfig/gobject-introspection-1.0.pc:gobject-introspection \
</span> port:intltool \
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ path:bin/pkg-config:pkgconfig \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:python${py_ver_nodot} \
</span> path:bin/vala:vala
<span style='display:block; white-space:pre;background:#ffe0e0;'>-depends_lib-append path:lib/pkgconfig/gtk+-3.0.pc:gtk3 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+depends_lib-append path:lib/pkgconfig/cairo.pc:cairo \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ path:lib/pkgconfig/gdk-pixbuf-2.0.pc:gdk-pixbuf2 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:gettext-runtime \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ path:lib/pkgconfig/glib-2.0.pc:glib2 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ path:lib/pkgconfig/gtk+-3.0.pc:gtk3 \
</span> path:lib/pkgconfig/gnutls.pc:gnutls \
port:libgcrypt \
port:pulseaudio
<span style='display:block; white-space:pre;background:#ffe0e0;'>-patchfiles MAP_ANONYMOUS.patch
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+configure.python ${prefix}/bin/python${py_ver}
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-if {${os.platform} eq "darwin" && ${os.major} <= 13} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # Mavericks comes with Python 2.7.5 which is too old to run keymap-gen properly
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # See https://bugzilla.gnome.org/show_bug.cgi?id=792075
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- depends_build-append port:python27
</span><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;'>+patchfiles-append MAP_ANONYMOUS.patch
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+patchfiles-append patch-meson-python3.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+post-patch {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ reinplace "s|@@PYTHON3_BIN@@|${configure.python}|" \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ src/meson.build
</span> }
# for ucontext
configure.cppflags-append \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- -D_XOPEN_SOURCE
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -D_XOPEN_SOURCE
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-livecheck.type gnome
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-livecheck.regex LATEST-IS-(\\d+\\.\\d*\\d(?:\\.\\d+)*)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+configure.args-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -Dintrospection=enabled \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -Dpulseaudio=enabled \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -Dsasl=disabled \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -Dwith-vala=enabled
</span>
variant quartz conflicts x11 {
require_active_variants gtk3 quartz
# src/vncdisplaykeymap.c includes <gdk/gdkquartz.h>, which in turn
# includes AppKit -- and that one fails hard in a regular C compiler...
configure.cflags-append \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- -ObjC
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -ObjC
</span> }
variant x11 conflicts quartz {
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -82,3 +99,7 @@ if {![variant_isset quartz] && ![variant_isset x11]} {
</span> return -code error "Either +x11 or +quartz is required"
}
}
<span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# Note: Unlike many other GNOME projects, stable releases for 'gtk-vnc' can be odd in number.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# So we must use gnome-with-unstable, to avoid filtering those out.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+livecheck.type gnome-with-unstable
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/gnome/gtk-vnc/files/patch-meson-python3.diff b/gnome/gtk-vnc/files/patch-meson-python3.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..7c2d75bdab9
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/gnome/gtk-vnc/files/patch-meson-python3.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;'>+--- src/meson.build.orig 2024-04-17 16:56:05.000000000 -0400
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ src/meson.build 2024-04-17 16:59:36.000000000 -0400
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -319,7 +319,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 'vncdisplaykeymap.c',
</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;'>+-python = import('python').find_installation('python3')
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++python = import('python').find_installation('@@PYTHON3_BIN@@')
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ keymaps = [
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 'xorgevdev',
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 'xorgkbd',
</span></pre><pre style='margin:0'>
</pre>