<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/b07759d0c35e0dfd02f1f806e78735a1fc084d02">https://github.com/macports/macports-ports/commit/b07759d0c35e0dfd02f1f806e78735a1fc084d02</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 b07759d libQGLViewer: update version 2.6.3->2.6.4; add Qt 5 support
</span>b07759d is described below
<span style='display:block; white-space:pre;color:#808000;'>commit b07759d0c35e0dfd02f1f806e78735a1fc084d02
</span>Author: Marcus Calhoun-Lopez <mcalhoun@macports.org>
AuthorDate: Sun Dec 18 00:16:25 2016 -0700
<span style='display:block; white-space:pre;color:#404040;'> libQGLViewer: update version 2.6.3->2.6.4; add Qt 5 support
</span>---
graphics/libQGLViewer/Portfile | 42 ++++++++++++++++------
graphics/libQGLViewer/files/archflags.sh | 10 ------
.../libQGLViewer/files/patch-QGLViewer.pro.diff | 14 +++++---
.../libQGLViewer/files/patch-contribs.pro.diff | 10 ------
.../libQGLViewer/files/patch-examples.pri.diff | 11 ++++++
5 files changed, 52 insertions(+), 35 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/graphics/libQGLViewer/Portfile b/graphics/libQGLViewer/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index df5d9f4..c51fb16 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/graphics/libQGLViewer/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/graphics/libQGLViewer/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,11 +1,15 @@
</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
<span style='display:block; white-space:pre;background:#ffe0e0;'>-# $Id$
</span>
PortSystem 1.0
<span style='display:block; white-space:pre;background:#ffe0e0;'>-PortGroup qmake 1.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+if {[variant_isset qt4]} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ PortGroup qmake 1.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+} else {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ PortGroup qmake5 1.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span>
name libQGLViewer
<span style='display:block; white-space:pre;background:#ffe0e0;'>-version 2.6.3
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+version 2.6.4
</span> platforms darwin
maintainers raphael openmaintainer
license {GPL-2+ Commercial}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -27,20 +31,19 @@ conflicts libPyQGLViewer
</span>
master_sites ${homepage}src/
<span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums rmd160 ef4adb41c004f70a4a6d48c6607dac8de0dbbd9f \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 be611b87bdb8ba794a4d18eaed87f22491ebe198d664359829233c4ea69f4d02
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums rmd160 242c5d3ac42ac878cc1ad0b5b7eaa5f434ef9e89 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 53daefd7981a3ff7719ee55c368226807791d916ed988dde0aa0eac89686389d
</span>
patchfiles patch-QGLViewer.pro.diff \
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ patch-examples.pri.diff \
</span> patch-designerPlugin.pro.diff
<span style='display:block; white-space:pre;background:#ffe0e0;'>-# the terrain example does not compile on Lion; see #30886
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-platform darwin 11 {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- patchfiles-append patch-contribs.pro.diff
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span>
post-patch {
reinplace "s|@@QT_PLUGINS_DIR@@|${qt_plugins_dir}|g" ${worksrcpath}/designerPlugin/designerPlugin.pro
<span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>- system -W ${worksrcpath} "sh ${filespath}/archflags.sh [get_canonical_archflags]"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+if {[variant_isset qt4] && ![variant_isset universal]} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.pre_args-append "CONFIG+=\"${qt_arch_types}\""
</span> }
# prevent the examples from linking with an already installed version of libQGLViewer (#41382)
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -59,7 +62,11 @@ configure.march
</span> configure.mtune
configure.pre_args-append DOC_DIR=${prefix}/share/doc/${name}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-configure.post_args-append -after QMAKE_POST_LINK=\"\"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+if {[variant_isset qt4]} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.post_args-append -after QMAKE_POST_LINK=\"\"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+} else {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.args-append CONFIG+=absolute_library_soname
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span>
use_parallel_build no
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -75,5 +82,18 @@ post-destroot {
</span> ${destroot}${prefix}/share/doc/${name}
}
<span style='display:block; white-space:pre;background:#e0ffe0;'>+variant qt4 description {build with Qt 4} conflicts qt5 {}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+variant qt5 description {build with Qt 5} conflicts qt4 {}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+if {![variant_isset qt4] && ![variant_isset qt5]} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ default_variants-append +qt4
</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 qt4] && ![variant_isset qt5]} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ui_error "You must select a qt variant to use."
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return -code error "No qt variant selected."
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> livecheck.type regex
livecheck.regex "Version (\\d+(?:\\.\\d+)*)"
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/graphics/libQGLViewer/files/archflags.sh b/graphics/libQGLViewer/files/archflags.sh
</span>deleted file mode 100755
<span style='display:block; white-space:pre;color:#808080;'>index 8ba0214..0000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/graphics/libQGLViewer/files/archflags.sh
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,10 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-#!/bin/sh
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-for file in `find . -name '*.pro'`; do
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- cat << EOT > ${file}.tmp
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-QMAKE_CFLAGS_RELEASE += $@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-QMAKE_CXXFLAGS_RELEASE += $@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-QMAKE_LFLAGS_RELEASE += $@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-EOT
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- cat ${file} >> ${file}.tmp
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- mv ${file}.tmp ${file}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-done
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/graphics/libQGLViewer/files/patch-QGLViewer.pro.diff b/graphics/libQGLViewer/files/patch-QGLViewer.pro.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index f66a0a1..e08b64f 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/graphics/libQGLViewer/files/patch-QGLViewer.pro.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/graphics/libQGLViewer/files/patch-QGLViewer.pro.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,11 +1,17 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- QGLViewer/QGLViewer.pro.orig 2015-11-20 17:15:36.000000000 +0100
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ QGLViewer/QGLViewer.pro 2015-11-20 17:16:12.000000000 +0100
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -201,7 +201,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- QGLViewer/QGLViewer.pro.orig 2016-12-17 20:28:34.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ QGLViewer/QGLViewer.pro 2016-12-17 20:34:29.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -212,12 +212,12 @@
</span> # -------------------
macx|darwin-g++ {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- # This setting creates a Mac framework. Comment out this line to create a dylib instead.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Default setting creates a Mac framework. Comment out this line to create a dylib instead.
</span> - !staticlib: CONFIG *= lib_bundle
+ #!staticlib: CONFIG *= lib_bundle
include.files *= qglviewer.icns
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Or whatever exists in /Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- QMAKE_MAC_SDK = macosx10.12
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ #QMAKE_MAC_SDK = macosx10.12
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ lib_bundle {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ FRAMEWORK_HEADERS.version = Versions
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/graphics/libQGLViewer/files/patch-contribs.pro.diff b/graphics/libQGLViewer/files/patch-contribs.pro.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 86c6cd0..0000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/graphics/libQGLViewer/files/patch-contribs.pro.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,10 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- examples/contribs/contribs.pro.orig 2011-09-15 21:03:03.000000000 +0200
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ examples/contribs/contribs.pro 2011-09-15 21:03:24.000000000 +0200
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -5,7 +5,6 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- blobWar \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- cornerAxis \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- dvonn \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- terrain \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- textureViewer \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- thumbnail
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/graphics/libQGLViewer/files/patch-examples.pri.diff b/graphics/libQGLViewer/files/patch-examples.pri.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 0000000..50b400c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/graphics/libQGLViewer/files/patch-examples.pri.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;'>+--- examples/examples.pri.orig 2016-10-06 13:08:36.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ examples/examples.pri 2016-12-17 20:43:12.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -79,7 +79,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ macx|darwin-g++ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Or whatever exists in /Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- QMAKE_MAC_SDK = macosx10.12
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ #QMAKE_MAC_SDK = macosx10.12
</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;'>+ win32 {
</span></pre><pre style='margin:0'>
</pre>