<pre style='margin:0'>
Aljaž Srebrnič (g5pw) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/660f343495675dbc24c626c7269d3800c4a7e224">https://github.com/macports/macports-ports/commit/660f343495675dbc24c626c7269d3800c4a7e224</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit 660f343495675dbc24c626c7269d3800c4a7e224
</span>Author: Davide Liessi <davide.liessi@gmail.com>
AuthorDate: Mon Dec 28 10:53:58 2020 +0100
<span style='display:block; white-space:pre;color:#404040;'> frescobaldi: update to 3.1.3 and other changes
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> - update frescobaldi(-devel) to 3.1.3
</span><span style='display:block; white-space:pre;color:#404040;'> - switch frescobaldi(-devel) to Python 3.9
</span><span style='display:block; white-space:pre;color:#404040;'> - allow installing frescobaldi(-devel) on Snow Leopard
</span><span style='display:block; white-space:pre;color:#404040;'> with QtWebEngine disabled
</span><span style='display:block; white-space:pre;color:#404040;'> - disable QtWebEngine also on Lion and Mountain Lion,
</span><span style='display:block; white-space:pre;color:#404040;'> where it cannot build
</span><span style='display:block; white-space:pre;color:#404040;'> - fix livecheck for frescobaldi2
</span>---
editors/frescobaldi/Portfile | 96 ++++++++++++++++++++++----------------------
1 file changed, 49 insertions(+), 47 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 149a0a655db..da9a95f7fa9 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,7 +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 3.1.2 v
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+github.setup wbsoft frescobaldi 3.1.3 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;'>@@ -19,21 +19,20 @@ license GPL-2+
</span>
github.tarball_from releases
<span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums rmd160 3717c40f177762877757037d1887c409315e47be \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 5c2cffb8282cd9faef1585808bd800d1eb3c0db4cc464a61ce8576dbf7ef9b20 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 6567483
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums rmd160 62735baae36fcd4b38813378c9a4322124bba540 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 9c7f5036f367691454753f1db06ea02c33501c1e4f24bfb47485103911f3e9c1 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 6691789
</span>
subport ${name}-devel {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- set devel_version ${github.version}-dev
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- github.setup wbsoft frescobaldi c2b5af3e1cdcde51f996407a27cebff4ad9e1d33
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set devel_version ${github.version}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # When frescobaldi-devel is different from frescobaldi and points
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # to a commit hash, append '-dev' to devel_version above, then use
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # github.setup with the commit hash (before setting version below).
</span> conflicts ${name} ${name}2
<span style='display:block; white-space:pre;background:#ffe0e0;'>- version 20200719
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ version 20201226
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>- github.tarball_from archive
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- checksums rmd160 e5c8236142cddcee8e0024e03fb231c517c6ffb7 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 287597644e51dcebd88a49d94061551b2687ed8d2c810f768015da27793fd480 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 9320877
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # When using a commit hash, uncomment the following line.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # github.tarball_from archive
</span> }
subport ${name}2 {
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -46,42 +45,18 @@ subport ${name}2 {
</span> size 4478977
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-# keep this block until 27 December 2020
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# then add block to prevent installation of frescobaldi and
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# frescobaldi-devel prior to 10.7 (QtWebEngine appeared after
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# Qt 5.3, which is the latest version available on 10.6)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-if {${os.platform} eq "darwin" && ${os.major} < 11} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if {${name} eq ${subport}} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- version 2.20.0
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- revision 2
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if {"${name}-devel" eq ${subport}} {
</span><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:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if {${name} eq ${subport} || "${name}-devel" eq ${subport}} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- replaced_by ${name}2
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- long_description ${long_description} \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- \n\nFrescobaldi 3 requires Qt 5, \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- which is not supported on your system. \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- You may install Frescobaldi 2 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- (i.e., the port ${name}2) instead.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if {"${name}2" eq ${subport}} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # don't conflict with frescobaldi and frescobaldi-devel,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # allowing replaced_by to act as expected
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- conflicts
</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;'>-
</span> depends_run-append port:portmidi
<span style='display:block; white-space:pre;background:#ffe0e0;'>-python.default_version 37
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+if {"${name}2" eq ${subport}} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ python.default_version 37
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+} else {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ python.default_version 39
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</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:#e0ffe0;'>+if {"${name}-devel" eq ${subport} && ${devel_version} ne ${github.version}} {
</span> depends_build-append port:gettext \
port:appstream-glib
}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -91,8 +66,32 @@ if {"${name}2" eq ${subport}} {
</span> port:py${python.version}-poppler-qt4
} else {
depends_run-append port:py${python.version}-pyqt5 \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- port:py${python.version}-pyqt5-webengine \
</span> port:py${python.version}-poppler-qt5
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {${os.platform} eq "darwin" && ${os.major} < 13} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # QtWebEngine appeared after Qt 5.3, which is the latest version
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # available on Mac OS X 10.6 (Darwin 10);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # none of the supported versions (5.5, 5.6) builds on Mac OS X 10.7
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # (Darwin 11);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # version 5.5 may build on OS X 10.8 (Darwin 12), where the
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # default version is 5.7, but I am not sure and I don't want to
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # take care of this case in the Portfile: I will give instructions
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # on manually installing Qt 5.5 instead of 5.7 to individual users
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # if needed.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ long_description ${long_description} \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ \nSome of Frescobaldi's tools \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ will not work on this system \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ (see port notes for details).
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ notes-append "Some of Frescobaldi's tools, namely the\
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ Documentation Browser and the SVG View,\
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ require QtWebEngine,\
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ which cannot be installed on your system.\
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ You may use Frescobaldi 3 without those \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ tools or install Frescobaldi 2\
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ (i.e., the port ${name}2) instead."
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ notes-append {}
</span><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-webengine
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span> }
variant app description {Make application bundle} {
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -104,7 +103,7 @@ if {![variant_isset app]} {
</span> supported_archs noarch
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-if {"${name}-devel" eq ${subport}} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+if {"${name}-devel" eq ${subport} && ${devel_version} ne ${github.version}} {
</span> pre-build {
system -W ${worksrcpath} "make PYTHON=${python.bin} -C i18n"
system -W ${worksrcpath} "make -C linux"
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -156,10 +155,13 @@ post-destroot {
</span> }
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-notes \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-"You may want to install FluidSynth and obtain a SoundFont\
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-in order to have audio output from Frescobaldi's MIDI output.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+if {"${name}2" eq ${subport}} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ github.livecheck.regex {(2[^"]+)}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span>
<span style='display:block; white-space:pre;background:#e0ffe0;'>+notes-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+"You may want to install FluidSynth and obtain a SoundFont\
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+in order to have audio output from Frescobaldi's MIDI output.\
</span> You will need to select FluidSynth's MIDI input port\
in Frescobaldi's MIDI settings (in Preferences)\
while FluidSynth is running."
</pre><pre style='margin:0'>
</pre>