[packages/lilypond] - updated to 2.20.0 - updated info patch - added texi2html patch (allow newer texi2html to build) -
qboosh
qboosh at pld-linux.org
Mon Jun 29 19:50:01 CEST 2020
commit d31b09e84a6d5fd6f6919ccc32baeaf7016fedf4
Author: Jakub Bogusz <qboosh at pld-linux.org>
Date: Mon Jun 29 19:51:13 2020 +0200
- updated to 2.20.0
- updated info patch
- added texi2html patch (allow newer texi2html to build)
- build with guile 2 by default
lilypond-info.patch | 267 +++++++++++++++++++++--------------------------
lilypond-sh.patch | 17 ++-
lilypond-texi2html.patch | 11 ++
lilypond.spec | 80 +++++++-------
4 files changed, 182 insertions(+), 193 deletions(-)
---
diff --git a/lilypond.spec b/lilypond.spec
index f80c560..402aea4 100644
--- a/lilypond.spec
+++ b/lilypond.spec
@@ -1,26 +1,28 @@
#
# Conditional build:
-%bcond_with guile2 # 'highly experimental' guile2 support
+%bcond_without guile2 # (experimental) guile2 support
%bcond_without doc # build docs
#
Summary: Music typesetter
Summary(pl.UTF-8): Program do składania nut
Name: lilypond
-Version: 2.19.33
+# note: 2.20.x is stable, 2.21.x devel
+Version: 2.20.0
Release: 1
-License: GPL
+License: GPL v3+ with font exception
Group: Applications/Sound
-Source0: http://download.linuxaudio.org/lilypond/sources/v2.19/%{name}-%{version}.tar.gz
-# Source0-md5: 942ac963423b08903d0df21fb22fbe70
+Source0: https://lilypond.org/download/sources/v2.20/%{name}-%{version}.tar.gz
+# Source0-md5: 65da6124713144cc63fe8ec2847ada8e
Patch0: %{name}-info.patch
Patch1: %{name}-sh.patch
Patch2: %{name}-aclocal.patch
+Patch3: %{name}-texi2html.patch
URL: http://www.lilypond.org/
-BuildRequires: autoconf
+BuildRequires: autoconf >= 2.60
BuildRequires: automake
BuildRequires: bison >= 1.29
BuildRequires: flex >= 2.5.4a
-BuildRequires: fontconfig
+BuildRequires: fontconfig >= 1:2.4.0
BuildRequires: fontconfig-devel >= 1:2.4.0
BuildRequires: fontforge >= 20110222
BuildRequires: fonts-TTF-DejaVu
@@ -28,43 +30,47 @@ BuildRequires: fonts-Type1-urw
BuildRequires: freetype >= 1:2.1.10
BuildRequires: gettext-tools >= 0.17
BuildRequires: ghostscript-fonts-std
+BuildRequires: glib2-devel >= 1:2.38
%if %{with guile2}
-BuildRequires: guile-devel >= 5:2.0.0
+BuildRequires: guile-devel >= 5:2.0.7
+BuildRequires: guile-devel < 5:2.3.0
%else
-BuildRequires: guile1-devel
+BuildRequires: guile1-devel >= 1.8.2
%endif
BuildRequires: kpathsea-devel
BuildRequires: libstdc++-devel >= 5:3.4
-BuildRequires: pango-devel >= 1.12.0
+BuildRequires: pango-devel >= 1:1.38.0
BuildRequires: perl-base
BuildRequires: pkgconfig >= 1:0.9.0
BuildRequires: python-devel >= 1:2.4
BuildRequires: python-modules
BuildRequires: rpm-pythonprov
BuildRequires: t1utils
-BuildRequires: texinfo >= 4.11
+BuildRequires: texinfo >= 6.1
BuildRequires: texlive-fonts-other
BuildRequires: texlive-metapost
%if %{with doc}
BuildRequires: ImageMagick
BuildRequires: ImageMagick-coder-png
-BuildRequires: dblatex
-BuildRequires: ghostscript >= 8.60
-BuildRequires: guile1 >= 1.8.0
+BuildRequires: dblatex >= 0.1.4
+BuildRequires: ghostscript >= 9.20
BuildRequires: netpbm-progs
BuildRequires: rsync
-BuildRequires: texi2html
-BuildRequires: texinfo
-BuildRequires: texinfo-texi2dvi
+BuildRequires: texi2html >= 1.82
+BuildRequires: texinfo-texi2dvi >= 6.1
+# `kpsewhich tex epsf`
BuildRequires: texlive
+# `kpsewhich -format=mf fikparm`
BuildRequires: texlive-fonts-lh
-BuildRequires: texlive-format-pdflatex
BuildRequires: texlive-latex-bibtex
+BuildRequires: texlive-xetex
BuildRequires: zip
%endif
BuildConflicts: lilypond < 1.6.0
Requires: fonts-TTF-DejaVu
-Requires: ghostscript >= 8.60
+Requires: ghostscript >= 9.20
+Requires: glib2 >= 1:2.38
+Requires: pango >= 1:1.38.0
Requires: python-modules >= 1:2.4
BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
@@ -118,13 +124,15 @@ Obsługa plików LilyPonda dla Vima.
%prep
%setup -q
-#%%patch0 -p1
+%patch0 -p1
%patch1 -p1
%patch2 -p1
+%patch3 -p1
%build
%{__autoconf}
%configure \
+ PYTHON=%{__python} \
%{?debug:--disable-optimising} \
%{__enable_disable guile2} \
--with-texgyre-dir=/usr/share/texmf-dist/fonts/opentype/public/tex-gyre/ \
@@ -150,26 +158,22 @@ cp -aL out/share/lilypond/current/fonts/tfm \
find $RPM_BUILD_ROOT -name fonts.cache-1 | xargs rm -f
# ?
-mv -f $RPM_BUILD_ROOT%{_datadir}/lilypond/%{version}/fonts/source \
+%{__mv} $RPM_BUILD_ROOT%{_datadir}/lilypond/%{version}/fonts/source \
$RPM_BUILD_ROOT%{texfontsdir}/source/lilypond
# for latex and dvips
-mv -f $RPM_BUILD_ROOT%{_datadir}/lilypond/%{version}/tex \
+%{__mv} $RPM_BUILD_ROOT%{_datadir}/lilypond/%{version}/tex \
$RPM_BUILD_ROOT%{texmfdir}/tex/lilypond
# both for lilypond and dvips
ln -sf %{_datadir}/lilypond/%{version}/fonts/type1 \
$RPM_BUILD_ROOT%{texfontsdir}/type1/lilypond
ln -sf %{_datadir}/lilypond/%{version}/ps \
$RPM_BUILD_ROOT%{texmfdir}/dvips/lilypond
-rm -rf $RPM_BUILD_ROOT%{_datadir}/lilypond/%{version}/dvips
# vim syntax/etc. files
install -d $RPM_BUILD_ROOT%{_datadir}/vim
-mv -f $RPM_BUILD_ROOT%{_datadir}/lilypond/%{version}/vim \
+%{__mv} $RPM_BUILD_ROOT%{_datadir}/lilypond/%{version}/vim \
$RPM_BUILD_ROOT%{_datadir}/vim/vimfiles
-# lilypond/stepmake build system - not needed at runtime
-rm -rf $RPM_BUILD_ROOT%{_datadir}/lilypond/%{version}/make
-
%find_lang %{name}
%clean
@@ -190,7 +194,7 @@ test -h %{texmfdir}/dvips/lilypond || rm -rf %{texmfdir}/dvips/lilypond
%files -f %{name}.lang
%defattr(644,root,root,755)
-%doc AUTHORS.txt DEDICATION NEWS.txt README.txt ROADMAP
+%doc AUTHORS.txt DEDICATION LICENSE* NEWS.txt README.txt ROADMAP
%attr(755,root,root) %{_bindir}/abc2ly
%attr(755,root,root) %{_bindir}/convert-ly
%attr(755,root,root) %{_bindir}/etf2ly
@@ -201,10 +205,6 @@ test -h %{texmfdir}/dvips/lilypond || rm -rf %{texmfdir}/dvips/lilypond
%attr(755,root,root) %{_bindir}/lilysong
%attr(755,root,root) %{_bindir}/midi2ly
%attr(755,root,root) %{_bindir}/musicxml2ly
-%dir %{_libdir}/lilypond
-%dir %{_libdir}/lilypond/%{version}
-%dir %{_libdir}/lilypond/%{version}/python
-%attr(755,root,root) %{_libdir}/lilypond/%{version}/python/midi.so
%dir %{_datadir}/lilypond
%dir %{_datadir}/lilypond/%{version}
%{_datadir}/lilypond/%{version}/fonts
@@ -222,14 +222,24 @@ test -h %{texmfdir}/dvips/lilypond || rm -rf %{texmfdir}/dvips/lilypond
%{texmfdir}/tex/lilypond
%if %{with doc}
-%{_infodir}/*.info*
-%{_mandir}/man1/*
+%{_infodir}/lilypond-*.info*
+%{_infodir}/music-glossary.info*
+%{_mandir}/man1/abc2ly.1*
+%{_mandir}/man1/convert-ly.1*
+%{_mandir}/man1/etf2ly.1*
+%{_mandir}/man1/lilymidi.1*
+%{_mandir}/man1/lilypond.1*
+%{_mandir}/man1/lilypond-book.1*
+%{_mandir}/man1/lilypond-invoke-editor.1*
+%{_mandir}/man1/lilysong.1*
+%{_mandir}/man1/midi2ly.1*
+%{_mandir}/man1/musicxml2ly.1*
%{_datadir}/omf/lilypond
%endif
%files -n emacs-lilypond-mode-pkg
%defattr(644,root,root,755)
-%{_datadir}/emacs/site-lisp/*.el
+%{_datadir}/emacs/site-lisp/lilypond-*.el
%files -n vim-syntax-lilypond
%defattr(644,root,root,755)
diff --git a/lilypond-info.patch b/lilypond-info.patch
index 0a3783c..f530f62 100644
--- a/lilypond-info.patch
+++ b/lilypond-info.patch
@@ -1,6 +1,72 @@
---- lilypond-2.10.0/Documentation/user/converters.itely.orig 2006-11-10 14:44:25.000000000 +0100
-+++ lilypond-2.10.0/Documentation/user/converters.itely 2006-11-20 20:07:34.356722750 +0100
-@@ -31,16 +31,16 @@
+--- lilypond-2.20.0/Documentation/web.texi.orig 2020-03-01 15:00:51.000000000 +0100
++++ lilypond-2.20.0/Documentation/web.texi 2020-06-28 12:32:17.343854102 +0200
+@@ -58,22 +58,22 @@
+
+ @c Info files are no longer installed in a subdirectory, images are
+ @c expected to be found in lilypond/ subdirectory.
+- at dircategory GNU LilyPond --- the music typesetter
++ at dircategory GNU LilyPond:
+ @direntry
+-* LilyPond Learning Manual: (lilypond-learning). Start here.
+-* Music Glossary: (music-glossary). For non-English users.
+-* LilyPond: (lilypond-notation). LilyPond Notation Reference.
+-* LilyPond Snippets: (lilypond-snippets). Short tricks, tips, and examples.
+-* LilyPond Internals Reference: (lilypond-internals). Definitions for tweaking.
+-* LilyPond Application Usage: (lilypond-usage). Installing and running applications.
+-* LilyPond Website: (lilypond-web). Preview of new website.
+-* lilypond: (lilypond-usage)Running lilypond. Invoking the LilyPond program.
+-* abc2ly: (lilypond-usage)Invoking abc2ly. Importing ABC.
+-* convert-ly: (lilypond-usage)Updating files with convert-ly. Older LilyPond versions.
+-* etf2ly: (lilypond-usage)Invoking etf2ly. Importing Finale.
+-* lilypond-book: (lilypond-usage)lilypond-book. Integrating text and music.
+-* midi2ly: (lilypond-usage)Invoking midi2ly. Importing MIDI.
+-* musicxml2ly: (lilypond-usage)Invoking musicxml2ly. Importing MusicXML.
++* LilyPond Learning Manual: (lilypond-learning). Start here
++* Music Glossary: (music-glossary). For non-English users
++* LilyPond: (lilypond-notation). LilyPond Notation Reference
++* LilyPond Snippets: (lilypond-snippets). Short tricks, tips, and examples
++* LilyPond Internals Reference: (lilypond-internals). Definitions for tweaking
++* LilyPond Application Usage: (lilypond-usage). Installing and running applications
++* LilyPond Website: (lilypond-web). Preview of new website
++* lilypond: (lilypond-usage)lilypond. Invoking the LilyPond program
++* abc2ly: (lilypond-usage)abc2ly. Importing ABC
++* convert-ly: (lilypond-usage)convert-ly. Older LilyPond versions
++* etf2ly: (lilypond-usage)etf2ly. Importing Finale
++* lilypond-book: (lilypond-usage)lilypond-book. Integrating text and music
++* midi2ly: (lilypond-usage)midi2ly. Importing MIDI
++* musicxml2ly: (lilypond-usage)musicxml2ly. Importing MusicXML
+ @end direntry
+
+
+--- lilypond-2.20.0/scm/documentation-lib.scm.orig 2020-03-01 15:00:51.000000000 +0100
++++ lilypond-2.20.0/scm/documentation-lib.scm 2020-06-28 12:51:02.494425306 +0200
+@@ -137,10 +137,10 @@
+ "\\input texinfo @c -*-texinfo-*-"
+ "\n at setfilename " file-name ".info"
+ "\n at settitle " name
+- "\n at dircategory LilyPond"
++ "\n at dircategory GNU LilyPond:"
+ "\n at direntry"
+ ;; prepend GNU for dir, must be unique
+- "\n* GNU " name ": (" file-name "). " name "."
++ (string-pad-right (string-append "\n* GNU " name ": (" file-name ").") 57) name
+ "\n at end direntry\n"
+ "@documentlanguage en\n"
+ "@documentencoding UTF-8\n"))
+--- lilypond-2.20.0/Documentation/usage/running.itely.orig 2020-03-01 15:00:51.000000000 +0100
++++ lilypond-2.20.0/Documentation/usage/running.itely 2020-06-28 21:12:32.931411423 +0200
+@@ -11,7 +11,7 @@
+ @c \version "2.17.6"
+
+
+- at node Running lilypond
++ at node lilypond
+ @chapter Running @command{lilypond}
+
+ This chapter details the technicalities of running LilyPond.
+--- lilypond-2.20.0/Documentation/usage/external.itely.orig 2020-03-01 15:00:51.000000000 +0100
++++ lilypond-2.20.0/Documentation/usage/external.itely 2020-06-28 21:13:35.291073592 +0200
+@@ -423,15 +423,15 @@
bug reports will almost certainly not be resolved.
@menu
@@ -8,175 +74,78 @@
-* Invoking musicxml2ly:: Importing MusicXML.
-* Invoking abc2ly:: Importing ABC.
-* Invoking etf2ly:: Importing Finale.
-+* midi2ly:: Importing MIDI.
-+* musicxml2ly:: Importing MusicXML.
-+* abc2ly:: Importing ABC.
-+* etf2ly:: Importing Finale.
- * Generating LilyPond files:: GUIs, transcribers, and algorithmic composition programs.
++* midi2ly:: Importing MIDI
++* musicxml2ly:: Importing MusicXML
++* abc2ly:: Importing ABC
++* etf2ly:: Importing Finale
+ * Other formats::
@end menu
-
- at node Invoking midi2ly
+ at node midi2ly
- @section Invoking @command{midi2ly}
+ @subsection Invoking @command{midi2ly}
@cindex MIDI
-@@ -127,7 +127,7 @@
+@@ -516,7 +516,7 @@
to a single duration and add phrase markings or pedal indicators.
- at node Invoking musicxml2ly
+ at node musicxml2ly
- @section Invoking @code{musicxml2ly}
+ @subsection Invoking @code{musicxml2ly}
@cindex MusicXML
-@@ -195,7 +195,7 @@
+@@ -631,7 +631,7 @@
@end table
- at node Invoking abc2ly
+ at node abc2ly
- @section Invoking @code{abc2ly}
+ @subsection Invoking @code{abc2ly}
- @cindex ABC
-@@ -260,7 +260,7 @@
+ @warning{This is not currently supported and may eventually be removed
+@@ -699,7 +699,7 @@
@command{abc2ly} ignores the ABC beaming.
- at node Invoking etf2ly
+ at node etf2ly
- @section Invoking @command{etf2ly}
-
- @cindex ETF
---- lilypond-2.10.0/Documentation/user/running.itely.orig 2006-11-10 14:44:25.000000000 +0100
-+++ lilypond-2.10.0/Documentation/user/running.itely 2006-11-20 20:08:46.477230000 +0100
-@@ -50,12 +50,12 @@
- if you are unfamiliar with the command-line.
-
+ @subsection Invoking @command{etf2ly}
+
+ @warning{This is not currently supported and may eventually be removed
+--- lilypond-2.20.0/Documentation/usage/updating.itely.orig 2020-03-01 15:00:51.000000000 +0100
++++ lilypond-2.20.0/Documentation/usage/updating.itely 2020-06-28 21:16:13.556882859 +0200
+@@ -11,7 +11,7 @@
+ @c \version "2.16.0"
+
+
+- at node Updating files with convert-ly
++ at node convert-ly
+ @chapter Updating files with @command{convert-ly}
+
+ @cindex Updating a LilyPond file
+--- lilypond-2.20.0/Documentation/usage/suggestions.itely.orig 2020-03-01 15:00:51.000000000 +0100
++++ lilypond-2.20.0/Documentation/usage/suggestions.itely 2020-06-29 11:27:27.823523150 +0200
+@@ -61,7 +61,7 @@
+ @strong{Always include a @code{\version} number in your input files} no
+ matter how small they are. This prevents having to remember which
+ version of LilyPond the file was created with and is especially relevant
+-when @ref{Updating files with convert-ly} command (which requires the
++when @ref{convert-ly} command (which requires the
+ @code{\version} statement to be present); or if sending your input files
+ to other users (e.g. when asking for help on the mail lists). Note that
+ all of the LilyPond templates contain @code{\version} numbers.
+--- lilypond-2.20.0/Documentation/usage.tely.orig 2020-03-01 15:00:51.000000000 +0100
++++ lilypond-2.20.0/Documentation/usage.tely 2020-06-29 11:28:03.389997136 +0200
+@@ -52,8 +52,8 @@
+ @c maybe add a "Tasks" or "Specific tasks" or something like
+ @c that, after Suggestions -gp
@menu
--* Invoking lilypond::
-+* lilypond::
- * Command line options for lilypond::
- * Environment variables::
- @end menu
-
-- at node Invoking lilypond
-+ at node lilypond
- @subsection Invoking @command{lilypond}
-
- @cindex Invoking @command{lilypond}
---- lilypond-2.10.0/Documentation/user/lilypond-book.itely.orig 2006-11-10 14:44:25.000000000 +0100
-+++ lilypond-2.10.0/Documentation/user/lilypond-book.itely 2006-11-20 20:09:06.130458250 +0100
-@@ -48,7 +48,7 @@
- * An example of a musicological document::
- * Integrating music and text::
- * Music fragment options::
--* Invoking lilypond-book::
-+* lilypond-book::
- * Filename extensions::
- * Alternate methods of mixing text and music::
- @end menu
-@@ -363,7 +363,7 @@
- @seealso
- There are specific @command{lilypond-book} command line options and
- other details to know when processing @LaTeX{} documents, see
-- at ref{Invoking lilypond-book}.
-+ at ref{lilypond-book}.
-
-
- @node Texinfo
-@@ -765,7 +765,7 @@
- @end table
-
-
-- at node Invoking lilypond-book
-+ at node lilypond-book
- @section Invoking @command{lilypond-book}
-
- @command{lilypond-book} produces a file with one of the following
-@@ -953,8 +953,8 @@
-
- You can use any filename extension for the input file, but if you do not
- use the recommended extension for a particular format you may need to
--manually specify the output format; for details, see @ref{Invoking
--lilypond-book}. Otherwise, @command{lilypond-book} automatically
-+manually specify the output format; for details, see @ref{lilypond-book}.
-+Otherwise, @command{lilypond-book} automatically
- selects the output format based on the input filename's extension.
-
- @quotation
---- lilypond-2.10.0/Documentation/user/lilypond.tely.orig 2006-11-10 14:44:25.000000000 +0100
-+++ lilypond-2.10.0/Documentation/user/lilypond.tely 2006-11-20 20:15:39.171021750 +0100
-@@ -35,19 +35,19 @@
- @c
- @c Info files are no longer installed in a subdirectory, images are
- @c expected to be found in lilypond/ subdirectory.
-- at dircategory GNU LilyPond --- the music typesetter
-+ at dircategory GNU LilyPond --- the music typesetter:
- @direntry
--* LilyPond Learning Manual: (lilypond-learning). Start here.
--* Music Glossary: (music-glossary). For non-English users.
--* LilyPond: (lilypond). LilyPond Notation Reference.
--* LilyPond Internals Reference: (lilypond-internals). Definitions for tweaking.
--* LilyPond Application Usage: (lilypond-program). Installing and running applications.
--* abc2ly: (lilypond-program)Invoking abc2ly. Importing ABC.
--* convert-ly: (lilypond-program)Updating files with convert-ly. Older LilyPond versions.
--* etf2ly: (lilypond-program)Invoking etf2ly. Importing Finale.
--* lilypond-book: (lilypond-program)LilyPond-book. Integrating text and music.
--* midi2ly: (lilypond-program)Invoking midi2ly. Importing MIDI.
--* musicxml2ly: (lilypond-program)Invoking musicxml2ly. Importing MusicXML.
-+* LilyPond Learning Manual: (lilypond-learning). Start here
-+* Music Glossary: (music-glossary). For non-English users
-+* LilyPond: (lilypond). LilyPond Notation Reference
-+* LilyPond Internals Reference: (lilypond-internals). Definitions for tweaking
-+* LilyPond Application Usage: (lilypond-program). Installing and running applications
-+* abc2ly: (lilypond-program)abc2ly. Importing ABC
-+* convert-ly: (lilypond-program)Updating files with convert-ly. Older LilyPond versions
-+* etf2ly: (lilypond-program)etf2ly. Importing Finale
-+* lilypond-book: (lilypond-program)LilyPond-book. Integrating text and music
-+* midi2ly: (lilypond-program)midi2ly. Importing MIDI
-+* musicxml2ly: (lilypond-program)musicxml2ly. Importing MusicXML
- @end direntry
-
- @c don't remove this comment.
---- lilypond-2.10.0/Documentation/user/music-glossary.tely.orig 2006-11-10 14:44:25.000000000 +0100
-+++ lilypond-2.10.0/Documentation/user/music-glossary.tely 2006-11-20 20:16:07.108767750 +0100
-@@ -6,9 +6,9 @@
- @documentlanguage en
-
- @c see lilypond.tely for info installation note
-- at dircategory LilyPond
-+ at dircategory LilyPond:
- @direntry
--* Glossary: (lilypond/music-glossary). Glossary of music terms.
-+* Glossary: (lilypond/music-glossary). Glossary of music terms
- @end direntry
-
- @ifhtml
---- lilypond-2.10.0/Documentation/user/input.itely.orig 2006-11-10 14:44:25.000000000 +0100
-+++ lilypond-2.10.0/Documentation/user/input.itely 2006-11-20 22:02:52.933106750 +0100
-@@ -1324,7 +1324,7 @@
- @code{-dclip-systems}. The clips are output as EPS files, and are
- converted to PDF and PNG if these formats are switched on as well.
-
--For more information on output formats, see @rprogram{Invoking lilypond}.
-+For more information on output formats, see @rprogram{lilypond}.
-
- @node Skipping corrected music
- @subsection Skipping corrected music
---- lilypond-2.10.0/scm/documentation-lib.scm.orig 2006-11-10 14:44:26.000000000 +0100
-+++ lilypond-2.10.0/scm/documentation-lib.scm 2006-11-20 20:16:58.303967250 +0100
-@@ -111,10 +111,10 @@
- "\\input texinfo @c -*-texinfo-*-"
- "\n at setfilename " file-name ".info"
- "\n at settitle " name
-- "\n at dircategory LilyPond"
-+ "\n at dircategory LilyPond:"
- "\n at direntry"
- ;; prepend GNU for dir, must be unique
-- "\n* GNU " name ": (" file-name "). " name "."
-+ "\n* GNU " name ": (" file-name "). " name
- "\n at end direntry\n"
- "@documentlanguage en\n"
- "@documentencoding utf-8\n"))
+-* Running lilypond:: Operation.
+-* Updating files with convert-ly:: Updating input files.
++* lilypond:: Operation.
++* convert-ly:: Updating input files.
+ * lilypond-book:: Integrating text and music.
+ * External programs:: Mixing LilyPond and other programs.
+ * Suggestions for writing files:: Best practices and effective bug-fixing.
diff --git a/lilypond-sh.patch b/lilypond-sh.patch
index ce6dd44..b8b5891 100644
--- a/lilypond-sh.patch
+++ b/lilypond-sh.patch
@@ -1,12 +1,11 @@
-diff -dur lilypond-2.18.2.orig/aclocal.m4 lilypond-2.18.2/aclocal.m4
---- lilypond-2.18.2.orig/aclocal.m4 2014-03-17 16:29:16.000000000 +0100
-+++ lilypond-2.18.2/aclocal.m4 2015-12-12 12:43:09.096299573 +0100
-@@ -116,7 +116,7 @@
+--- lilypond-2.20.0/aclocal.m4.orig 2020-06-21 17:28:04.690857844 +0200
++++ lilypond-2.20.0/aclocal.m4 2020-06-21 18:15:06.675569841 +0200
+@@ -110,7 +110,7 @@
num=`STEPMAKE_NUMERIC_VERSION($ver)`
- req=`STEPMAKE_NUMERIC_VERSION($3)`
+ min=`STEPMAKE_NUMERIC_VERSION($3)`
AC_MSG_RESULT([$ver])
-- if test "$num" -lt "$req"; then
-+ if /usr/bin/test "$num" -lt "$req"; then
- STEPMAKE_ADD_ENTRY($2, ["$r >= $3 (installed: $ver)"])
+- if test "$num" -lt "$min"; then
++ if /usr/bin/test "$num" -lt "$min"; then
+ STEPMAKE_ADD_ENTRY($2, ["$r >= $3 (installed: $ver)"])
fi
- vervar="`echo $1 | tr '[a-z]' '[A-Z]'`_VERSION"
+ if test -n "$4"; then
diff --git a/lilypond-texi2html.patch b/lilypond-texi2html.patch
new file mode 100644
index 0000000..44a5bda
--- /dev/null
+++ b/lilypond-texi2html.patch
@@ -0,0 +1,11 @@
+--- lilypond-2.20.0/configure.ac.orig 2020-03-01 15:00:51.000000000 +0100
++++ lilypond-2.20.0/configure.ac 2020-06-21 18:39:32.064297816 +0200
+@@ -394,7 +394,7 @@
+ fi
+
+ STEPMAKE_PROGS(MAKEINFO, makeinfo, REQUIRED, 6.1)
+-STEPMAKE_PROGS(TEXI2HTML, texi2html, $DOCUMENTATION_REQUIRED, 1.82, 1.82)
++STEPMAKE_PROGS(TEXI2HTML, texi2html, $DOCUMENTATION_REQUIRED, 1.82)
+ STEPMAKE_PROGS(DBLATEX, dblatex, $DOCUMENTATION_REQUIRED, 0.1.4)
+ STEPMAKE_PROGS(BIBTEX, bibtex, $DOCUMENTATION_REQUIRED)
+ STEPMAKE_PROGS(PDFLATEX, xelatex pdflatex, $DOCUMENTATION_REQUIRED)
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/lilypond.git/commitdiff/d31b09e84a6d5fd6f6919ccc32baeaf7016fedf4
More information about the pld-cvs-commit
mailing list