<pre style='margin:0'>
Marcus Calhoun-Lopez (MarcusCalhoun-Lopez) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/f286b29faec5b702089c754cbc29fb0c01056fa6">https://github.com/macports/macports-ports/commit/f286b29faec5b702089c754cbc29fb0c01056fa6</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit f286b29faec5b702089c754cbc29fb0c01056fa6
</span>Author: Marcus Calhoun-Lopez <mcalhoun@macports.org>
AuthorDate: Sun Apr 15 17:01:59 2018 -0700
<span style='display:block; white-space:pre;color:#404040;'> qbs: update version 1.10.0->1.11.0
</span>---
devel/qbs/Portfile | 19 ++++++++++++++++---
devel/qbs/files/patch-environment.diff | 12 ++++++++++++
devel/qbs/files/patch-headers.diff | 10 ++++++++++
devel/qt5-qtcreator/Portfile | 2 +-
4 files changed, 39 insertions(+), 4 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 f1675f8..6f621b4 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.10.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+version 1.11.0
</span> categories devel
platforms darwin
license LGPL-2.1
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -19,8 +19,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 e04bc49e9fbfe91a717b92c1bea64ce7bf2699bf \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 38afae3b697b96e07d53cfc64dd03533fddec052ecdc08d8e7779440c36c3ecd
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums rmd160 b559834eb908687ea86edf3f80e7dfae6874cfb4 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 6ce30c468e688f6843468324a34a7191409b471c3ff6f3e834ef8bfa7b3467cd \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 4299668
</span>
qt5.depends_component qtscript
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -29,6 +30,18 @@ configure.post_args QBS_INSTALL_PREFIX=${prefix} \
</span> CONFIG+=qbs_enable_project_file_updates \
qbs.pro
<span style='display:block; white-space:pre;background:#e0ffe0;'>+# set DYLD_LIBRARY_PATH to avoid
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# dyld: Library not loaded: ${prefix}/lib/libqbscore.1.dylib
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# Referenced from: ${worksrcpath}/bin/qbs
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# Reason: image not found
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# set TMPDIR to avoid
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# SOFT ASSERT: job->state() == AbstractJob::StateRunning in api/project.cpp:153
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+patchfiles-append patch-environment.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# see https://bugs.archlinux.org/task/58022
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# see https://git.archlinux.org/svntogit/packages.git/commit/trunk?h=packages/qbs&id=696d24cb3dcca8308cb577a94e19b485a50a55bf
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+patchfiles-append patch-headers.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> livecheck.type regex
livecheck.url https://download.qt.io/official_releases/qbs/
livecheck.regex {(\d+(?:\.\d+)+)/}
<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>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 0000000..807fcca
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</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;'>@@ -0,0 +1,12 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- static-res.pro.orig 2018-04-15 08:33:48.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ static-res.pro 2018-04-15 08:33:18.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -15,6 +15,9 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ qbsres.target = $$builddirname/default/default.bg
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ qbsres.commands = \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ $$shell_quote(/usr/bin/env) \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ DYLD_LIBRARY_PATH=$$shell_path(lib) \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ TMPDIR=$$shell_path(/tmp) \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ $$shell_quote($$shell_path($$qbsbindir/qbs)) \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ build \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ --settings-dir $$shell_quote($$builddirname/settings) \
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/qbs/files/patch-headers.diff b/devel/qbs/files/patch-headers.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 0000000..10d24b7
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/devel/qbs/files/patch-headers.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,10 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- src/lib/corelib/tools/tools.pri.orig 2018-03-27 04:40:50.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ src/lib/corelib/tools/tools.pri 2018-04-15 11:17:08.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -124,6 +124,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ $$PWD/generateoptions.h \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ $$PWD/generatorpluginmanager.h \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ $$PWD/installoptions.h \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ $$PWD/projectgeneratormanager.h \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ $$PWD/qbspluginmanager.h \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ $$PWD/setupprojectparameters.h \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ $$PWD/toolchains.h \
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/qt5-qtcreator/Portfile b/devel/qt5-qtcreator/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 561acdb..dee1ceb 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/devel/qt5-qtcreator/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/devel/qt5-qtcreator/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -7,7 +7,7 @@ PortGroup cxx11 1.1
</span> name qt5-qtcreator
version 4.5.0
<span style='display:block; white-space:pre;background:#ffe0e0;'>-#revision 0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 1
</span> categories devel aqua
platforms darwin
# from https://blog.qt.io/blog/2016/01/13/new-agreement-with-the-kde-free-qt-foundation/
</pre><pre style='margin:0'>
</pre>