From 4e10dce8c5daad95ed78707ce2b42a4b2981321e Mon Sep 17 00:00:00 2001 From: Jakub Bogusz Date: Thu, 15 Apr 2021 20:02:05 +0200 Subject: [PATCH] - updated to 2.22.0 - updated info patch - removed obsolete texi2html patch - added mf patch (workaround for mpost failures) --- lilypond-info.patch | 128 +++++++++++++++++++++------------------ lilypond-mf.patch | 11 ++++ lilypond-texi2html.patch | 11 ---- lilypond.spec | 52 ++++++---------- 4 files changed, 98 insertions(+), 104 deletions(-) create mode 100644 lilypond-mf.patch delete mode 100644 lilypond-texi2html.patch diff --git a/lilypond-info.patch b/lilypond-info.patch index f530f62..be31126 100644 --- a/lilypond-info.patch +++ b/lilypond-info.patch @@ -1,60 +1,57 @@ ---- 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 @@ +--- lilypond-2.22.0/Documentation/en/web.texi.orig 2021-04-11 18:33:38.416188626 +0200 ++++ lilypond-2.22.0/Documentation/en/web.texi 2021-04-11 18:53:43.506326759 +0200 +@@ -49,30 +49,26 @@ @c Info files are no longer installed in a subdirectory, images are @c expected to be found in lilypond/ subdirectory. --@dircategory GNU LilyPond --- the music typesetter -+@dircategory GNU LilyPond: +-@dircategory LilyPond -- the music typesetter ++@dircategory 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 +-* Changes: (lilypond-changes). News since version 2.20. +-* Contributing: (lilypond-contributor). How to contribute to LilyPond. +-* Essay: (lilypond-essay). The philosophy behind LilyPond. +-* Extending: (lilypond-extending). How to use Scheme in LilyPond. +-* Internals: (lilypond-internals). Tweaking reference. +-* Learning: (lilypond-learning). Introduction. Start here. +-* Music Glossary: (music-glossary). For non-English users. +-* Notation: (lilypond-notation). Notation reference. +-* Snippets: (lilypond-snippets). Tricks, tips, and examples. +-* Usage: (lilypond-usage). How to install and use LilyPond. +-* Website: (lilypond-web). Info version of lilypond.org. +-@end direntry +- +-@dircategory LilyPond applications +-@direntry +-* abc2ly: (lilypond-usage)Invoking abc2ly. Importing ABC files. +-* convert-ly: (lilypond-usage)Updating files with convert-ly. Handling older LilyPond files. +-* etf2ly: (lilypond-usage)Invoking etf2ly. Importing Finale files. +-* lilypond-book: (lilypond-usage)lilypond-book. Integrating text and music. +-* lilypond: (lilypond-usage)Running lilypond. Invoking the LilyPond program. +-* midi2ly: (lilypond-usage)Invoking midi2ly. Importing MIDI files. +-* musicxml2ly: (lilypond-usage)Invoking musicxml2ly. Importing MusicXML files. ++* Changes: (lilypond-changes). News since version 2.20 ++* Contributing: (lilypond-contributor). How to contribute to LilyPond ++* Essay: (lilypond-essay). The philosophy behind LilyPond ++* Extending: (lilypond-extending). How to use Scheme in LilyPond ++* Internals: (lilypond-internals). Tweaking reference ++* Learning: (lilypond-learning). Introduction. Start here ++* Music Glossary: (music-glossary). For non-English users ++* Notation: (lilypond-notation). Notation reference ++* Snippets: (lilypond-snippets). Tricks, tips, and examples ++* Usage: (lilypond-usage). How to install and use LilyPond ++* Website: (lilypond-web). Info version of lilypond.org ++* abc2ly: (lilypond-usage)abc2ly. Importing ABC files ++* convert-ly: (lilypond-usage)convert-ly. Handling older LilyPond files ++* etf2ly: (lilypond-usage)etf2ly. Importing Finale files ++* lilypond-book: (lilypond-usage)lilypond-book. Integrating text and music ++* lilypond: (lilypond-usage)lilypond. Invoking the LilyPond program ++* midi2ly: (lilypond-usage)midi2ly. Importing MIDI files ++* musicxml2ly: (lilypond-usage)musicxml2ly. Importing MusicXML files @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@setfilename " file-name ".info" - "\n@settitle " name -- "\n@dircategory LilyPond" -+ "\n@dircategory GNU LilyPond:" - "\n@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@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 +--- lilypond-2.20.0/Documentation/en/usage/running.itely.orig 2020-03-01 15:00:51.000000000 +0100 ++++ lilypond-2.20.0/Documentation/en/usage/running.itely 2020-06-28 21:12:32.931411423 +0200 @@ -11,7 +11,7 @@ @c \version "2.17.6" @@ -64,8 +61,8 @@ @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 +--- lilypond-2.20.0/Documentation/en/usage/external.itely.orig 2020-03-01 15:00:51.000000000 +0100 ++++ lilypond-2.20.0/Documentation/en/usage/external.itely 2020-06-28 21:13:35.291073592 +0200 @@ -423,15 +423,15 @@ bug reports will almost certainly not be resolved. @@ -114,8 +111,8 @@ @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 +--- lilypond-2.20.0/Documentation/en/usage/updating.itely.orig 2020-03-01 15:00:51.000000000 +0100 ++++ lilypond-2.20.0/Documentation/en/usage/updating.itely 2020-06-28 21:16:13.556882859 +0200 @@ -11,7 +11,7 @@ @c \version "2.16.0" @@ -125,8 +122,8 @@ @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 +--- lilypond-2.20.0/Documentation/en/usage/suggestions.itely.orig 2020-03-01 15:00:51.000000000 +0100 ++++ lilypond-2.20.0/Documentation/en/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 @@ -136,8 +133,8 @@ @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 +--- lilypond-2.20.0/Documentation/en/usage.tely.orig 2020-03-01 15:00:51.000000000 +0100 ++++ lilypond-2.20.0/Documentation/en/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 @@ -149,3 +146,18 @@ * lilypond-book:: Integrating text and music. * External programs:: Mixing LilyPond and other programs. * Suggestions for writing files:: Best practices and effective bug-fixing. +--- 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@setfilename " file-name ".info" + "\n@settitle " name +- "\n@dircategory LilyPond" ++ "\n@dircategory LilyPond:" + "\n@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@end direntry\n" + "@documentlanguage en\n" + "@documentencoding UTF-8\n")) diff --git a/lilypond-mf.patch b/lilypond-mf.patch new file mode 100644 index 0000000..02f3ef4 --- /dev/null +++ b/lilypond-mf.patch @@ -0,0 +1,11 @@ +--- lilypond-2.22.0/mf/invoke-mf2pt1.sh.orig 2021-01-10 15:22:46.000000000 +0100 ++++ lilypond-2.22.0/mf/invoke-mf2pt1.sh 2021-04-13 19:14:22.963474099 +0200 +@@ -41,7 +41,7 @@ + cd $tmp + + export MFINPUTS="${srcdir}:..::" +-export max_print_line=1000 ++cp -f ../mf2pt1.mem . + + ${mf2pt1} --rounding=0.0001 \ + --family=$name \ diff --git a/lilypond-texi2html.patch b/lilypond-texi2html.patch deleted file mode 100644 index 44a5bda..0000000 --- a/lilypond-texi2html.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- 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) diff --git a/lilypond.spec b/lilypond.spec index 402aea4..36c1f56 100644 --- a/lilypond.spec +++ b/lilypond.spec @@ -1,26 +1,25 @@ # # Conditional build: -%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 -# note: 2.20.x is stable, 2.21.x devel -Version: 2.20.0 +# note: 2.22.x is stable, 2.23.x devel +Version: 2.22.0 Release: 1 License: GPL v3+ with font exception Group: Applications/Sound -Source0: https://lilypond.org/download/sources/v2.20/%{name}-%{version}.tar.gz -# Source0-md5: 65da6124713144cc63fe8ec2847ada8e +Source0: https://lilypond.org/download/sources/v2.22/%{name}-%{version}.tar.gz +# Source0-md5: 4b0d869873b0120bda2e8bd94e1a628a Patch0: %{name}-info.patch Patch1: %{name}-sh.patch Patch2: %{name}-aclocal.patch -Patch3: %{name}-texi2html.patch +Patch3: %{name}-mf.patch URL: http://www.lilypond.org/ BuildRequires: autoconf >= 2.60 BuildRequires: automake -BuildRequires: bison >= 1.29 +BuildRequires: bison >= 2.4.1 BuildRequires: flex >= 2.5.4a BuildRequires: fontconfig >= 1:2.4.0 BuildRequires: fontconfig-devel >= 1:2.4.0 @@ -31,19 +30,14 @@ 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.7 -BuildRequires: guile-devel < 5:2.3.0 -%else -BuildRequires: guile1-devel >= 1.8.2 -%endif +BuildRequires: guile-devel >= 5:1.8.2 BuildRequires: kpathsea-devel BuildRequires: libstdc++-devel >= 5:3.4 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: python3-devel >= 1:3.5 +BuildRequires: python3-modules >= 1:3.5 BuildRequires: rpm-pythonprov BuildRequires: t1utils BuildRequires: texinfo >= 6.1 @@ -71,7 +65,7 @@ Requires: fonts-TTF-DejaVu Requires: ghostscript >= 9.20 Requires: glib2 >= 1:2.38 Requires: pango >= 1:1.38.0 -Requires: python-modules >= 1:2.4 +Requires: python3-modules >= 1:3.5 BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) %define texmfdir %{_datadir}/texmf @@ -132,28 +126,21 @@ Obsługa plików LilyPonda dla Vima. %build %{__autoconf} %configure \ - PYTHON=%{__python} \ + PYTHON=%{__python3} \ %{?debug:--disable-optimising} \ - %{__enable_disable guile2} \ - --with-texgyre-dir=/usr/share/texmf-dist/fonts/opentype/public/tex-gyre/ \ + --with-texgyre-dir=%{texfontsdir}/opentype/public/tex-gyre/ \ %{__enable_disable doc documentation} %{__make} -j1 %install rm -rf $RPM_BUILD_ROOT -install -d $RPM_BUILD_ROOT{%{texmfdir}/{dvips,tex},%{texfontsdir}/{source,tfm,type1}} +install -d $RPM_BUILD_ROOT{%{texmfdir}/{dvips,tex},%{texfontsdir}/{source,tfm/lilypond,type1/lilypond}} %{__make} install \ DESTDIR=$RPM_BUILD_ROOT -%if %{with doc} -%{__make} -C Documentation omf-local-install \ - DESTDIR=$RPM_BUILD_ROOT \ - local_package_omfdir=%{_datadir}/omf/lilypond -%endif - -cp -aL out/share/lilypond/current/fonts/tfm \ - $RPM_BUILD_ROOT%{texfontsdir}/tfm/lilypond +cp -p mf/out/*.tfm $RPM_BUILD_ROOT%{texfontsdir}/tfm/lilypond +cp -p mf/out/*.pfb $RPM_BUILD_ROOT%{texfontsdir}/type1/lilypond find $RPM_BUILD_ROOT -name fonts.cache-1 | xargs rm -f @@ -164,8 +151,6 @@ find $RPM_BUILD_ROOT -name fonts.cache-1 | xargs rm -f %{__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 @@ -194,7 +179,7 @@ test -h %{texmfdir}/dvips/lilypond || rm -rf %{texmfdir}/dvips/lilypond %files -f %{name}.lang %defattr(644,root,root,755) -%doc AUTHORS.txt DEDICATION LICENSE* NEWS.txt README.txt ROADMAP +%doc AUTHORS.txt DEDICATION LICENSE* NEWS.txt README.md ROADMAP %attr(755,root,root) %{_bindir}/abc2ly %attr(755,root,root) %{_bindir}/convert-ly %attr(755,root,root) %{_bindir}/etf2ly @@ -210,9 +195,7 @@ test -h %{texmfdir}/dvips/lilypond || rm -rf %{texmfdir}/dvips/lilypond %{_datadir}/lilypond/%{version}/fonts %{_datadir}/lilypond/%{version}/ly %{_datadir}/lilypond/%{version}/ps -%dir %{_datadir}/lilypond/%{version}/python -%{_datadir}/lilypond/%{version}/python/*.py -%{_datadir}/lilypond/%{version}/python/*.pyc +%{_datadir}/lilypond/%{version}/python %{_datadir}/lilypond/%{version}/scm %{texfontsdir}/source/lilypond @@ -234,7 +217,6 @@ test -h %{texmfdir}/dvips/lilypond || rm -rf %{texmfdir}/dvips/lilypond %{_mandir}/man1/lilysong.1* %{_mandir}/man1/midi2ly.1* %{_mandir}/man1/musicxml2ly.1* -%{_datadir}/omf/lilypond %endif %files -n emacs-lilypond-mode-pkg -- 2.44.0