<pre style='margin:0'>
Zero King (l2dy) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/4200ab633338359d7470d1ef65db71102e25b3b6">https://github.com/macports/macports-ports/commit/4200ab633338359d7470d1ef65db71102e25b3b6</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 4200ab6 nomacs: update to 3.10.2
</span>4200ab6 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 4200ab633338359d7470d1ef65db71102e25b3b6
</span>Author: Zero King <l2dy@macports.org>
AuthorDate: Wed Jul 11 14:32:12 2018 +0000
<span style='display:block; white-space:pre;color:#404040;'> nomacs: update to 3.10.2
</span>---
aqua/nomacs/Portfile | 11 ++---
aqua/nomacs/files/patch-vtable.diff | 80 -------------------------------------
2 files changed, 4 insertions(+), 87 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/aqua/nomacs/Portfile b/aqua/nomacs/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 1f1a585..bac3742 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/aqua/nomacs/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/aqua/nomacs/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -5,9 +5,10 @@ PortGroup qt5 1.0
</span> PortGroup cmake 1.1
PortGroup github 1.0
<span style='display:block; white-space:pre;background:#ffe0e0;'>-github.setup nomacs nomacs 3.8.0
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums rmd160 d4821805ffe6b30ddefb10fa71e083b1cb27d424 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 79efe555026a2dff98313112aac3fcd6675533d65495010be74b27bc6c9c8e41
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+github.setup nomacs nomacs 3.10.2
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums rmd160 9a11a04f01959b1d7fcb1093c3e885125194e8eb \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 79a2e88c21cbb8e2ec1a61b170bdb045db49750b10609ea5abc727edfff000ef \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 32308155
</span>
name nomacs
license GPL-3+
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -39,10 +40,6 @@ configure.args-append -DQT_QMAKE_EXECUTABLE=${qt_qmake_cmd}
</span> patchfiles-append patch-name.diff \
patch-Info.plist.in.diff
<span style='display:block; white-space:pre;background:#ffe0e0;'>-# see https://trac.macports.org/ticket/56275
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# see https://github.com/nomacs/nomacs/issues/203
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-patchfiles-append patch-vtable.diff
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> post-destroot {
move {*}[glob ${destroot}${applications_dir}/*.dylib ${destroot}${prefix}/lib]
xinstall -d -m 0755 ${destroot}${applications_dir}/Nomacs.app/Contents/Resources
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/aqua/nomacs/files/patch-vtable.diff b/aqua/nomacs/files/patch-vtable.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 48eb81c..0000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/aqua/nomacs/files/patch-vtable.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,80 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-From 92a95cd288dd64829e33aeb5d8c6e9725219e6bd Mon Sep 17 00:00:00 2001
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-From: Raphael Kubo da Costa <rakuco@FreeBSD.org>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Date: Mon, 29 Jan 2018 12:01:50 +0100
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Subject: [PATCH] cmake: Stop calling QT5_WRAP_CPP() when building quazip and
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- libqpsd.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-cmake/Utils.cmake already sets CMAKE_AUTOMOC to on.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Calling QT5_WRAP_CPP() used to be just redundant, as QUAZIP_MOC_SRC and
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-LIBQPSD_MOC_SRC were never actually added as source dependencies in
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-MacBuildTarget.cmake and UnixBuildTarget.cmake. In other words, CMake's own
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-automoc infrastructure was actually being used and the moc invocations from
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-QT5_WRAP_CPP() were not being made at all.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Starting with Qt 5.9.4, calling QT5_WRAP_CPP() disables the AUTOMOC property
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-on the macro's input files, which means neither CMake's automoc
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-infrastructure not QT5_WRAP_CPP()'s code were being used and we ended up
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-with several 'undefined reference to vtable' errors when linking.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>----
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ImageLounge/cmake/Mac.cmake | 5 -----
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ImageLounge/cmake/Unix.cmake | 5 -----
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 2 files changed, 10 deletions(-)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git a/ImageLounge/cmake/Mac.cmake b/ImageLounge/cmake/Mac.cmake
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-index 73c01430..14e9494d 100644
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- cmake/Mac.cmake
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ cmake/Mac.cmake
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -104,7 +104,6 @@ unset(QUAZIP_LIBRARIES CACHE)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- unset(QUAZIP_HEADERS CACHE)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- unset(QUAZIP_SOURCES CACHE)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--unset(QUAZIP_MOCS CACHE)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- unset(QT_ROOT CACHE)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if(ENABLE_QUAZIP)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -123,9 +122,7 @@ if(ENABLE_QUAZIP)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- file(GLOB QUAZIP_SOURCES "3rdparty/quazip-0.7/quazip/*.c" "3rdparty/quazip-0.7/quazip/*.cpp")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- file(GLOB QUAZIP_HEADERS "3rdparty/quazip-0.7/quazip/*.h")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- file(GLOB QUAZIP_MOCS "3rdparty/quazip-0.7/quazip/*.h")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- QT5_WRAP_CPP(QUAZIP_MOC_SRC ${QUAZIP_MOCS})
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- add_definitions(-DWITH_QUAZIP)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- endif(USE_SYSTEM_QUAZIP)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- endif(ENABLE_QUAZIP)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -134,5 +131,3 @@ endif(ENABLE_QUAZIP)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # add libqpsd
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- file(GLOB LIBQPSD_SOURCES "${CMAKE_CURRENT_SOURCE_DIR}/3rdparty/libqpsd/*.cpp")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- file(GLOB LIBQPSD_HEADERS "${CMAKE_CURRENT_SOURCE_DIR}/3rdparty/libqpsd/*.h")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--file(GLOB LIBQPSD_MOCS "${CMAKE_CURRENT_SOURCE_DIR}/3rdparty/libqpsd/*.h")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--QT5_WRAP_CPP(LIBQPSD_MOC_SRC ${LIBQPSD_MOCS})
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git a/ImageLounge/cmake/Unix.cmake b/ImageLounge/cmake/Unix.cmake
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-index 4cf2c0ec..5297d48c 100644
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- cmake/Unix.cmake
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ cmake/Unix.cmake
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -97,7 +97,6 @@ unset(QUAZIP_LIBRARIES CACHE)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- unset(QUAZIP_HEADERS CACHE)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- unset(QUAZIP_SOURCES CACHE)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--unset(QUAZIP_MOCS CACHE)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- unset(QT_ROOT CACHE)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if(ENABLE_QUAZIP)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -116,9 +115,7 @@ if(ENABLE_QUAZIP)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- file(GLOB QUAZIP_SOURCES "3rdparty/quazip-0.7/quazip/*.c" "3rdparty/quazip-0.7/quazip/*.cpp")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- file(GLOB QUAZIP_HEADERS "3rdparty/quazip-0.7/quazip/*.h")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- file(GLOB QUAZIP_MOCS "3rdparty/quazip-0.7/quazip/*.h")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- QT5_WRAP_CPP(QUAZIP_MOC_SRC ${QUAZIP_MOCS})
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- add_definitions(-DWITH_QUAZIP)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- endif(USE_SYSTEM_QUAZIP)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- endif(ENABLE_QUAZIP)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -132,6 +129,4 @@ IF(USE_SYSTEM_LIBQPSD)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ELSE()
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- file(GLOB LIBQPSD_SOURCES "${CMAKE_CURRENT_SOURCE_DIR}/3rdparty/libqpsd/*.cpp")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- file(GLOB LIBQPSD_HEADERS "${CMAKE_CURRENT_SOURCE_DIR}/3rdparty/libqpsd/*.h")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- file(GLOB LIBQPSD_MOCS "${CMAKE_CURRENT_SOURCE_DIR}/3rdparty/libqpsd/*.h")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- QT5_WRAP_CPP(LIBQPSD_MOC_SRC ${LIBQPSD_MOCS})
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ENDIF(USE_SYSTEM_LIBQPSD)
</span></pre><pre style='margin:0'>
</pre>