<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/12f7d8fe48ef44ccc6b9cf3adec83912fd656ba7">https://github.com/macports/macports-ports/commit/12f7d8fe48ef44ccc6b9cf3adec83912fd656ba7</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 12f7d8f  qbs: update version 1.12.0->1.12.1
</span>12f7d8f is described below

<span style='display:block; white-space:pre;color:#808000;'>commit 12f7d8fe48ef44ccc6b9cf3adec83912fd656ba7
</span>Author: Marcus Calhoun-Lopez <mcalhoun@macports.org>
AuthorDate: Wed Oct 10 23:18:16 2018 -0700

<span style='display:block; white-space:pre;color:#404040;'>    qbs: update version 1.12.0->1.12.1
</span>---
 devel/qbs/Portfile                        | 13 +++------
 devel/qbs/files/patch-missing_header.diff | 44 -------------------------------
 2 files changed, 4 insertions(+), 53 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 68f7007..4909dc5 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,8 +6,7 @@ PortGroup           cxx11 1.1
</span> 
 name                qbs
 
<span style='display:block; white-space:pre;background:#ffe0e0;'>-version             1.12.0
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-revision            1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+version             1.12.1
</span> categories          devel
 platforms           darwin
 license             LGPL-2.1
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -19,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  ff268620365b957177882b0b489c49406c480a6a \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                    sha256  5efeb2492f8ccf0e7a5ea106f748e1c536f964674025aecb22c1ee948e3e35d1 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                    size    4368992
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums           rmd160  3aa23a7433079cfd7f04dbe86b90e8874e837e28 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                    sha256  8869177e6147ace5fcd40720ea81b10345e87f6556a17332521b9ff5b729c999 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                    size    4370590
</span> 
 qt5.depends_component qtscript
 
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -38,10 +37,6 @@ configure.post_args QBS_INSTALL_PREFIX=${prefix} \
</span> #    SOFT ASSERT: job->state() == AbstractJob::StateRunning in api/project.cpp:153
 patchfiles-append patch-environment.diff
 
<span style='display:block; white-space:pre;background:#ffe0e0;'>-# see https://bugreports.qt.io/browse/QBS-1370
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# see https://codereview.qt-project.org/#/c/234944/
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-patchfiles-append patch-missing_header.diff
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</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-missing_header.diff b/devel/qbs/files/patch-missing_header.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 28d5411..0000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/devel/qbs/files/patch-missing_header.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,44 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-From: Christian Kandeler <christian.kandeler@qt.io>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Date: Fri, 20 Jul 2018 08:31:53 +0000 (+0200)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Subject: Install missing header file
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-X-Git-Url: https://codereview.qt-project.org/gitweb?p=qbs%2Fqbs.git;a=commitdiff_plain;h=7878d02359115a5f1bd50d56c01823fc3df9575e;hp=415fe94f60a44aae19663cab36b6c381a871ca2c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Install missing header file
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Task-number: QBS-1370
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Change-Id: Ib541db1c783a6b7878d1712fd735dbb4779d2d96
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>----
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git a/src/lib/corelib/corelib.qbs b/src/lib/corelib/corelib.qbs
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-index 08733b624..93509763b 100644
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- src/lib/corelib/corelib.qbs
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ src/lib/corelib/corelib.qbs
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -440,7 +440,6 @@ QbsLibrary {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-             "settingscreator.h",
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-             "settingsmodel.cpp",
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-             "settingsrepresentation.cpp",
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--            "settingsrepresentation.h",
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-             "setupprojectparameters.cpp",
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-             "shellutils.cpp",
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-             "shellutils.h",
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -475,6 +474,7 @@ QbsLibrary {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-             "qbs_export.h",
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-             "settings.h",
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-             "settingsmodel.h",
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+            "settingsrepresentation.h",
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-             "setupprojectparameters.h",
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-             "toolchains.h",
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-             "version.h",
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git a/src/lib/corelib/tools/tools.pri b/src/lib/corelib/tools/tools.pri
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-index 9db30664f..bb3a55f12 100644
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- src/lib/corelib/tools/tools.pri
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ src/lib/corelib/tools/tools.pri
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -131,6 +131,7 @@ osx {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-         $$PWD/qbs_export.h \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-         $$PWD/settings.h \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-         $$PWD/settingsmodel.h \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+        $$PWD/settingsrepresentation.h \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-         $$PWD/setupprojectparameters.h \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-         $$PWD/toolchains.h \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-         $$PWD/version.h
</span></pre><pre style='margin:0'>

</pre>