diff options
| author | Florian Franzmann | 2020-02-09 18:35:54 +0100 |
|---|---|---|
| committer | Florian Franzmann | 2020-02-10 12:50:49 +0100 |
| commit | ffe45479e34fc30676cefe4fbb8e5086c6f22bc8 (patch) | |
| tree | a58c8ef329c1afd84272aba963727b4a37b3b651 /audio-libs | |
| parent | 01d5ce6efe89c5e0c9b7848d9efcf883bc1550e4 (diff) | |
audio-libs/lilypond: version 2.19.84
Diffstat (limited to 'audio-libs')
| -rw-r--r-- | audio-libs/lilypond/0001-use-guile-config1.patch | 28 | ||||
| -rwxr-xr-x | audio-libs/lilypond/BUILD | 2 | ||||
| -rwxr-xr-x | audio-libs/lilypond/DETAILS | 4 | ||||
| -rw-r--r-- | audio-libs/lilypond/HISTORY | 5 |
4 files changed, 22 insertions, 17 deletions
diff --git a/audio-libs/lilypond/0001-use-guile-config1.patch b/audio-libs/lilypond/0001-use-guile-config1.patch index 3826cb7697..f6b1524d89 100644 --- a/audio-libs/lilypond/0001-use-guile-config1.patch +++ b/audio-libs/lilypond/0001-use-guile-config1.patch @@ -1,6 +1,6 @@ -From 904260bb4d1bfe9a8815b6b992b2c2eeb7713e4c Mon Sep 17 00:00:00 2001 +From 4f23903d085bf05ca395ec3934b22be65bb5ad61 Mon Sep 17 00:00:00 2001 From: Florian Franzmann <bwlf@bandrate.org> -Date: Wed, 24 May 2017 09:50:00 +0200 +Date: Sun, 9 Feb 2020 18:41:24 +0100 Subject: [PATCH] use guile-config1 --- @@ -8,10 +8,10 @@ Subject: [PATCH] use guile-config1 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/aclocal.m4 b/aclocal.m4 -index b15111d..2854d52 100644 +index 0a96f0c..2d933e1 100644 --- a/aclocal.m4 +++ b/aclocal.m4 -@@ -653,8 +653,8 @@ AC_DEFUN([STEPMAKE_GUILE_FLAGS], [ +@@ -679,8 +679,8 @@ AC_DEFUN([STEPMAKE_GUILE_FLAGS], [ # If missing, add entry to missing-list ($1, one of 'OPTIONAL', 'REQUIRED') AC_DEFUN(STEPMAKE_GUILE_DEVEL, [ ## First, let's just see if we can find Guile at all. @@ -22,15 +22,15 @@ index b15111d..2854d52 100644 AC_MSG_CHECKING([for guile-config]) guile_config="guile-config" found="no" -@@ -666,7 +666,7 @@ AC_DEFUN(STEPMAKE_GUILE_DEVEL, [ - guile2.0-config guile-2.0-config guile-config-2.0 \ - guile1-config guile-1-config guile-config-1 \ - guile1.9-config guile-1.9-config guile-config-1.9 \ -- guile1.8-config guile-1.8-config guile-config-1.8; \ -+ guile1.8-config guile-1-config guile-1.9-config guile-1.8-config guile-config1; \ - do - exe=`STEPMAKE_GET_EXECUTABLE($r)` - if ! $exe --version > /dev/null 2>&1 ; then +@@ -693,7 +693,7 @@ AC_DEFUN(STEPMAKE_GUILE_DEVEL, [ + guile1-config guile-1-config guile-config-1 guile-config1 \ + guile1.9-config guile-1.9-config guile-config-1.9 guile-config1.9 \ + guile1.8-config guile-1.8-config guile-config-1.8 guile-config1.8 \ +- guile18-config; do ++ guile18-config guild-config1; do + exe=`STEPMAKE_GET_EXECUTABLE($r)` + if ! $exe --version > /dev/null 2>&1 ; then + continue -- -2.12.0 +2.25.0 diff --git a/audio-libs/lilypond/BUILD b/audio-libs/lilypond/BUILD index bd24e6d22a..122d2d232a 100755 --- a/audio-libs/lilypond/BUILD +++ b/audio-libs/lilypond/BUILD @@ -2,7 +2,7 @@ sed -i '7326 s,num=`,ver='$(installed_version guile1)'\n&,' configure && if [[ $LILYPOND_BRANCH == "stable" ]]; then OPTS="$OPTS --with-ncsb-dir=/usr/share/ghostscript/fonts" else - OPTS+=" --with-texgyre-dir=$TRACK_ROOT/usr/share/fonts/TTF/" + OPTS+=" --with-texgyre-dir=$TRACK_ROOT/usr/share/texmf-dist/fonts/opentype/public/tex-gyre" fi && OPTS="$OPTS --disable-documentation" && default_build diff --git a/audio-libs/lilypond/DETAILS b/audio-libs/lilypond/DETAILS index 739c3ceffb..17a163cf69 100755 --- a/audio-libs/lilypond/DETAILS +++ b/audio-libs/lilypond/DETAILS @@ -4,8 +4,8 @@ if [[ $LILYPOND_BRANCH == "stable" ]]; then SOURCE="$SPELL-$VERSION.tar.gz" SOURCE_HASH=sha512:0692f6eb41733076ba7f610cd1e65762f4dfd67307e2ab9e222b140d58ae3a1bb1c6b3be3bcff778d57f161868cf6d57e99bf43bf20f2663d042a07493942ec6 else - VERSION=2.19.82 - SOURCE_HASH=sha512:73ab9591958dedcabd3921bc57161fc702c5f52f990aed88d3987d143cfccfba78021b903506ede8ee6c196692c29106394a9ab7055672fb7f8722a3a478f1b4 + VERSION=2.19.84 + SOURCE_HASH=sha512:f60d7617b0ce23f3961459c178d03b375b5aa8a400460d2958ce432636e3e4faa673aeaead8761091ab29256f41edbb36666919177df5baf6c9ab667c56bae50 fi SOURCE="$SPELL-$VERSION.tar.gz" SOURCE_URL[0]=http://lilypond.org/download/sources/v$(echo ${VERSION} | cut -f1,2 -d.)/$SOURCE diff --git a/audio-libs/lilypond/HISTORY b/audio-libs/lilypond/HISTORY index 08fdebcb56..fc7ebaebda 100644 --- a/audio-libs/lilypond/HISTORY +++ b/audio-libs/lilypond/HISTORY @@ -1,3 +1,8 @@ +2020-02-09 Florian Franzmann <siflfran@hawo.stw.uni-erlangen.de> + * DETAILS: devel version 2.19.84 + * BUILD: fix font search path + * 0001-use-guile-config1.patch: regenerate patch + 2018-07-15 Florian Franzmann <siflfran@hawo.stw.uni-erlangen.de> * DETAILS: devel version 2.19.82 |