<pre style='margin:0'>
MarcusCalhoun-Lopez pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/9cfde251420d6e2c3ca90b76f157c013e9452bae">https://github.com/macports/macports-ports/commit/9cfde251420d6e2c3ca90b76f157c013e9452bae</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 9cfde25 nomacs: update version 2.0.2->3.4
</span>9cfde25 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 9cfde251420d6e2c3ca90b76f157c013e9452bae
</span>Author: Marcus Calhoun-Lopez <mcalhoun@macports.org>
AuthorDate: Mon Jan 16 08:08:52 2017 -0700
<span style='display:block; white-space:pre;color:#404040;'> nomacs: update version 2.0.2->3.4
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Add `cmake.out_of_source yes`
</span><span style='display:block; white-space:pre;color:#404040;'> See https://trac.macports.org/ticket/47197
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Links against latest opencv
</span><span style='display:block; white-space:pre;color:#404040;'> See https://trac.macports.org/ticket/48067
</span>---
aqua/nomacs/Portfile | 39 ++++++++++++++++++++----------
aqua/nomacs/files/patch-Info.plist.in.diff | 13 ++++++++++
aqua/nomacs/files/patch-crash_on_exit.diff | 17 +++++++++++++
aqua/nomacs/files/patch-name.diff | 11 +++++++++
4 files changed, 67 insertions(+), 13 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 2d2a59c..7ac4627 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;'>@@ -1,12 +1,12 @@
</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 qt4 1.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+PortGroup qt5 1.0
</span> PortGroup cmake 1.0
name nomacs
<span style='display:block; white-space:pre;background:#ffe0e0;'>-version 2.0.2
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+version 3.4
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+#revision 0
</span> license GPL-3+
maintainers pvanek openmaintainer
description nomacs image viewer application bundle
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -19,22 +19,35 @@ categories aqua graphics
</span> platforms darwin
homepage http://nomacs.org
<span style='display:block; white-space:pre;background:#ffe0e0;'>-master_sites sourceforge
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-use_bzip2 yes
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-distfiles ${name}-${version}-source.tar.bz2
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+master_sites https://github.com/nomacs/nomacs/archive/
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+distfiles ${version}${extract.suffix}
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums rmd160 185c2584af07daf64066538543f56cc2d38dec2d \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 96dbd400838d96dca7b8a63b359eda009570046a02ad527c77b0b53bc7c9414a
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums rmd160 bc9a4668be9560f0ef58e6396d42407dd4bfcbfc \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 552eda88aedea48831ce354095e3aad47892b4b5029f424171bedb68271c2a2f
</span>
depends_lib-append port:exiv2 \
port:libraw \
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:zlib \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:tiff \
</span> port:opencv
<span style='display:block; white-space:pre;background:#e0ffe0;'>+qt5.depends_component qtsvg
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-# opencv is not universal
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-universal_variant no
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+cmake.out_of_source yes
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-configure.args-append -DOpenCV_DIR=${prefix}/lib/cmake \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- -DCMAKE_INSTALL_PREFIX="${applications_dir}" \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ${qt_cmake_defines}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+worksrcdir ${worksrcdir}/ImageLounge
</span>
<span style='display:block; white-space:pre;background:#e0ffe0;'>+configure.args-append -DCMAKE_INSTALL_PREFIX="${applications_dir}" \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DQT_QMAKE_EXECUTABLE=${qt_qmake_cmd}
</span>
<span style='display:block; white-space:pre;background:#e0ffe0;'>+#give name consistent with other macOS applications
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+#allow high resolution
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+#see http://nomacs.org/redmine/issues/760
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+patchfiles-append patch-name.diff \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patch-Info.plist.in.diff \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patch-crash_on_exit.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+post-destroot {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ move {*}[glob ${destroot}${applications_dir}/*.dylib ${destroot}${prefix}/lib]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ xinstall -d -m 0755 ${destroot}${applications_dir}/Nomacs.app/Contents/Resources
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ xinstall -m 0644 ${worksrcpath}/macosx/nomacs.icns ${destroot}${applications_dir}/Nomacs.app/Contents/Resources
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/aqua/nomacs/files/patch-Info.plist.in.diff b/aqua/nomacs/files/patch-Info.plist.in.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 0000000..98e7a24
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/aqua/nomacs/files/patch-Info.plist.in.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,13 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- macosx/Info.plist.in.orig 2016-07-22 04:43:37.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ macosx/Info.plist.in 2017-01-15 16:38:11.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -29,8 +29,8 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ <string>${MACOSX_BUNDLE_BUNDLE_VERSION}</string>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ <key>CSResourcesFileMapped</key>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ <true/>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- <key>LSRequiresCarbon</key>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- <true/>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ <key>NSPrincipalClass</key>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ <string>NSApplication</string>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ <key>NSHumanReadableCopyright</key>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ <string>${MACOSX_BUNDLE_COPYRIGHT}</string>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/aqua/nomacs/files/patch-crash_on_exit.diff b/aqua/nomacs/files/patch-crash_on_exit.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 0000000..034c99d
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/aqua/nomacs/files/patch-crash_on_exit.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,17 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- src/DkLoader/DkActionManager.cpp.orig 2016-07-22 04:43:37.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ src/DkLoader/DkActionManager.cpp 2017-01-16 07:38:48.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -342,11 +342,13 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ DkActionManager::~DkActionManager() {}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++void noop_deleter_to_prevent_crash(DkActionManager*) {}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ DkActionManager& DkActionManager::instance() {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ static QSharedPointer<DkActionManager> inst;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (!inst)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- inst = QSharedPointer<DkActionManager>(new DkActionManager());
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ inst = QSharedPointer<DkActionManager>(new DkActionManager(), noop_deleter_to_prevent_crash);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return *inst;
</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;color:#808080;'>diff --git a/aqua/nomacs/files/patch-name.diff b/aqua/nomacs/files/patch-name.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 0000000..2fcf6a3
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/aqua/nomacs/files/patch-name.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;'>+--- cmake/MacBuildTarget.cmake.orig 2016-07-22 04:43:37.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ cmake/MacBuildTarget.cmake 2017-01-15 16:31:38.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -18,7 +18,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-unknown-pragmas")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # create the targets
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-set(BINARY_NAME ${PROJECT_NAME})
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++set(BINARY_NAME Nomacs)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set(DLL_CORE_NAME ${PROJECT_NAME}Core)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set(DLL_LOADER_NAME ${PROJECT_NAME}Loader)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set(DLL_NAME ${PROJECT_NAME}Gui)
</span></pre><pre style='margin:0'>
</pre>