<pre style='margin:0'>
Dan Villiom Podlaski Christiansen (danchr) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/950814c8bf41271509a3c77fe094cd2f8c561d29">https://github.com/macports/macports-ports/commit/950814c8bf41271509a3c77fe094cd2f8c561d29</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit 950814c8bf41271509a3c77fe094cd2f8c561d29
</span>Author: Dan Villiom Podlaski Christiansen <danchr@macports.org>
AuthorDate: Fri Jun 19 16:00:10 2020 +0200
<span style='display:block; white-space:pre;color:#404040;'> gtk-vnc: update to 1.0.0; add quartz variant
</span>---
gnome/gtk-vnc/Portfile | 36 ++++++++++++++--------
gnome/gtk-vnc/files/meson-build.diff | 29 +++++++++++++++++
.../files/patch-remove-intltool-perl-hack.diff | 30 ------------------
3 files changed, 52 insertions(+), 43 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 7b9b657c902..563ed21da91 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;'>@@ -1,9 +1,11 @@
</span> # -*- coding: utf-8; mode: tcl; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- vim:fenc=utf-8:ft=tcl:et:sw=4:ts=4:sts=4
PortSystem 1.0
<span style='display:block; white-space:pre;background:#e0ffe0;'>+PortGroup active_variants 1.1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+PortGroup meson 1.0
</span>
name gtk-vnc
<span style='display:block; white-space:pre;background:#ffe0e0;'>-version 0.7.1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+version 1.0.0
</span> maintainers {danchr @danchr} openmaintainer
categories gnome devel
license {LGPL GPL-3}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -26,26 +28,21 @@ master_sites gnome:sources/${name}/${branch}
</span>
use_xz yes
<span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums rmd160 f828e1403301be236256073332b2956fd1c923af \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 f34baa696615ef67666e8465b4d0ac563355e999a77d2cc42ad4625a24f7aab1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums rmd160 663b4a33dbac48a123c1504b1e5505aea6c687cc \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 a81a1f1a79ad4618027628ffac27d3391524c063d9411c7a36a5ec3380e6c080
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-depends_build port:pkgconfig \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+depends_build-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:pkgconfig \
</span> port:intltool \
port:vala
<span style='display:block; white-space:pre;background:#ffe0e0;'>-depends_lib port:gtk3 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+depends_lib-append port:gtk3 \
</span> port:gnutls \
port:libgcrypt \
port:pulseaudio
<span style='display:block; white-space:pre;background:#ffe0e0;'>-patchfiles patch-remove-intltool-perl-hack.diff
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-patchfiles-append MAP_ANONYMOUS.patch
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# autoreconf to reconfigure with our intltool.m4
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-use_autoreconf yes
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-autoreconf.args -fvi
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-configure.args --disable-silent-rules
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+patchfiles meson-build.diff \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ MAP_ANONYMOUS.patch
</span>
if {${os.platform} eq "darwin" && ${os.major} <= 13} {
# Mavericks comes with Python 2.7.5 which is too old to run keymap-gen properly
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -60,3 +57,16 @@ configure.cppflags-append \
</span>
livecheck.type gnome
livecheck.regex LATEST-IS-(\\d+\\.\\d*\\d(?:\\.\\d+)*)
<span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+variant quartz {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # src/vncdisplaykeymap.c includes <gdk/gdkquartz.h>, which in turn
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # includes AppKit -- and that one fails hard in a regular C compiler...
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.cflags-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -ObjC
</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 {[variant_isset quartz]} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ require_active_variants gtk3 quartz
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+} else {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ require_active_variants gtk3 "" quartz
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/gnome/gtk-vnc/files/meson-build.diff b/gnome/gtk-vnc/files/meson-build.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..d71a5749083
</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/meson-build.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;'>+--- src/meson.build
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ #<buffer meson.build>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -89,7 +89,7 @@
</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;'>+ gvnc_link_args = []
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-if host_machine.system() != 'windows'
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++if host_machine.system() != 'windows' and host_machine.system() != 'darwin'
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ gvnc_link_args += ['-Wl,--no-undefined']
</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;'>+@@ -178,7 +178,7 @@
</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;'>+ gvncpulse_link_args = []
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- if host_machine.system() != 'windows'
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ if host_machine.system() != 'windows' and host_machine.system() != 'darwin'
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ gvncpulse_link_args += ['-Wl,--no-undefined']
</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;'>+@@ -337,7 +337,7 @@
</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;'>+ gtk_vnc_link_args = []
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-if host_machine.system() != 'windows'
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++if host_machine.system() != 'windows' and host_machine.system() != 'darwin'
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ gtk_vnc_link_args += ['-Wl,--no-undefined']
</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;color:#808080;'>diff --git a/gnome/gtk-vnc/files/patch-remove-intltool-perl-hack.diff b/gnome/gtk-vnc/files/patch-remove-intltool-perl-hack.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index f086797a5b6..00000000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/gnome/gtk-vnc/files/patch-remove-intltool-perl-hack.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;'>---- m4/intltool.m4.orig 2013-07-02 11:22:23.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ m4/intltool.m4 2013-07-02 11:22:32.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -131,27 +131,6 @@ if test -z "$xgversion" -o -z "$mmversio
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- AC_MSG_ERROR([GNU gettext tools not found; required for intltool])
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- fi
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--AC_PATH_PROG(INTLTOOL_PERL, perl)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--if test -z "$INTLTOOL_PERL"; then
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- AC_MSG_ERROR([perl not found])
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--fi
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--AC_MSG_CHECKING([for perl >= 5.8.1])
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--$INTLTOOL_PERL -e "use 5.8.1;" > /dev/null 2>&1
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--if test $? -ne 0; then
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- AC_MSG_ERROR([perl 5.8.1 is required for intltool])
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--else
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- IT_PERL_VERSION=`$INTLTOOL_PERL -e "printf '%vd', $^V"`
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- AC_MSG_RESULT([$IT_PERL_VERSION])
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--fi
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--if test "x$2" != "xno-xml"; then
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- AC_MSG_CHECKING([for XML::Parser])
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- if `$INTLTOOL_PERL -e "require XML::Parser" 2>/dev/null`; then
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- AC_MSG_RESULT([ok])
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- else
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- AC_MSG_ERROR([XML::Parser perl module is required for intltool])
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- fi
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--fi
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # Substitute ALL_LINGUAS so we can use it in po/Makefile
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- AC_SUBST(ALL_LINGUAS)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span></pre><pre style='margin:0'>
</pre>