<pre style='margin:0'>
Frank Schima (mf2k) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/07d4d8e65278965c6a590e7b00266fda9333f12a">https://github.com/macports/macports-ports/commit/07d4d8e65278965c6a590e7b00266fda9333f12a</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit 07d4d8e65278965c6a590e7b00266fda9333f12a
</span>Author: Mark Mentovai <mark@chromium.org>
AuthorDate: Sun May 10 21:47:04 2020 -0400
<span style='display:block; white-space:pre;color:#404040;'> lilypond-devel: update to 2.21.1
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> As requested by #7040.
</span>---
textproc/lilypond-devel/Portfile | 42 ++++++++++++++--------
.../files/patch-avoid-empty-locale.diff | 41 ---------------------
.../files/patch-wcxx11-narrowing.diff | 29 +++++++++++++++
3 files changed, 56 insertions(+), 56 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 33e3eab..681819b 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;'>@@ -1,12 +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 cxx11 1.1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+PortGroup active_variants 1.1
</span>
name lilypond-devel
set my_name lilypond
<span style='display:block; white-space:pre;background:#ffe0e0;'>-version 2.19.84
</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.1
</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 3e670a96d4394e00cf0d8a32aa003344beed9702 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 94dcc66447f24966f28eda72c79e1ec16143b8ea4a537cc9f97d017cc0c0dd11 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 18050320
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums rmd160 afafa73c517c086e3f42f942f8175229f33debdf \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 b7ccd72488b0838bc1ae5f490d6acefb292a902d977f6ed05f1eb26d30137e5e \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 18135688
</span>
platforms darwin
universal_variant no
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -32,11 +32,9 @@ universal_variant no
</span> depends_build-append \
port:autoconf \
port:bison \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- port:dblatex \
</span> port:flex \
port:fontforge \
port:gmake \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- port:netpbm \
</span> port:p5.28-encode \
port:p5.28-pod-escapes \
port:p5.28-pod-simple \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -44,14 +42,10 @@ depends_build-append \
</span> port:p5.28-scalar-list-utils \
port:pango \
port:pkgconfig \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- port:rsync \
</span> port:t1utils \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- port:texi2html \
</span> port:texinfo \
port:texlive-fonts-recommended \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- port:texlive-lang-cyrillic \
</span> port:texlive-metapost \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- port:texlive-xetex \
</span> port:urw-core35-fonts
depends_lib-append port:extractpdfmark \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -59,10 +53,14 @@ depends_lib-append port:extractpdfmark \
</span> port:guile18 \
port:python38
<span style='display:block; white-space:pre;background:#e0ffe0;'>+require_active_variants fontforge python38
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> build.type gnu
configure.cmd autoconf -f && ./configure
configure.python ${prefix}/bin/python3.8
<span style='display:block; white-space:pre;background:#e0ffe0;'>+compiler.cxx_standard 2011
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> set lilyponddevel.texgyredir \
"${prefix}/share/texmf-texlive/fonts/opentype/public/tex-gyre"
set lilyponddevel.mactex_bin ""
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -146,16 +144,25 @@ 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-avoid-empty-locale.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+patchfiles patch-wcxx11-narrowing.diff
</span>
post-patch {
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Backport upstream commit 250d841a51eb.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ reinplace -W ${worksrcpath} \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "s|\\(DBLATEX.*\\), \\\$DOCUMENTATION_REQUIRED,|\\1, OPTIONAL,|g" \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.ac
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> # Use guile18 header files.
reinplace -W ${worksrcpath} \
s|libguile\.h|libguile18.h|g \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- aclocal.m4 \
</span> configure.ac \
lily/include/lily-guile.hh
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ # echo -n is not portable.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ reinplace -W ${worksrcpath} \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "s|echo -n|printf %s|g" \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ mf/invoke-mf2pt1.sh
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> # Correct mf2pt1 binary location.
reinplace -W ${worksrcpath} \
s|"-mem=mf2pt1"|"-mem=../../mf2pt1"|g \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -167,7 +174,6 @@ post-patch {
</span> python/auxiliar/manuals_definitions.py \
scripts/auxiliar/check_texi_refs.py \
scripts/auxiliar/check_translation.py \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- scripts/auxiliar/coverage.py \
</span> scripts/auxiliar/find-superfluous-includes.py \
scripts/auxiliar/fixcc.py \
scripts/auxiliar/makelsr.py \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -199,6 +205,12 @@ post-destroot {
</span> }
variant docs description {Build documentation files} {
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_build-append port:netpbm \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:rsync \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:texi2html \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:texlive-lang-cyrillic \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:texlive-xetex
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> configure.args-delete --disable-documentation
configure.args-append --enable-documentation
}
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/textproc/lilypond-devel/files/patch-avoid-empty-locale.diff b/textproc/lilypond-devel/files/patch-avoid-empty-locale.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index a4343bd..0000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/textproc/lilypond-devel/files/patch-avoid-empty-locale.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,41 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-From 258fa50cde0ac2e59e4726e05183e4999ff9213d Mon Sep 17 00:00:00 2001
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-From: Werner Lemberg <wl@gnu.org>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Date: Thu, 13 Feb 2020 16:20:47 +0100
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Subject: [PATCH] Avoid empty locale while building LilyPond.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-This is necessary because gettext versions >= 0.21 derive language
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-information from other system settings if `LANG` (or `LANGUAGE`) is not set.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>----
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- stepmake/stepmake/generic-vars.make | 2 +-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- stepmake/stepmake/texinfo-vars.make | 2 +-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 2 files changed, 2 insertions(+), 2 deletions(-)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git a/stepmake/stepmake/generic-vars.make b/stepmake/stepmake/generic-vars.make
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-index 3c482bb415..59c1107a48 100644
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- stepmake/stepmake/generic-vars.make
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ stepmake/stepmake/generic-vars.make
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -60,7 +60,7 @@ endif
</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;'>- # no locale settings in the build process.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--LANG=
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+LANG=C
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- export LANG
</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;'>-diff --git a/stepmake/stepmake/texinfo-vars.make b/stepmake/stepmake/texinfo-vars.make
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-index 83709e32ef..92abdea855 100644
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- stepmake/stepmake/texinfo-vars.make
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ stepmake/stepmake/texinfo-vars.make
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -32,7 +32,7 @@ DO_TEXI_DEP = ( echo ./$@: $(call scan-texi,$<) > $(basename $@).dep ) &&
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- TEXINFO_PAPERSIZE_OPTION= $(if $(findstring $(PAPERSIZE),a4),,-t @afourpaper)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- MAKEINFO_FLAGS += --enable-encoding --error-limit=0 $(DOCUMENTATION_INCLUDES)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--MAKEINFO = LANG= $(MAKEINFO_PROGRAM) $(MAKEINFO_FLAGS)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+MAKEINFO = LANG=C $(MAKEINFO_PROGRAM) $(MAKEINFO_FLAGS)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # texi2html xref map files
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- XREF_MAPS_DIR = $(top-build-dir)/$(outdir)/xref-maps
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-2.16.4
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><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>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 0000000..2fb0e4b
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/textproc/lilypond-devel/files/patch-wcxx11-narrowing.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,29 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+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:#e0ffe0;'>+ uint8_t text_code[] = {0xff, audio_->type_};
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ^~~~~~~~~~~~~
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+midi-item.cc:322:32: note: insert an explicit cast to silence this issue
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ uint8_t text_code[] = {0xff, audio_->type_};
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ^~~~~~~~~~~~~
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ static_cast<uint8_t>( )
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- lily/include/audio-item.hh
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ lily/include/audio-item.hh
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -110,17 +110,17 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ public:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ std::string type_string_;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ Direction dir_;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ };
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ class Audio_text : public Audio_item
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ public:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- enum Type
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ enum Type : uint8_t
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ TEXT = 1, COPYRIGHT, TRACK_NAME, INSTRUMENT_NAME, LYRIC,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ MARKER, CUE_POINT
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ };
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ Audio_text (Audio_text::Type type, const std::string &text_string);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ Type type_;
</span></pre><pre style='margin:0'>
</pre>