<pre style='margin:0'>
Chris Jones (cjones051073) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/f88ca7223aa438c34e1925b65b850556418fbc1d">https://github.com/macports/macports-ports/commit/f88ca7223aa438c34e1925b65b850556418fbc1d</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 f88ca72 qbs: update to 1.13.0
</span>f88ca72 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit f88ca7223aa438c34e1925b65b850556418fbc1d
</span>Author: Joerg Bornemann <joerg.bornemann@qt.io>
AuthorDate: Fri Apr 26 10:19:15 2019 +0200
<span style='display:block; white-space:pre;color:#404040;'> qbs: update to 1.13.0
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Adjust patch-environment.diff to source changes.
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Setting DYLD_LIBRARY_PATH is not needed anymore.
</span><span style='display:block; white-space:pre;color:#404040;'> The option qbs_disable_rpath already takes care of that.
</span>---
devel/qbs/Portfile | 8 ++++----
devel/qbs/files/patch-environment.diff | 21 ++++++++++-----------
2 files changed, 14 insertions(+), 15 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/qbs/Portfile b/devel/qbs/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index caf80c4..2d93c4f 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/devel/qbs/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/devel/qbs/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -6,7 +6,7 @@ PortGroup cxx11 1.1
</span>
name qbs
<span style='display:block; white-space:pre;background:#ffe0e0;'>-version 1.12.2
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+version 1.13.0
</span> categories devel
platforms darwin
license LGPL-2.1
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -18,9 +18,9 @@ homepage https://wiki.qt.io/Qbs
</span> distname qbs-src-${version}
master_sites https://download.qt.io/official_releases/qbs/${version}/
<span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums rmd160 c4b3d6c0c466e339f971b8a75ac6d3d3d3e42282 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 97819b8b404a6ee5715d38ceda5ac1d992500a38f8956abe4a58a1d66e64d6f1 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 4374830
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums rmd160 e7777815d8e82a8b637c0bc24d46992285c3eae5 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 4daa764a944bdb33a4a0dd792864dd9acc24036ad84ef34cfb3215538c6cef89 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 4323291
</span>
qt5.depends_component qtscript
qt5.min_version 5.9.0
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/qbs/files/patch-environment.diff b/devel/qbs/files/patch-environment.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index 807fcca..696b62f 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/devel/qbs/files/patch-environment.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/devel/qbs/files/patch-environment.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,12 +1,11 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- static-res.pro.orig 2018-04-15 08:33:48.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ static-res.pro 2018-04-15 08:33:18.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -15,6 +15,9 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- static-res.pro.orig
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ static-res.pro
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -15,6 +15,8 @@ unix:qbs_disable_rpath {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ envSpec = $$envVar=$$newVal
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>- qbsres.target = $$builddirname/default/default.bg
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- qbsres.commands = \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ $$shell_quote(/usr/bin/env) \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ DYLD_LIBRARY_PATH=$$shell_path(lib) \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ TMPDIR=$$shell_path(/tmp) \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- $$shell_quote($$shell_path($$qbsbindir/qbs)) \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- build \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --settings-dir $$shell_quote($$builddirname/settings) \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++envSpec += TMPDIR=$$shell_path(/tmp)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ builddirname = qbsres
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ typedescdir = share/qbs/qml-type-descriptions
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ typedescdir_src = $$builddirname/default/install-root/$$typedescdir
</span></pre><pre style='margin:0'>
</pre>