<pre style='margin:0'>
Ryan Schmidt (ryandesign) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/f9757595c0be457fe79eddec765515837c2f7ac7">https://github.com/macports/macports-ports/commit/f9757595c0be457fe79eddec765515837c2f7ac7</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 f9757595c0b tigervnc: Update to 1.12.0
</span>f9757595c0b is described below
<span style='display:block; white-space:pre;color:#808000;'>commit f9757595c0be457fe79eddec765515837c2f7ac7
</span>Author: Eric A. Borisch <eborisch@gmail.com>
AuthorDate: Sat Feb 5 12:41:51 2022 -0600
<span style='display:block; white-space:pre;color:#404040;'> tigervnc: Update to 1.12.0
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Closes: https://trac.macports.org/ticket/54851
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Co-authored-by: Ryan Schmidt <ryandesign@macports.org>
</span>---
x11/tigervnc/Portfile | 28 ++++++++-------
x11/tigervnc/files/patch-CMakeLists.txt.diff | 11 ------
.../files/patch-release-makemacapp.in.diff | 14 ++++----
.../files/patch-vncviewer-CMakeLists.txt.diff | 41 ++++++++++++++++++++++
4 files changed, 63 insertions(+), 31 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/x11/tigervnc/Portfile b/x11/tigervnc/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 449711071f8..ccd54cc956a 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/x11/tigervnc/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/x11/tigervnc/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,17 +1,20 @@
</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:#ffe0e0;'>-PortGroup cmake 1.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+PortGroup cmake 1.1
</span> PortGroup conflicts_build 1.0
PortGroup github 1.0
PortGroup muniversal 1.0
<span style='display:block; white-space:pre;background:#ffe0e0;'>-github.setup TigerVNC tigervnc 1.7.1 v
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+github.setup TigerVNC tigervnc 1.12.0 v
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums rmd160 66753dccedb75bdbb48b0ea55707302a7b57ed3a \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 9ff3f3948f2a4e8cc06ee598ee4b1096beb62094c13e0b1462bff78587bed789 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 1561898
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> conflicts vnc tightvnc
categories x11 vnc
<span style='display:block; white-space:pre;background:#ffe0e0;'>-maintainers ryandesign openmaintainer
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-platforms darwin
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+maintainers {ryandesign @ryandesign} openmaintainer
</span> license GPL-2+
description Advanced VNC implementation.
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -22,28 +25,27 @@ long_description TigerVNC is an advanced VNC implementation. \
</span> projects. This includes accelerated JPEG compression. \
TigerVNC supports the latest X.Org X server.
<span style='display:block; white-space:pre;background:#ffe0e0;'>-homepage http://www.tigervnc.com/
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+homepage https://tigervnc.org
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+github.tarball_from archive
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums rmd160 837aac1c72218cc7717cb9f0cfebdab8c5360ec5 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 fc9c7617c1500b815708912e78455c13d0c68e10a377cf6c83a05ca2cd951245
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+depends_build-append port:gettext
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-depends_lib port:gettext \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+depends_lib-append port:gettext-runtime \
</span> port:gnutls \
path:lib/libfltk.dylib:fltk \
path:include/turbojpeg.h:libjpeg-turbo \
port:libiconv \
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ path:lib/pkgconfig/pixman-1.pc:libpixman \
</span> port:zlib
<span style='display:block; white-space:pre;background:#ffe0e0;'>-patchfiles patch-CMakeLists.txt.diff \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- patch-release-makemacapp.in.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+patchfiles patch-release-makemacapp.in.diff \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patch-vncviewer-CMakeLists.txt.diff
</span>
# ivtools' OS/os.h shadows tigervnc's os/os.h on case-insensitive filesystems.
if {[file exists ${prefix}/include/os/os.h]} {
conflicts_build-append ivtools
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-cmake.out_of_source yes
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> build.target translations dmg
if {![info exists universal_possible]} {
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/x11/tigervnc/files/patch-CMakeLists.txt.diff b/x11/tigervnc/files/patch-CMakeLists.txt.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 52565cdd7f1..00000000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/x11/tigervnc/files/patch-CMakeLists.txt.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,11 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- CMakeLists.txt.orig 2015-07-11 08:00:36.000000000 -0500
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ CMakeLists.txt 2015-07-13 19:26:12.000000000 -0500
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -28,7 +28,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set(DATA_DIR "${CMAKE_INSTALL_PREFIX}/share")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set(MAN_DIR "${DATA_DIR}/man")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set(LOCALE_DIR "${DATA_DIR}/locale")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--set(DOC_DIR "${CMAKE_INSTALL_PREFIX}/share/doc/${CMAKE_PROJECT_NAME}-${VERSION}")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+set(DOC_DIR "${CMAKE_INSTALL_PREFIX}/share/doc/${CMAKE_PROJECT_NAME}")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if(WIN32)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set(BIN_DIR "${CMAKE_INSTALL_PREFIX}")
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/x11/tigervnc/files/patch-release-makemacapp.in.diff b/x11/tigervnc/files/patch-release-makemacapp.in.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index 971512ec9c9..e83f81f7633 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/x11/tigervnc/files/patch-release-makemacapp.in.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/x11/tigervnc/files/patch-release-makemacapp.in.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,6 +1,6 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- release/makemacapp.in.orig 2015-07-11 08:00:36.000000000 -0500
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ release/makemacapp.in 2015-07-13 20:02:54.000000000 -0500
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -39,8 +39,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- release/makemacapp.in.orig 2021-11-09 01:51:28.000000000 -0600
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ release/makemacapp.in 2022-02-05 12:06:00.000000000 -0600
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -42,8 +42,7 @@
</span> fi
umask 022
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -10,12 +10,12 @@
</span> mkdir -p "$APPROOT/Contents/MacOS"
mkdir -p "$APPROOT/Contents/Resources"
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -64,6 +63,8 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- install -m 644 $SRCDIR/release/tigervnc.icns "$APPROOT/Contents/Resources/"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- install -m 644 release/Info.plist "$APPROOT/Contents/"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -73,6 +72,8 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "$APPROOT/Contents/Resources/locale/$lang/LC_MESSAGES/tigervnc.mo"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ done
</span>
+exit
+
install -m 644 $SRCDIR/LICENCE.TXT $TMPDIR/dmg/
<span style='display:block; white-space:pre;background:#ffe0e0;'>- install -m 644 $SRCDIR/README.txt $TMPDIR/dmg/
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ install -m 644 $SRCDIR/README.rst $TMPDIR/dmg/
</span>
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/x11/tigervnc/files/patch-vncviewer-CMakeLists.txt.diff b/x11/tigervnc/files/patch-vncviewer-CMakeLists.txt.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..2218823c0eb
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/x11/tigervnc/files/patch-vncviewer-CMakeLists.txt.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,41 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- vncviewer/CMakeLists.txt.orig 2021-11-09 01:51:28.000000000 -0600
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ vncviewer/CMakeLists.txt 2022-02-05 12:07:13.000000000 -0600
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -73,38 +73,4 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ install(TARGETS vncviewer DESTINATION ${CMAKE_INSTALL_FULL_BINDIR})
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if(UNIX)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ install(FILES vncviewer.man DESTINATION ${CMAKE_INSTALL_FULL_MANDIR}/man1 RENAME vncviewer.1)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- configure_file(vncviewer.desktop.in.in vncviewer.desktop.in)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- find_program(INTLTOOL_MERGE_EXECUTABLE intltool-merge)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- if("${GETTEXT_VERSION_STRING}" VERSION_GREATER 0.18.99)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- add_custom_command(OUTPUT vncviewer.desktop
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- COMMAND ${GETTEXT_MSGFMT_EXECUTABLE}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- --desktop --template vncviewer.desktop.in
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- -d ${CMAKE_SOURCE_DIR}/po -o vncviewer.desktop
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/vncviewer.desktop.in
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- )
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- elseif(INTLTOOL_MERGE_EXECUTABLE)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- add_custom_command(OUTPUT vncviewer.desktop
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- COMMAND sed -e 's/^Name/_Name/'
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- -e 's/^GenericName/_GenericName/'
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- -e 's/^Comment/_Comment/'
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- vncviewer.desktop.in > vncviewer.desktop.intl
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- COMMAND ${INTLTOOL_MERGE_EXECUTABLE}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- -d ${CMAKE_SOURCE_DIR}/po
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- vncviewer.desktop.intl vncviewer.desktop
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/vncviewer.desktop.in
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- )
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- else()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- add_custom_command(OUTPUT vncviewer.desktop
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- COMMAND cp vncviewer.desktop.in vncviewer.desktop
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/vncviewer.desktop.in
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- )
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- endif()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- add_custom_target(desktop ALL DEPENDS vncviewer.desktop)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- install(FILES ${CMAKE_CURRENT_BINARY_DIR}/vncviewer.desktop DESTINATION ${CMAKE_INSTALL_FULL_DATADIR}/applications)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- foreach(res 16 22 24 32 48)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- install(FILES ../media/icons/tigervnc_${res}.png DESTINATION ${CMAKE_INSTALL_FULL_DATADIR}/icons/hicolor/${res}x${res}/apps RENAME tigervnc.png)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- endforeach()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- install(FILES ../media/icons/tigervnc.svg DESTINATION ${CMAKE_INSTALL_FULL_DATADIR}/icons/hicolor/scalable/apps)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ endif()
</span></pre><pre style='margin:0'>
</pre>