<pre style='margin:0'>
Vincent (Veence) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/821897a06b932011c3edcb30c719ecc8bd882f60">https://github.com/macports/macports-ports/commit/821897a06b932011c3edcb30c719ecc8bd882f60</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 821897a Add QWT 6.1.3 support for both Qt4 and Qt5.
</span>821897a is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 821897a06b932011c3edcb30c719ecc8bd882f60
</span>Author: Veence <vince@macports.org>
AuthorDate: Tue Apr 18 16:12:07 2017 +0200
<span style='display:block; white-space:pre;color:#404040;'> Add QWT 6.1.3 support for both Qt4 and Qt5.
</span>---
graphics/qwt/Portfile | 32 +++++++++++++++++++++++++++++---
1 file changed, 29 insertions(+), 3 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/graphics/qwt/Portfile b/graphics/qwt/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index cf128ca..367cca9 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/graphics/qwt/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/graphics/qwt/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -68,12 +68,19 @@ subport qwt61 {
</span> conflicts qwt qwt52 qwt60
checksums rmd160 1e36e79dab0ecc4df89d9fb20607925fe261c6b3 \
sha256 f3ecd34e72a9a2b08422fb6c8e909ca76f4ce5fa77acad7a2883b701f4309733
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ use_parallel_build yes
</span>
patchfiles patch-designer_designer.pro.61.diff \
patch-qwtconfig.pri.61.diff \
patch-qwtbuild.pri.61.diff
livecheck.url http://sourceforge.net/api/file/index/project-id/13693/mtime/desc/rss
livecheck.regex \\/qwt\\/(6\\.1\\.\\d+)\\/
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ post-patch {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ reinplace "s|@INSTALL_DOCS@@|${qt_docs_dir}/${subport}|" \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${worksrcpath}/qwtconfig.pri
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ reinplace "s|@INSTALL_HEADERS@@|${qt_includes_dir}|" \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${worksrcpath}/qwtconfig.pri
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span>
}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -124,8 +131,13 @@ post-patch {
</span> # setup for examples, if selected
if {![variant_isset examples]} {
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ # I presume this worked with qwt < 6.1
</span> reinplace "s@QwtExamples@@" \
${worksrcpath}/qwtconfig.pri
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ } else {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # qwt 6.1.2 disables the examples by default, so reenable them when requested
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ reinplace "s@#QWT_CONFIG += QwtExamples@QWT_CONFIG += QwtExamples@" \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${worksrcpath}/qwtconfig.pri
</span> }
}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -167,19 +179,26 @@ if {${qwt_major} < 6} {
</span> # QWT 6+ uses Qt4+ only
if {![variant_isset qt5]} {
PortGroup qt4 1.0
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ PortGroup qmake 1.0
</span> } else {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- PortGroup qt5 1.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #PortGroup qt5 1.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ PortGroup qmake5 1.0
</span> set qt_arch_types "x86_64"
post-patch {
reinplace "s|QT_STATIC_CONST|static const|" \
${worksrcpath}/src/qwt_scale_map.cpp \
${worksrcpath}/src/qwt_scale_map.h
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ reinplace "s/QT_INSTALL_FRAMEWORKS/QT_INSTALL_LIBS/" \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${worksrcpath}/qwtconfig.pri
</span> }
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.args-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -config absolute_library_soname
</span> }
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-configure.cmd ${qt_qmake_cmd}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-configure.pre_args INSTALLBASE="${prefix}"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# configure.cmd ${qt_qmake_cmd}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# configure.pre_args-delete --prefix=${prefix}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+configure.pre_args-append INSTALLBASE="${prefix}"
</span>
# qmake does not handle these flags
configure.universal_args-delete --disable-dependency-tracking
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -247,6 +266,13 @@ post-destroot {
</span> }
}
}
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {[variant_isset examples]} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set exdir ${destroot}${qt_examples_dir}/${subport}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ xinstall -d -m 755 ${exdir}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ foreach bin [glob -nocomplain ${build.dir}/examples/bin/*] {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ copy ${bin} ${exdir}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span> }
variant debug description "Build release and debug versions" {}
</pre><pre style='margin:0'>
</pre>