<pre style='margin:0'>
Jeremy L (nerdling) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/cfae3151d43bdddc9c4ae1f1b45bd524795d53bf">https://github.com/macports/macports-ports/commit/cfae3151d43bdddc9c4ae1f1b45bd524795d53bf</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 cfae315 lilypond-devel: update to 2.19.84
</span>cfae315 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit cfae3151d43bdddc9c4ae1f1b45bd524795d53bf
</span>Author: Werner Lemberg <wl@gnu.org>
AuthorDate: Thu Feb 13 17:55:09 2020 +0100
<span style='display:block; white-space:pre;color:#404040;'> lilypond-devel: update to 2.19.84
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> * LilyPond now compiles with clang, too. All code enforcing gcc is removed.
</span><span style='display:block; white-space:pre;color:#404040;'> * Also update to python 3.7.
</span><span style='display:block; white-space:pre;color:#404040;'> * Remove strict prototypes warning patch, which is already in the tarball.
</span><span style='display:block; white-space:pre;color:#404040;'> * Add patch to handle new gettext behaviour.
</span>---
textproc/lilypond-devel/Portfile | 61 ++++------------------
.../files/patch-avoid-empty-locale.diff | 41 +++++++++++++++
.../files/patch-no-Wstrict-prototypes-warning.diff | 52 ------------------
3 files changed, 51 insertions(+), 103 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 1ef44d2..a3fa51c 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;'>@@ -6,8 +6,8 @@ PortGroup cxx11 1.1
</span>
name lilypond-devel
set my_name lilypond
<span style='display:block; white-space:pre;background:#ffe0e0;'>-version 2.19.83
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 3
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+version 2.19.84
</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;'>@@ -19,15 +19,14 @@ long_description Lilypond is a unix-based automated engraving system that \
</span> similar to LaTeX. Lilypond can export sheet music to PDF, \
EPS, SVG, and PNG formats, and can also create MIDI files.
<span style='display:block; white-space:pre;background:#ffe0e0;'>-homepage http://lilypond.org/
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+homepage https://lilypond.org/
</span> conflicts lilypond
platforms darwin
<span style='display:block; white-space:pre;background:#ffe0e0;'>-master_sites http://lilypond.org/download/sources/v${branch}/
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# master_sites http://download.linuxaudio.org/lilypond/sources/v${branch}/
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+master_sites https://lilypond.org/download/sources/v${branch}/
</span> distname ${my_name}-${version}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums rmd160 6250667c2a2799ec404e10e3e141101d043ab7f6 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 96ba4f4b342d21057ad74d85d647aea7e47a5c24f895127c2b3553a252738fb3 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 17996428
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums rmd160 3e670a96d4394e00cf0d8a32aa003344beed9702 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 94dcc66447f24966f28eda72c79e1ec16143b8ea4a537cc9f97d017cc0c0dd11 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 18050320
</span>
depends_build-append \
port:autoconf \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -54,10 +53,10 @@ depends_lib-append path:lib/pkgconfig/glib-2.0.pc:glib2 \
</span> port:gettext \
port:ghostscript \
port:guile18 \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- port:python27
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:python37
</span>
configure.cmd autoconf -f && ./configure
<span style='display:block; white-space:pre;background:#ffe0e0;'>-configure.python ${frameworks_dir}/Python.framework/Versions/2.7/bin/python2.7
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+configure.python ${prefix}/bin/python3.7
</span>
set lilyponddevel.texgyredir \
"${prefix}/share/texmf-texlive/fonts/opentype/public/tex-gyre"
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -121,7 +120,7 @@ variant mactex description {Allow lilypond-devel to use MacTeX or another\
</span> }
patchfiles patch-scripts-build-mf2pt1.pl.diff \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- patch-no-Wstrict-prototypes-warning.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patch-avoid-empty-locale.diff
</span> post-patch {
# Use guile18 header files
reinplace s|libguile\.h|libguile18.h|g \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -133,46 +132,6 @@ post-patch {
</span> reinplace s|20110222|2011-02-22|g ${worksrcpath}/configure
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-# lilypond currently relies on a g++ extension (which appears to be
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# non-standard C++) that prevents compilation with clang, cf.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-#
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# https://lists.gnu.org/archive/html/bug-lilypond/2016-07/msg00071.html
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-#
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# and the thread starting with
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-#
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# http://lists.llvm.org/pipermail/cfe-users/2018-November/001417.html
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-#
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# According to one of the main developers of lilypond, it is not
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# possible to circumvent this issue without rewriting a considerable
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# amount of code.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# g++ uses libstdc++; setting this prevents the application from being
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# flagged as broken.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-configure.cxx_stdlib macports-libstdc++
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# blacklist any clang compiler and any old gcc (a better expression is needed)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-compiler.blacklist *clang* \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- *llvm-gcc* \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- *apple-gcc* \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- gcc \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- gcc-3.3 gcc-4.0 gcc-4.2
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-if { ${os.major} >= 11 } {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- compiler.fallback-append \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- macports-gcc-9
</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;'>-if { ${os.major} >= 10 } {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- compiler.fallback-append \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- macports-gcc-8
</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;'>-compiler.fallback-append \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- macports-gcc-7 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- macports-gcc-6 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- macports-gcc-5 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- macports-gcc-4.9 macports-gcc-4.8 macports-gcc-4.7
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> configure.args-append \
--with-urwotf-dir=${prefix}/share/fonts/urw-core35-fonts \
--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>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 0000000..a4343bd
</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-avoid-empty-locale.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,41 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+From 258fa50cde0ac2e59e4726e05183e4999ff9213d Mon Sep 17 00:00:00 2001
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+From: Werner Lemberg <wl@gnu.org>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Date: Thu, 13 Feb 2020 16:20:47 +0100
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Subject: [PATCH] Avoid empty locale while building LilyPond.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+This is necessary because gettext versions >= 0.21 derive language
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+information from other system settings if `LANG` (or `LANGUAGE`) is not set.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+---
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ stepmake/stepmake/generic-vars.make | 2 +-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ stepmake/stepmake/texinfo-vars.make | 2 +-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 2 files changed, 2 insertions(+), 2 deletions(-)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git a/stepmake/stepmake/generic-vars.make b/stepmake/stepmake/generic-vars.make
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 3c482bb415..59c1107a48 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- stepmake/stepmake/generic-vars.make
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ stepmake/stepmake/generic-vars.make
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -60,7 +60,7 @@ endif
</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;'>+ # no locale settings in the build process.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-LANG=
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++LANG=C
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ export LANG
</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;'>+diff --git a/stepmake/stepmake/texinfo-vars.make b/stepmake/stepmake/texinfo-vars.make
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 83709e32ef..92abdea855 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- stepmake/stepmake/texinfo-vars.make
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ stepmake/stepmake/texinfo-vars.make
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -32,7 +32,7 @@ DO_TEXI_DEP = ( echo ./$@: $(call scan-texi,$<) > $(basename $@).dep ) &&
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ TEXINFO_PAPERSIZE_OPTION= $(if $(findstring $(PAPERSIZE),a4),,-t @afourpaper)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ MAKEINFO_FLAGS += --enable-encoding --error-limit=0 $(DOCUMENTATION_INCLUDES)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-MAKEINFO = LANG= $(MAKEINFO_PROGRAM) $(MAKEINFO_FLAGS)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++MAKEINFO = LANG=C $(MAKEINFO_PROGRAM) $(MAKEINFO_FLAGS)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # texi2html xref map files
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ XREF_MAPS_DIR = $(top-build-dir)/$(outdir)/xref-maps
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+2.16.4
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/textproc/lilypond-devel/files/patch-no-Wstrict-prototypes-warning.diff b/textproc/lilypond-devel/files/patch-no-Wstrict-prototypes-warning.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 4f4a162..0000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/textproc/lilypond-devel/files/patch-no-Wstrict-prototypes-warning.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,52 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Index: aclocal.m4
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git aclocal.m4 aclocal.m4.orig
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-index 1228f6ca29c6208a89c19bdf8aee3f651a9c3dcb..7295aa9cf6126b121cac9b57db3c74ca76989f95 100644
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- aclocal.m4
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ aclocal.m4.orig
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -1121,17 +1121,37 @@ AC_DEFUN(STEPMAKE_PYTHON_DEVEL, [
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- AC_CHECK_PROGS(PYTHON_CONFIG, `basename $PYTHON`-config, no)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if test -z "$PYTHON_CFLAGS" -a "$PYTHON_CONFIG" != "no"; then
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- # Clean out junk: http://bugs.python.org/issue3290
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- # Python headers may need some -f* flags, leave them in.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- # We want the sed commands to look like 's/-[WDOm][[:alnum:][:punct:]][[:alnum:][:punct:]]*//g' and 's/-arch [^[:space:]]*//g', but automake eats brackets.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- #PYTHON_CFLAGS=`$PYTHON_CONFIG --cflags | sed -e 's/-[[WDOm]][[[:alnum:][:punct:]]][[[:alnum:][:punct:]]]*//g' | sed -e 's/-arch @<:@^@<:@:space:@:>@@:>@*//g'`
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- # The above sed BRE matches parts of legal options, stipping down part of that option, resulting in invalid gcc arguments. Gentoo Bug #415793
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- # For instance, '-floop-stip-mime' becomes '-floop-strip', and '-fvect-cost-model' becomes '-fvect-cost'.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- # Tentative fix to require a non alphanumeric character before the initial hyphen of the BRE or the hyphen being the first character in the string.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- PYTHON_CFLAGS=`$PYTHON_CONFIG --cflags | sed -e 's/\(^\|[[^[:alnum:]]]\)-[[WDOm]][[[:alnum:][:punct:]]][[[:alnum:][:punct:]]]*//g' | sed -e 's/-arch @<:@^@<:@:space:@:>@@:>@*//g'`
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ # We massage $PYTHON_CFLAGS:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ #
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ # . Clean out junk (http://bugs.python.org/issue3290).
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ # . Python headers may need some '-f*' flags, leave them in.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ # . Since we are later on adding $PYTHON_CFLAGS to $CPPFLAGS, remove
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ # the '-Wstrict-prototypes' warning, which is not valid for C++,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ # and which some ports of Python add (for example macports).
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ #
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ # This leads to the following BREs for sed:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ #
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ # s/-[WDOm][[:alnum:][:punct:]][[:alnum:][:punct:]]*//g
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ # s/-arch [^[:space:]]*//g
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ # s/-Wstrict-prototypes//g
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ #
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ # However, the first BRE strips off parts of valid options, thus
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ # resulting in invalid gcc arguments (Gentoo bug #415793). For
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ # instance, '-floop-strip-mime' becomes '-floop-strip', and
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ # '-fvect-cost-model' becomes '-fvect-cost'.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ #
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ # Our tentative fix is to require a non-alphanumeric character
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ # before the initial hyphen of the BRE or the hyphen being the first
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ # character in the string.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+dnl To prevent m4 eating brackets we add one more level of brackets
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+dnl for proper quoting.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ [PYTHON_CFLAGS=`$PYTHON_CONFIG --cflags \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ | sed -e 's/\(^\|[^[:alnum:]]\)-[WDOm][[:alnum:][:punct:]][[:alnum:][:punct:]]*//g' \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ -e 's/-arch [^[:space:]]*//g' \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ -e 's/-Wstrict-prototypes//g'`]
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- PYTHON_LDFLAGS=`$PYTHON_CONFIG --ldflags`
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- fi
</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;'>- if test -z "$PYTHON_CFLAGS" -a "$cross_compiling" = "no"; then
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- changequote(<<, >>)#dnl
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # alternatively, for python >= 2.0
</span></pre><pre style='margin:0'>
</pre>