<pre style='margin:0'>
Renee Otten (reneeotten) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/541f00e2cbac2fe78460c621bde8f02373438a3e">https://github.com/macports/macports-ports/commit/541f00e2cbac2fe78460c621bde8f02373438a3e</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit 541f00e2cbac2fe78460c621bde8f02373438a3e
</span>Author: Ivan Komissarov <abbapoh@gmail.com>
AuthorDate: Mon May 1 16:50:08 2023 +0300
<span style='display:block; white-space:pre;color:#404040;'> qbs: Update to 2.0.0
</span>---
devel/qbs/Portfile | 16 ++++++++--------
devel/qbs/files/patch-find-package.diff | 10 ++++++++++
2 files changed, 18 insertions(+), 8 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 a2b6441baf4..5d154f99593 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 cmake 1.1
</span> PortGroup compiler_blacklist_versions 1.0
name qbs
<span style='display:block; white-space:pre;background:#ffe0e0;'>-version 1.23.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+version 2.0.0
</span> revision 0
categories devel
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -21,11 +21,10 @@ 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 69a2581f7eb1bea1847c37bb0aaeacca2bfa0a95 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 c86aa775446aec728bcbbed782ec128f4e6e2c26536710017343e684bb616d7a \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 5078941
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums rmd160 12fa4f49fe40337d342408abb680e596b89bfad6 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 d78555691ea732949346860e56f68c7c44e9384011359722b032a49b52dfccfd \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 5509775
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-qt5.depends_component qtscript
</span> qt5.min_version 5.14.0
compiler.cxx_standard 2017
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -43,7 +42,8 @@ cmake.generator Ninja
</span> # Reason: image not found
# set TMPDIR to avoid
# SOFT ASSERT: job->state() == AbstractJob::StateRunning in api/project.cpp:153
<span style='display:block; white-space:pre;background:#ffe0e0;'>-patchfiles-append patch-environment.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+#patchfiles-append patch-environment.diff patch-qbs-docs.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+patchfiles-append patch-environment.diff patch-find-package.diff
</span>
livecheck.type regex
livecheck.url https://download.qt.io/official_releases/qbs/
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -64,10 +64,10 @@ subport ${name}-docs {
</span> # TODO: only HTML docs are installed, dunno how to run
# `cmake --install .` twice
configure.args-append -DQBS_INSTALL_HTML_DOCS=YES -DQBS_INSTALL_QCH_DOCS=Yes -DPYTHON_EXECUTABLE:FILEPATH=${prefix}/bin/python${py_ver}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- build.target BuildQbsDocumentation
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ build.target qbs_docs
</span>
destroot.pre_args --install
<span style='display:block; white-space:pre;background:#ffe0e0;'>- destroot.args . --component qbs_html_docs
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ destroot.args . --component qbs_docs
</span> destroot.target ""
destroot.cmd cmake
}
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/qbs/files/patch-find-package.diff b/devel/qbs/files/patch-find-package.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..93948e1e997
</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-find-package.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;'>+--- CMakeLists.txt.orig 2023-05-06 22:13:00
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ CMakeLists.txt 2023-05-06 22:12:49
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -54,6 +54,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if(NOT TARGET Qt6Core5Compat)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ add_library(Qt6Core5Compat INTERFACE)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ endif()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ find_package(Qt${QT_VERSION_MAJOR} OPTIONAL_COMPONENTS DocTools)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ endif()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (QBS_INSTALL_HTML_DOCS OR QBS_INSTALL_QCH_DOCS)
</span></pre><pre style='margin:0'>
</pre>