<pre style='margin:0'>
Frank Schima (mf2k) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/4cfd81b17ee9a6575a155ff4c92039acd6c9ab7e">https://github.com/macports/macports-ports/commit/4cfd81b17ee9a6575a155ff4c92039acd6c9ab7e</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 4cfd81b charm: Update to version 1.11.0 - Use cmake 1.1 portgroup - Improve compatibility with qt5 portgroup
</span>4cfd81b is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 4cfd81b17ee9a6575a155ff4c92039acd6c9ab7e
</span>Author: Frank Schima <mf2k@macports.org>
AuthorDate: Thu Feb 1 12:54:28 2018 -0700
<span style='display:block; white-space:pre;color:#404040;'> charm: Update to version 1.11.0
</span><span style='display:block; white-space:pre;color:#404040;'> - Use cmake 1.1 portgroup
</span><span style='display:block; white-space:pre;color:#404040;'> - Improve compatibility with qt5 portgroup
</span><span style='display:block; white-space:pre;color:#404040;'>
</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;'> Fixes: https://trac.macports.org/ticket/48024
</span>---
office/charm/Portfile | 36 ++++++++++++++++++------------------
1 file changed, 18 insertions(+), 18 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/office/charm/Portfile b/office/charm/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 88efbbc..aa56f9a 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/office/charm/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/office/charm/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -2,10 +2,10 @@
</span>
PortSystem 1.0
PortGroup github 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>
name charm
<span style='display:block; white-space:pre;background:#ffe0e0;'>-version 1.10.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+version 1.11.0
</span>
github.setup KDAB Charm ${version}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -20,8 +20,10 @@ subport ${name}-qt5 {
</span> PortGroup qt5 1.0
conflicts ${name}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- depends_lib-append port:qt5-sqlite-plugin
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.args-append -DWITH_QT4:BOOL=OFF
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ qt5.depends_component \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sqlite-plugin
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.args-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DCHARM_FORCE_QT4:BOOL=OFF
</span> }
if {${subport} ne "${name}-qt5"} {
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -30,29 +32,27 @@ if {${subport} ne "${name}-qt5"} {
</span> revision 20151018
conflicts ${name}-qt5
<span style='display:block; white-space:pre;background:#ffe0e0;'>- depends_build-append port:automoc
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- depends_lib-append port:qt4-mac-sqlite3-plugin
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.args-append -DWITH_QT4:BOOL=ON
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_build-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:automoc
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_lib-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:qt4-mac-sqlite3-plugin
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.args-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DCHARM_FORCE_QT4:BOOL=ON
</span> }
<span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums rmd160 40184c4f0de2b7f9fe328b7fd2f0d47922be6e1c \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 5c7ea12da4ad1324a9aaf1f5d29612fc1d789a70bbcbfa2f57766b96f04275e1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums rmd160 da690a57d743e8c79e2d60d8bb2f29a276b69055 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 8729bc0936a481a113b8a56a747455ec488bf565182ca29d8bb583c74b194267
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-configure.args-append -DCharm_VERSION="${version}"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+configure.args-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DCharm_VERSION="${version}"
</span>
# These patches have still do be adapted to the current version:
#patchfiles adapt-to-osx-macports.patch
<span style='display:block; white-space:pre;background:#ffe0e0;'>-post-extract {file mkdir ${workpath}/build}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# standard post-arg, where to find the primary CMakeLists.txt file.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-default configure.post_args {../${worksrcdir}}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-default configure.dir {${workpath}/build}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-default build.dir {${workpath}/build}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> use_parallel_build yes
destroot {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- xinstall -m 0755 -d ${destroot}${applications_dir}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- file copy ${workpath}/build/Charm/Charm.app ${destroot}${applications_dir}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ xinstall -m 0755 -d ${destroot}${qt_apps_dir}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ file copy ${workpath}/build/Charm/Charm.app ${destroot}${qt_apps_dir}
</span> }
</pre><pre style='margin:0'>
</pre>