Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

lilypond-devel: upgrade to 2.23.11 #15541

Merged
merged 1 commit into from Aug 1, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
21 changes: 10 additions & 11 deletions textproc/lilypond/Portfile
Expand Up @@ -41,7 +41,7 @@ notes-append "\
Note that TeX is not needed after installation."


compiler.cxx_standard 2011
compiler.cxx_standard 2014

if {${subport} eq ${name}} {
version 2.22.2
Expand All @@ -59,12 +59,12 @@ if {${subport} eq ${name}} {
configure.ldflags-append -stdlib=${configure.cxx_stdlib}
}
} else {
version 2.23.10
version 2.23.11
revision 0
conflicts lilypond
checksums rmd160 9082f3b23ad045fb873a949845e7cebad99f8676 \
sha256 06ac963df1699598c62f4390b8fc95344a723a88af440c00f5201c4aa8958f68 \
size 17485344
checksums rmd160 3d967a3e28de0402ac7b8ce3a308995b280d07a0 \
sha256 e158dcb99bd19a93e6899e36cf293dc583e5b1237a904b014917b7d0ffab690f \
size 19271435

set livecheck_url "development.html"
}
Expand Down Expand Up @@ -243,15 +243,14 @@ post-patch {
# Correct python shebang.
reinplace -W ${worksrcpath} -E \
s|/usr/bin/(env\\\ )?python3?|${configure.python}|g \
scripts/auxiliar/check_texi_refs.py \
scripts/auxiliar/check_translation.py \
scripts/auxiliar/fixcc.py \
scripts/auxiliar/makelsr.py \
scripts/auxiliar/tely-gettext.py \
scripts/auxiliar/texi-langutils.py \
scripts/auxiliar/translations-status.py \
scripts/auxiliar/makelsr.py \
scripts/auxiliar/check_translation.py \
scripts/auxiliar/readlink.py \
scripts/auxiliar/update-snippets.py \
scripts/auxiliar/check_texi_refs.py \
scripts/auxiliar/fixcc.py
scripts/auxiliar/update-snippets.py

# ImageMagick and xelatex (or pdflatex) are only needed for
# complete documentation builds, which +docs doesn't do currently.
Expand Down
14 changes: 7 additions & 7 deletions textproc/lilypond/files/patch-add-flex-to-include-devel.diff
@@ -1,13 +1,13 @@
--- configure.ac 2021-05-30 22:02:42.000000000 +0200
+++ configure.ac 2021-05-30 22:07:47.000000000 +0200
@@ -45,6 +45,10 @@
--- configure.ac 2022-07-31 07:03:17.000000000 +0200
+++ configure.ac 2022-07-31 07:07:09.000000000 +0200
@@ -52,6 +52,10 @@
[FLEXLEXER_DIR=$withval],
[FLEXLEXER_DIR=""])

+if test -n "$FLEXLEXER_DIR"; then
+ CPPFLAGS="-I$FLEXLEXER_DIR $CPPFLAGS"
+fi
+
AC_ARG_WITH(texgyre-dir,
[AS_HELP_STRING([--with-texgyre-dir=DIR],
[location of TeX Gyre fonts.])],
+
LINK_GXX_STATICALLY=no
AC_ARG_ENABLE(static-gxx,
[AS_HELP_STRING([--enable-static-gxx],