<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/2ec9108a3ba32831a5e9e7a80d097af7a986a044">https://github.com/macports/macports-ports/commit/2ec9108a3ba32831a5e9e7a80d097af7a986a044</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 2ec9108a3ba qbs: port to cmake and update to 1.23.0
</span>2ec9108a3ba is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 2ec9108a3ba32831a5e9e7a80d097af7a986a044
</span>Author: Ivan Komissarov <abbapoh@gmail.com>
AuthorDate: Fri Aug 5 22:34:20 2022 +0300
<span style='display:block; white-space:pre;color:#404040;'> qbs: port to cmake and update to 1.23.0
</span>---
devel/qbs/Portfile | 42 +++++++++++++++++-----------------
devel/qbs/files/patch-doc.diff | 16 -------------
devel/qbs/files/patch-environment.diff | 19 ++++++++-------
3 files changed, 30 insertions(+), 47 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 51bd585de5d..aa96f3ac544 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;'>@@ -1,11 +1,12 @@
</span> # -*- coding: utf-8; mode: tcl; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- vim:fenc=utf-8:ft=tcl:et:sw=4:ts=4:sts=4
PortSystem 1.0
<span style='display:block; white-space:pre;background:#ffe0e0;'>-PortGroup qmake5 1.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+PortGroup qt5 1.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+PortGroup cmake 1.1
</span> PortGroup compiler_blacklist_versions 1.0
name qbs
<span style='display:block; white-space:pre;background:#ffe0e0;'>-version 1.21.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+version 1.23.0
</span> revision 0
categories devel
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -20,9 +21,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 feb3267b0fa9eea1e40e0563340a594fd0c949e0 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 bfed9d93f94989986dd72e81fac5f39e30de058431133a21aaf9971455b335e7 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 5082730
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums rmd160 69a2581f7eb1bea1847c37bb0aaeacca2bfa0a95 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 c86aa775446aec728bcbbed782ec128f4e6e2c26536710017343e684bb616d7a \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 5078941
</span>
qt5.depends_component qtscript
qt5.min_version 5.14.0
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -32,10 +33,9 @@ compiler.cxx_standard 2017
</span> # https://github.com/macports/macports-base/pull/179
compiler.blacklist-append {clang < 1001}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-configure.post_args QBS_INSTALL_PREFIX=${prefix} \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- CONFIG+=qbs_disable_rpath \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- CONFIG+=qbs_enable_project_file_updates \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- qbs.pro
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+configure.args-append -DQBS_ENABLE_RPATH=NO
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+cmake.generator Ninja
</span>
# set DYLD_LIBRARY_PATH to avoid
# dyld: Library not loaded: ${prefix}/lib/libqbscore.1.dylib
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -53,18 +53,18 @@ subport ${name}-docs {
</span>
universal_variant no
supported_archs noarch
<span style='display:block; white-space:pre;background:#ffe0e0;'>- qt5.debug_variant no
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- build.target docs
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- destroot.target install_docs
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ qt5.depends_build_component sqlite-plugin qttools
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_build-append port:python310 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:py310-beautifulsoup4 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:py310-lxml
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>- patchfiles-append patch-doc.diff
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- post-patch {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- reinplace \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- "s|__MACPORTS_DOC_HTML_INSTALLDIR__|${qt_docs_dir}|g" \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ${worksrcpath}/doc/doc.pri
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # TODO: only HTML docs are installed, dunno how to run
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # `cmake --install .` twice
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.args-append -DQBS_INSTALL_HTML_DOCS=YES -DQBS_INSTALL_QCH_DOCS=Yes
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ build.target BuildQbsDocumentation
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>- qt5.depends_build_component sqlite-plugin qttools
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- depends_run-append port:${name}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ destroot.pre_args --install
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ destroot.args . --component qbs_html_docs
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ destroot.target ""
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ destroot.cmd cmake
</span> }
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/qbs/files/patch-doc.diff b/devel/qbs/files/patch-doc.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 6c9b2ec6224..00000000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/devel/qbs/files/patch-doc.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,16 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- doc/doc.pri.orig 2017-06-25 18:30:29.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ doc/doc.pri 2017-06-25 18:32:11.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -2,10 +2,10 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- include(doc_shared.pri)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--DOC_OUTDIR_POSTFIX = /html
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--DOC_HTML_INSTALLDIR = $$QBS_INSTALL_PREFIX/share/doc/qbs
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+DOC_OUTDIR_POSTFIX = /qbs
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+DOC_HTML_INSTALLDIR = __MACPORTS_DOC_HTML_INSTALLDIR__
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- DOC_QCH_OUTDIR = $$OUT_PWD/doc
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--DOC_QCH_INSTALLDIR = $$QBS_INSTALL_PREFIX/share/doc/qbs
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+DOC_QCH_INSTALLDIR = __MACPORTS_DOC_HTML_INSTALLDIR__
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- include(doc_targets.pri)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><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 696b62f611f..0e969cf6684 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,11 +1,10 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- static-res.pro.orig
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ static-res.pro
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -15,6 +15,8 @@ unix:qbs_disable_rpath {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- envSpec = $$envVar=$$newVal
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- share/CMakeLists.txt.orig 2021-08-02 22:56:13.000000000 +0300
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ share/CMakeLists.txt 2021-08-12 19:18:32.000000000 +0300
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -33,6 +33,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ )
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+envSpec += TMPDIR=$$shell_path(/tmp)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- builddirname = qbsres
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- typedescdir = share/qbs/qml-type-descriptions
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- typedescdir_src = $$builddirname/default/install-root/$$typedescdir
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ get_update_path_command(UPDATE_PATH_COMMAND)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++set(UPDATE_PATH_COMMAND "TMPDIR=/tmp")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ get_target_property(_QBS_OUTPUT_DIR qbs RUNTIME_OUTPUT_DIRECTORY)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ add_custom_target(
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ BuildQbsResources ALL
</span></pre><pre style='margin:0'>
</pre>