<pre style='margin:0'>
Ken (kencu) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/99116a810a225b46b62479f90aec1f0438de3f34">https://github.com/macports/macports-ports/commit/99116a810a225b46b62479f90aec1f0438de3f34</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 99116a8 frescobaldi: update to 3.1
</span>99116a8 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 99116a810a225b46b62479f90aec1f0438de3f34
</span>Author: Davide Liessi <davide.liessi@gmail.com>
AuthorDate: Fri Dec 27 23:56:15 2019 +0100
<span style='display:block; white-space:pre;color:#404040;'> frescobaldi: update to 3.1
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> - update both frescobaldi and frescobaldi-devel to latest version,
</span><span style='display:block; white-space:pre;color:#404040;'> requiring PyQt5 (including QtWebEngine)
</span><span style='display:block; white-space:pre;color:#404040;'> - replace frescobaldi and frescobaldi-devel with frescobaldi2
</span><span style='display:block; white-space:pre;color:#404040;'> prior to Mac OS X 10.7 (QtWebEngine appeared after Qt 5.3,
</span><span style='display:block; white-space:pre;color:#404040;'> which is the latest version available on Mac OS X 10.6)
</span><span style='display:block; white-space:pre;color:#404040;'> - use Python 3.7 for all
</span>---
editors/frescobaldi/Portfile | 70 +++++++++++++++++++++-----------------------
1 file changed, 33 insertions(+), 37 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/editors/frescobaldi/Portfile b/editors/frescobaldi/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index cef35de..8406133 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/editors/frescobaldi/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/editors/frescobaldi/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -4,8 +4,7 @@ PortSystem 1.0
</span> PortGroup python 1.0
PortGroup github 1.0
<span style='display:block; white-space:pre;background:#ffe0e0;'>-github.setup wbsoft frescobaldi 2.20.0 v
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+github.setup wbsoft frescobaldi 3.1 v
</span> conflicts ${name}-devel ${name}2
categories editors python
maintainers {gmail.com:davide.liessi @dliessi} openmaintainer
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -18,38 +17,42 @@ homepage http://www.frescobaldi.org/
</span> platforms darwin
license GPL-2+
<span style='display:block; white-space:pre;background:#ffe0e0;'>-# frescobaldi-devel points to a specific commit and not to a release
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-if {"${name}-devel" ne ${subport}} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- github.tarball_from releases
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+github.tarball_from releases
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums rmd160 27f121545cc7efe6a2b10fa69490a5714655f729 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 c3d7faab7b21ddbab98749751a94d0a848138a800b0ae744f0ec94000b459ae4 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 4478977
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums rmd160 e68c671a2baa179c19549c325cb376d329ebb33e \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 1a37ab60aaed848e66ef8e5b0ccc963d794bf05994fc36defbc761a65fd3506b \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 6243866
</span>
subport ${name}-devel {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- PortGroup active_variants 1.1
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- github.setup wbsoft ${name} 8e43f2f01cf56803a8c10b98d8787f97015895a0
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- revision 0
</span> conflicts ${name} ${name}2
<span style='display:block; white-space:pre;background:#ffe0e0;'>- version 20180806
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set devel_version 3.0.0
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- checksums rmd160 e79fb399116910fe15df5f449b495e7f0ab39165 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 38e9f0f003316b70a1d11623087bd903d4f600e46930c757cedbf572979434f5 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 8501726
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ version 20191227
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set devel_version ${github.version}
</span> }
subport ${name}2 {
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ github.setup wbsoft frescobaldi 2.20.0 v
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ revision 1
</span> conflicts ${name} ${name}-devel
<span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ checksums rmd160 27f121545cc7efe6a2b10fa69490a5714655f729 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 c3d7faab7b21ddbab98749751a94d0a848138a800b0ae744f0ec94000b459ae4 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 4478977
</span> }
<span style='display:block; white-space:pre;background:#ffe0e0;'>-# remove this block after 8 August 2019
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# keep this block until 27 December 2020
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# then add block to prevent installation of frescobaldi and
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# frescobaldi-devel prior to 10.7 (QtWebEngine appeared after
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# Qt 5.3, which is the latest version available on 10.6)
</span> if {${os.platform} eq "darwin" && ${os.major} < 11} {
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {${name} eq ${subport}} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ version 2.20.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ revision 2
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span> if {"${name}-devel" eq ${subport}} {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- version 20170217
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- revision 2
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ version 20170217
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ revision 2
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {${name} eq ${subport} || "${name}-devel" eq ${subport}} {
</span> replaced_by ${name}2
long_description ${long_description} \
\n\nFrescobaldi 3 requires Qt 5, \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -58,33 +61,26 @@ if {${os.platform} eq "darwin" && ${os.major} < 11} {
</span> (i.e., the port ${name}2) instead.
}
if {"${name}2" eq ${subport}} {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- # don't conflict with frescobaldi-devel,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # don't conflict with frescobaldi and frescobaldi-devel,
</span> # allowing replaced_by to act as expected
<span style='display:block; white-space:pre;background:#ffe0e0;'>- conflicts ${name}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ conflicts {}
</span> }
}
depends_run-append port:portmidi
<span style='display:block; white-space:pre;background:#ffe0e0;'>-# keep Python 3.5 for frescobaldi until next version update
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# to avoid unnecessary building of py37-pyqt4 on user machine
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# (the next version of frescobaldi will depend on py37-pyqt5)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-if {${name} eq ${subport}} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- python.default_version 35
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-} else {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- python.default_version 37
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+python.default_version 37
</span>
depends_build-append port:py${python.version}-setuptools
depends_lib-append port:py${python.version}-ly
<span style='display:block; white-space:pre;background:#ffe0e0;'>-if {"${name}-devel" eq ${subport}} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- depends_run-append port:py${python.version}-pyqt5 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:py${python.version}-poppler-qt5
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- require_active_variants py${python.version}-pyqt5 webkit
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-} else {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+if {"${name}2" eq ${subport}} {
</span> depends_run-append port:py${python.version}-pyqt4 \
port:py${python.version}-poppler-qt4
<span style='display:block; white-space:pre;background:#e0ffe0;'>+} else {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_run-append port:py${python.version}-pyqt5 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:py${python.version}-pyqt5-webengine \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:py${python.version}-poppler-qt5
</span> }
variant app description {Make application bundle} {
</pre><pre style='margin:0'>
</pre>