<pre style='margin:0'>
Ryan Schmidt (ryandesign) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/4fd3c73c326ac88686e11cc3e40b3eb441d6ffeb">https://github.com/macports/macports-ports/commit/4fd3c73c326ac88686e11cc3e40b3eb441d6ffeb</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 4fd3c73c326 lilypond-devel: update to version 2.21.2
</span>4fd3c73c326 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 4fd3c73c326ac88686e11cc3e40b3eb441d6ffeb
</span>Author: Werner Lemberg <wl@gnu.org>
AuthorDate: Thu Jun 25 13:11:04 2020 +0200
<span style='display:block; white-space:pre;color:#404040;'> lilypond-devel: update to version 2.21.2
</span>---
textproc/lilypond-devel/Portfile | 42 +++++-----------------
.../files/patch-wcxx11-narrowing.diff | 29 ---------------
2 files changed, 9 insertions(+), 62 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/textproc/lilypond-devel/Portfile b/textproc/lilypond-devel/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 7f5f2972936..0f19758da88 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/textproc/lilypond-devel/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/textproc/lilypond-devel/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -5,8 +5,8 @@ PortGroup active_variants 1.1
</span>
name lilypond-devel
set my_name lilypond
<span style='display:block; white-space:pre;background:#ffe0e0;'>-version 2.21.1
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+version 2.21.2
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 0
</span> set branch [join [lrange [split ${version} .] 0 1] .]
categories textproc
maintainers {snc @nerdling} openmaintainer
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -22,9 +22,9 @@ long_description Lilypond is a unix-based automated engraving system that \
</span> homepage https://lilypond.org
master_sites https://lilypond.org/download/sources/v${branch}/
distname ${my_name}-${version}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums rmd160 afafa73c517c086e3f42f942f8175229f33debdf \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 b7ccd72488b0838bc1ae5f490d6acefb292a902d977f6ed05f1eb26d30137e5e \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 18135688
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums rmd160 79a499ea4266358c2e061099e9beaaa023528367 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 af5dd5fce4f7d2850fb07104c1c837f398f336a27032e356306e6a987f86a3a3 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 18103643
</span>
platforms darwin
universal_variant no
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -55,11 +55,6 @@ depends_lib-append path:lib/pkgconfig/pango.pc:pango \
</span> port:guile18 \
port:python38
<span style='display:block; white-space:pre;background:#ffe0e0;'>-# Needed for PNG generation.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# Will no longer be needed for next development release.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-depends_run-append port:netpbm
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> require_active_variants fontforge python38
build.type gnu
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -157,35 +152,13 @@ configure.env-append LTDL_LIBRARY_PATH=${prefix}/lib
</span> build.env-append LTDL_LIBRARY_PATH=${prefix}/lib
destroot.env-append LTDL_LIBRARY_PATH=${prefix}/lib
<span style='display:block; white-space:pre;background:#ffe0e0;'>-patchfiles patch-wcxx11-narrowing.diff
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> post-patch {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- # Backport upstream commit 250d841a51eb to make dependency on
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # dblatex optional.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- reinplace -W ${worksrcpath} \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- "s|\\(DBLATEX.*\\), \\\$DOCUMENTATION_REQUIRED,|\\1, OPTIONAL,|g" \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.ac
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # Currently, +docs only builds the info files. For a real
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # documentation build a texi2html 1.82 bundle is necessary, which
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # doesn't exist yet in MacPorts.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if {[variant_isset docs]} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- reinplace -W ${worksrcpath} \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- "s|\\(TEXI2HTML.*\\), \\\$DOCUMENTATION_REQUIRED,|\\1, OPTIONAL,|g" \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.ac
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> # Use guile18 header files.
reinplace -W ${worksrcpath} \
s|libguile\.h|libguile18.h|g \
configure.ac \
lily/include/lily-guile.hh
<span style='display:block; white-space:pre;background:#ffe0e0;'>- # echo -n is not portable.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- reinplace -W ${worksrcpath} \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- "s|echo -n|printf %s|g" \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- mf/invoke-mf2pt1.sh
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> # Correct mf2pt1 binary location.
reinplace -W ${worksrcpath} \
s|"-mem=mf2pt1"|"-mem=../../mf2pt1"|g \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -210,7 +183,6 @@ post-patch {
</span> scripts/auxiliar/strip-whitespace.py \
scripts/auxiliar/tely-gettext.py \
scripts/auxiliar/texi-langutils.py \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- scripts/auxiliar/texi-skeleton-update.py \
</span> scripts/auxiliar/translations-status.py \
scripts/auxiliar/update-snippets.py
}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -228,8 +200,12 @@ post-destroot {
</span> }
variant docs description {Build documentation files} {
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Currently, +docs only builds the info files. For a real
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # documentation build a texi2html 1.82 bundle is necessary, which
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # doesn't exist yet in MacPorts.
</span> configure.args-delete --disable-documentation
configure.args-append --enable-documentation
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.args-append --disable-texi2html
</span> }
livecheck.type regex
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/textproc/lilypond-devel/files/patch-wcxx11-narrowing.diff b/textproc/lilypond-devel/files/patch-wcxx11-narrowing.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 2fb0e4bf62b..00000000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/textproc/lilypond-devel/files/patch-wcxx11-narrowing.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,29 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-midi-item.cc:322:32: error: non-constant-expression cannot be narrowed from type 'Audio_text::Type' to 'uint8_t' (aka 'unsigned char') in initializer list [-Wc++11-narrowing]
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- uint8_t text_code[] = {0xff, audio_->type_};
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ^~~~~~~~~~~~~
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-midi-item.cc:322:32: note: insert an explicit cast to silence this issue
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- uint8_t text_code[] = {0xff, audio_->type_};
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ^~~~~~~~~~~~~
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- static_cast<uint8_t>( )
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- lily/include/audio-item.hh
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ lily/include/audio-item.hh
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -110,17 +110,17 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- public:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- std::string type_string_;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- Direction dir_;
</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;'>- class Audio_text : public Audio_item
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- public:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- enum Type
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ enum Type : uint8_t
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- TEXT = 1, COPYRIGHT, TRACK_NAME, INSTRUMENT_NAME, LYRIC,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- MARKER, CUE_POINT
</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;'>- Audio_text (Audio_text::Type type, const std::string &text_string);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- Type type_;
</span></pre><pre style='margin:0'>
</pre>