Hello community, here is the log from the commit of package lilypond for openSUSE:Factory checked in at 2020-05-08 23:08:11 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/lilypond (Old) and /work/SRC/openSUSE:Factory/.lilypond.new.2738 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "lilypond" Fri May 8 23:08:11 2020 rev:29 rq:801771 version:2.20.0 Changes: -------- --- /work/SRC/openSUSE:Factory/lilypond/lilypond-doc.changes 2020-04-21 13:11:42.088936044 +0200 +++ /work/SRC/openSUSE:Factory/.lilypond.new.2738/lilypond-doc.changes 2020-05-08 23:08:15.550218613 +0200 @@ -1,0 +2,15 @@ +Thu May 7 13:20:31 UTC 2020 - Dave Plater <[email protected]> + +- Update to version 2.20.0. +- Removed incorporated and obsolete patches: + Avoid-segfault-in-grob.cc-with-gcc-6.patch, + Issue-5243-2-Let-get-editor-use-shell-quote-argument.diff, + Issue-5243-3-More-conservative-parsing-of-textedit-URIs.diff, + add_set-global-fonts_function.patch, hurd_file_name_support.patch, + lilypond-doc-texinfo4.patch and use_system_correctly.patch. +- lilypond-century-schoolbook-l-fonts replaced by + lilypond-texgy-fonts. +- Lots of upstream new features and fixes, see: + /usr/share/doc/packages/lilypond/NEWS.txt + +------------------------------------------------------------------- --- /work/SRC/openSUSE:Factory/lilypond/lilypond.changes 2020-04-21 13:11:42.720937304 +0200 +++ /work/SRC/openSUSE:Factory/.lilypond.new.2738/lilypond.changes 2020-05-08 23:08:16.102219741 +0200 @@ -1,0 +2,15 @@ +Thu May 7 12:37:36 UTC 2020 - Dave Plater <[email protected]> + +- Update to version 2.20.0. +- Removed incorporated and obsolete patches: + Avoid-segfault-in-grob.cc-with-gcc-6.patch, + Issue-5243-2-Let-get-editor-use-shell-quote-argument.diff, + Issue-5243-3-More-conservative-parsing-of-textedit-URIs.diff, + add_set-global-fonts_function.patch, hurd_file_name_support.patch, + lilypond-doc-texinfo4.patch and use_system_correctly.patch. +- lilypond-century-schoolbook-l-fonts replaced by + lilypond-texgy-fonts. +- Lots of upstream new features and fixes, see: + /usr/share/doc/packages/lilypond/NEWS.txt + +------------------------------------------------------------------- Old: ---- Avoid-segfault-in-grob.cc-with-gcc-6.patch Issue-5243-2-Let-get-editor-use-shell-quote-argument.diff Issue-5243-3-More-conservative-parsing-of-textedit-URIs.diff add_set-global-fonts_function.patch hurd_file_name_support.patch lilypond-2.18.2.tar.gz lilypond-doc-texinfo4.patch use_system_correctly.patch New: ---- lilypond-2.20.0.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ lilypond-doc.spec ++++++ --- /var/tmp/diff_new_pack.54z6Co/_old 2020-05-08 23:08:17.966223548 +0200 +++ /var/tmp/diff_new_pack.54z6Co/_new 2020-05-08 23:08:17.970223557 +0200 @@ -16,8 +16,10 @@ # -%define ver 2.18 -%define plevel 2 +%bcond_without docbuild + +%define ver 2.20 +%define plevel 0 Name: lilypond-doc Version: %{ver}.%{plevel} Release: 0 @@ -25,22 +27,24 @@ License: GFDL-1.3-only Group: Documentation/HTML URL: http://lilypond.org/ -Source0: http://download.linuxaudio.org/lilypond/sources/v%{ver}/lilypond-%{version}.tar.gz +Source0: lilypond-%{version}.tar.gz +%if %{without docbuild} +#Source1: https://lilypond.org/download/binaries/documentation/lilypond-%%{version}-1.documentation.tar.bz2 +%endif +# PATCH-FIX-UPSTREAM https://savannah.gnu.org/patch/index.php?9370 +Patch0: reproducible.patch # Patches taken from Debian, see headers for info. -Patch2: 0101-read_relocation_dir-in-lilypond_datadir-too.patch -Patch3: add_dircategories_to_documentation.patch -Patch4: add_set-global-fonts_function.patch -Patch5: hurd_file_name_support.patch -Patch6: Issue-5243-1-editor-scm-Add-shell-quote-argument-function.diff -Patch7: Issue-5243-2-Let-get-editor-use-shell-quote-argument.diff -Patch8: Issue-5243-3-More-conservative-parsing-of-textedit-URIs.diff -Patch9: use_cstring_and_ctype_includes.patch -Patch10: use_system_correctly.patch +Patch1: 0101-read_relocation_dir-in-lilypond_datadir-too.patch +Patch2: add_dircategories_to_documentation.patch +Patch3: Issue-5243-1-editor-scm-Add-shell-quote-argument-function.diff +Patch4: use_cstring_and_ctype_includes.patch BuildRequires: ImageMagick-extra BuildRequires: autoconf BuildRequires: bison +BuildRequires: bitstream-vera-fonts BuildRequires: dblatex BuildRequires: dejavu +BuildRequires: extractpdfmark BuildRequires: fdupes BuildRequires: flex BuildRequires: fontconfig-devel >= 2.4.0 @@ -50,8 +54,6 @@ BuildRequires: gcc-c++ BuildRequires: gentium BuildRequires: gettext-tools -#BuildRequires: ghostscript-fonts-rus -BuildRequires: bitstream-vera-fonts BuildRequires: ghostscript >= 8.60 BuildRequires: ghostscript-fonts-other BuildRequires: ghostscript-fonts-std @@ -64,41 +66,40 @@ BuildRequires: libtool BuildRequires: lilypond = %{version} BuildRequires: lndir +BuildRequires: makeinfo >= 6.1 +BuildRequires: mc BuildRequires: mftrace BuildRequires: netpbm BuildRequires: pango-devel >= 1.12 BuildRequires: perl -BuildRequires: python-devel >= 2.4 BuildRequires: rsync BuildRequires: t1utils BuildRequires: texlive-avantgar-fonts BuildRequires: texlive-collection-fontsrecommended BuildRequires: texlive-dejavu-fonts +BuildRequires: texlive-fancybox BuildRequires: texlive-gnu-freefont-fonts BuildRequires: texlive-lh BuildRequires: texlive-libertine-fonts BuildRequires: texlive-metafont-bin BuildRequires: texlive-metapost +BuildRequires: texlive-xetex-bin +BuildRequires: texlive-xltxtra BuildRequires: ttf-wqy-zenhei BuildRequires: xfntjp BuildRequires: xorg-x11-fonts BuildRequires: zip +BuildRequires: pkgconfig(python3) Requires: lilypond = %{version} Requires(pre): %{install_info_prereq} %{_bindir}/touch %{_bindir}/sed Provides: lilypond-documentation = %{version} Obsoletes: lilypond-documentation < %{version} -BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildArch: noarch -%if 0%{?suse_version} > 1320 -Patch0: lilypond-doc-texinfo4.patch -# NOTE: when lilypond documentation build with texinfo 5.x is fixed by upstream remove patch, the 4s from makeinfo, +%if %{with docbuild} +# NOTE: when lilypond documentation build with texinfo 5.x is fixed by upstream remove the 4s from makeinfo, # NOTE: texinfo and update buildrequires with: #BuildRequires: texi2html -BuildRequires: makeinfo4 -BuildRequires: texinfo4 -%else -BuildRequires: texinfo -BuildRequires: texlive-filesystem +BuildRequires: texinfo4-links %endif %description @@ -182,18 +183,7 @@ %prep %setup -q -n lilypond-%{version} -%if 0%{?suse_version} > 1320 -%patch0 -%endif -%patch2 -%patch3 -%patch4 -%patch5 -%patch6 -%patch7 -%patch8 -%patch9 -%patch10 +%autopatch -p1 # Convert translations to UTF-8 for file in $(grep -L charset=UTF-8 po/*.po) ; do @@ -204,15 +194,19 @@ tar -cf - input/ | tar -C out/examples/ -xf- || true %define _buildir $PWD +pushd scripts +for i in `grep -rl "/usr/bin/python"`;do sed -i '1s@^#!.*@#!/usr/bin/python3@' ${i} ;done +cd ../python +for i in `grep -rl "/usr/bin/python"`;do sed -i '1s@^#!.*@#!/usr/bin/python3@' ${i} ;done +popd +for i in `grep -rl "/usr/bin/env python"`;do sed -i '1s@^#!.*@#!/usr/bin/python3@' ${i} ;done %build -chmod 644 Documentation/pictures/*.png + +#chmod 644 Documentation/pictures/*.png # export GS_LIB="/home/$USER/.fonts" is a work around for bnc#568280 -#export GS_LIB="/home/$USER/.fonts:%%{_buildir}/mf/out" -export CFLAGS="-fmessage-length=0 -O2 -Wall -D_FORTIFY_SOURCE=2 -fstack-protector -funwind-tables -fasynchronous-unwind-tables -ggdb" -%if 0%{?suse_version} == 1210 -export CFLAGS="$CFLAGS -fno-optimize-sibling-calls" -%endif +export GS_LIB="$HOME/.fonts:%{_buildir}/mf/out" + export GUILE_AUTO_COMPILE=0 export CFLAGS="%{optflags} -ggdb -fpermissive -fabi-version=4" export CXXFLAGS="$CFLAGS" @@ -225,23 +219,22 @@ echo "*********************************" echo "* Start the documentation build *" echo "*********************************" -pushd Documentation +make -C scripts && make -C python +#pushd Documentation # Don't build documentation in paralell. It fails randomly. -LILYPOND_EXTERNAL_BINARY="%{_bindir}/lilypond" LILYPOND_BINARY=$LILYPOND_EXTERNAL_BINARY make -e doc \ -|| (cat internals.texi2pdf.log && false) +make -e doc LILYPOND_EXTERNAL_BINARY="%{_bindir}/lilypond" LILYPOND_BINARY=$LILYPOND_EXTERNAL_BINARY +#|| (cat out-www/suffix-lyxml.dblatex.log && false) #|| (lndir -ignorelinks out-www/notation . && \ #LILYPOND_EXTERNAL_BINARY="%%{_bindir}/lilypond" LILYPOND_BINARY=$LILYPOND_EXTERNAL_BINARY make doc) -popd -make -j1 out=www WWW-post +#popd +#make -j1 out=www WWW-post %install mkdir -p "%{buildroot}%{_datadir}/lilypond/%{rlversion}" # install documentation make install-doc DESTDIR=%{buildroot} webdir=%{_docdir}/lilypond -cp -a COPYING LICENSE LICENSE.DOCUMENTATION \ - DEDICATION HACKING ROADMAP AUTHORS.txt NEWS.txt \ - VERSION \ - %{buildroot}%{_docdir}/lilypond +cp -a DEDICATION HACKING ROADMAP AUTHORS.txt NEWS.txt \ + VERSION %{buildroot}%{_docdir}/lilypond find %{buildroot}%{_docdir}/lilypond -name *.signature -exec rm {} \; # Fix any .py files with shebangs and wrong permissions. @@ -250,6 +243,8 @@ else chmod -f 0755 `find %{buildroot}%{_datadir}/lilypond/ -name *.py -perm 0644 -print0|xargs -0r grep -l '#!'`; \ fi LILYPOND_EXTERNAL_BINARY=%{_bindir}/lilypond +# Remove spurious executables rpm lint error +chmod 0644 %{buildroot}%{_docdir}/lilypond/Documentation/pictures/*png || true %find_lang lilypond texhash %{buildroot}%{_datadir}/lilypond/%{rlversion} find %{buildroot}%{_docdir}/lilypond/ -type f -empty -delete -print @@ -283,7 +278,7 @@ for d in '.usr.share' '.usr.share.doc' '.usr.share.info' '.usr.share.doc.packages'; do sed -i "/^%%dir $d$/d" files-en done -for f in LICENSE LICENSE.DOCUMENTATION COPYING DEDICATION \ +for f in DEDICATION \ HACKING ROADMAP VERSION AUTHORS.txt NEWS.txt; do echo "%%exclude %{_docdir}/lilypond/$f" >> files-en done @@ -299,32 +294,42 @@ %files cs -f files-cs %defattr(-,root,root) +%license LICENSE LICENSE.DOCUMENTATION COPYING %files de -f files-de %defattr(-,root,root) +%license LICENSE LICENSE.DOCUMENTATION COPYING %files es -f files-es %defattr(-,root,root) +%license LICENSE LICENSE.DOCUMENTATION COPYING %files fr -f files-fr %defattr(-,root,root) +%license LICENSE LICENSE.DOCUMENTATION COPYING %files hu -f files-hu %defattr(-,root,root) +%license LICENSE LICENSE.DOCUMENTATION COPYING %files it -f files-it %defattr(-,root,root) +%license LICENSE LICENSE.DOCUMENTATION COPYING %files ja -f files-ja %defattr(-,root,root) +%license LICENSE LICENSE.DOCUMENTATION COPYING %files nl -f files-nl %defattr(-,root,root) +%license LICENSE LICENSE.DOCUMENTATION COPYING %files zh -f files-zh %defattr(-,root,root) +%license LICENSE LICENSE.DOCUMENTATION COPYING %files -f files-en %defattr(-,root,root) +%license LICENSE LICENSE.DOCUMENTATION COPYING %changelog ++++++ lilypond.spec ++++++ --- /var/tmp/diff_new_pack.54z6Co/_old 2020-05-08 23:08:17.990223598 +0200 +++ /var/tmp/diff_new_pack.54z6Co/_new 2020-05-08 23:08:17.990223598 +0200 @@ -18,135 +18,126 @@ %define fontdir %{_datadir}/fonts %define ttfdir %{fontdir}/truetype +%define ver %(echo %{version} | cut -d . -f 1,2) + Name: lilypond -Version: 2.18.2 +Version: 2.20.0 Release: 0 Summary: A typesetting system for music notation License: GPL-3.0-or-later Group: Productivity/Publishing/Other URL: http://www.lilypond.org -Source0: http://download.linuxaudio.org/lilypond/sources/v2.18/lilypond-%{version}.tar.gz +Source0: https://lilypond.org/download/sources/v2.20/lilypond-%{version}.tar.gz # PATCH-FIX-UPSTREAM https://savannah.gnu.org/patch/index.php?9370 Patch0: reproducible.patch -# PATCH-FIX-UPSTREAM [email protected] -- https://sourceforge.net/p/testlilyissues/issues/4814/ -Patch1: Avoid-segfault-in-grob.cc-with-gcc-6.patch # Patches taken from Debian, see headers for info. -Patch2: 0101-read_relocation_dir-in-lilypond_datadir-too.patch -Patch3: add_dircategories_to_documentation.patch -Patch4: add_set-global-fonts_function.patch -Patch5: hurd_file_name_support.patch -Patch6: Issue-5243-1-editor-scm-Add-shell-quote-argument-function.diff -Patch7: Issue-5243-2-Let-get-editor-use-shell-quote-argument.diff -Patch8: Issue-5243-3-More-conservative-parsing-of-textedit-URIs.diff -Patch9: use_cstring_and_ctype_includes.patch -Patch10: use_system_correctly.patch +Patch1: 0101-read_relocation_dir-in-lilypond_datadir-too.patch +Patch2: add_dircategories_to_documentation.patch +Patch3: Issue-5243-1-editor-scm-Add-shell-quote-argument-function.diff +Patch4: use_cstring_and_ctype_includes.patch BuildRequires: ImageMagick BuildRequires: bison BuildRequires: dblatex +BuildRequires: dejavu-fonts BuildRequires: flex BuildRequires: fontforge +BuildRequires: freetype2-devel BuildRequires: gcc-c++ BuildRequires: gettext BuildRequires: ghostscript >= 8.15 +BuildRequires: ghostscript-fonts-other BuildRequires: ghostscript-fonts-std BuildRequires: libguile1-devel >= 1.8 -BuildRequires: makeinfo +BuildRequires: makeinfo >= 6.1 BuildRequires: mftrace >= 1.1.19 BuildRequires: potrace-devel # Needed for pngtopnm BuildRequires: netpbm BuildRequires: pkgconfig -BuildRequires: python-devel >= 2.4.0 BuildRequires: rsync BuildRequires: t1utils -BuildRequires: texinfo >= 4.8 +#BuildRequires: texi2html4 +BuildRequires: texinfo4 BuildRequires: texlive-extratools +BuildRequires: texlive-filesystem BuildRequires: texlive-latex BuildRequires: texlive-lh BuildRequires: texlive-metafont BuildRequires: texlive-metapost +BuildRequires: texlive-tex-gyre-fonts BuildRequires: vim-base BuildRequires: zip BuildRequires: pkgconfig(glib-2.0) BuildRequires: pkgconfig(gobject-2.0) BuildRequires: pkgconfig(pango) >= 1.12.0 +BuildRequires: pkgconfig(python3) # This is a work around for boo#1163190 pango-devel doesn't pull in cairo-devel although it requires it BuildRequires: pkgconfig(cairo) Requires(post): %install_info_prereq Requires(preun): %install_info_prereq Requires: ghostscript >= 8.15 -Requires: lilypond-century-schoolbook-l-fonts = %{version} -Requires: lilypond-emmentaler-fonts = %{version} +Requires: lilypond-fonts-common = %{version} BuildRoot: %{_tmppath}/%{name}-%{version}-build -# Package texi2html was split off from texinfo in current Factory. -%if 0%{?suse_version} > 1320 -BuildRequires: texi2html -%else -BuildRequires: texlive-filesystem -%endif %description LilyPond is an automated music engraving system. It formats music beautifully and automatically, and has a friendly syntax for its input files. -%package century-schoolbook-l-fonts +%package texgy-fonts Summary: Lilypond Century Schoolbook L fonts Group: System/X11/Fonts -Requires: lilypond-fonts-common = %{version} BuildArch: noarch -%description century-schoolbook-l-fonts +%description texgy-fonts LilyPond is an automated music engraving system. It formats music beautifully and automatically, and has a friendly syntax for its input files. - -These are the Century Schoolbook L fonts included in the package. +These are the lilypond Texgy fonts. %package emmentaler-fonts Summary: Lilypond emmentaler fonts Group: System/X11/Fonts -Requires: lilypond-fonts-common = %{version} BuildArch: noarch %description emmentaler-fonts LilyPond is an automated music engraving system. It formats music beautifully and automatically, and has a friendly syntax for its input files. - -These are the emmentaler fonts included in the package. +These are the lilypond emmentaler fonts. %package fonts-common Summary: Lilypond fonts common dir Group: System/X11/Fonts BuildArch: noarch +Requires: lilypond-emmentaler-fonts = %{version} +Requires: lilypond-texgy-fonts = %{version} %description fonts-common LilyPond is an automated music engraving system. It formats music beautifully and automatically, and has a friendly syntax for its input files. - This contains the directory common to all lilypond fonts. %prep %setup -q -%patch0 -p1 -%patch1 -p0 -%patch2 -%patch3 -%patch4 -%patch5 -%patch6 -%patch7 -%patch8 -%patch9 -%patch10 +%autopatch -p1 + +pushd scripts +for i in `grep -rl "/usr/bin/python"`;do sed -i '1s@^#!.*@#!/usr/bin/python3@' ${i} ;done +cd ../python +for i in `grep -rl "/usr/bin/python"`;do sed -i '1s@^#!.*@#!/usr/bin/python3@' ${i} ;done +popd +for i in `grep -rl "/usr/bin/env python"`;do sed -i '1s@^#!.*@#!/usr/bin/python3@' ${i} ;done %build export LIBS="$LIBS -lglib-2.0 -lgobject-2.0" -%configure --without-kpathsea \ - --disable-checking \ - --with-ncsb-dir=%{_datadir}/ghostscript/fonts/ +export TEXI2HTML=/usr/bin/texi2html4 +export TEXI2PDF=/usr/bin/texi2pdf4 +export TEXINDEX=/usr/bin/texindex4 + +%configure \ + --disable-checking # Build sometimes fails with multiple threads. make %{_smp_mflags} || make -j1 @@ -155,8 +146,6 @@ %make_install package_infodir=%{_infodir} \ vimdir="%{_datadir}/vim/vim$vimver" -chmod +x %{buildroot}%{_libdir}/%{name}/%{version}/python/midi.so - # Symlink lilypond-init.el in emacs' site-start.d directory pushd %{buildroot}%{_datadir}/emacs/site-lisp mkdir site-start.d @@ -172,6 +161,8 @@ rm -f %{buildroot}%{_infodir}/dir +chmod 0755 %{buildroot}%{_datadir}/lilypond/2.20.0/python/langdefs.py + %find_lang %{name} mkdir -p %{buildroot}%{ttfdir} @@ -214,9 +205,9 @@ %{_infodir}/*%{ext_info} %{_mandir}/man1/* -%files century-schoolbook-l-fonts +%files texgy-fonts %defattr(-,root,root,-) -%{ttfdir}/CenturySchL*otf +%{ttfdir}/texgy*otf %files emmentaler-fonts %defattr(-,root,root,-) ++++++ 0101-read_relocation_dir-in-lilypond_datadir-too.patch ++++++ --- /var/tmp/diff_new_pack.54z6Co/_old 2020-05-08 23:08:18.006223631 +0200 +++ /var/tmp/diff_new_pack.54z6Co/_new 2020-05-08 23:08:18.006223631 +0200 @@ -8,11 +8,11 @@ Last-Update: 2017-01-24 --- This patch header follows DEP-3: http://dep.debian.net/deps/dep3/ -Index: lily/relocate.cc +Index: b/lily/relocate.cc =================================================================== ---- lily/relocate.cc.orig 2014-03-17 17:29:16.000000000 +0200 -+++ lily/relocate.cc 2018-05-15 10:43:59.399752162 +0200 -@@ -146,8 +146,10 @@ framework_relocation (const string &pref +--- a/lily/relocate.cc 2020-03-01 16:00:51.000000000 +0200 ++++ b/lily/relocate.cc 2020-05-05 09:17:00.253689618 +0200 +@@ -148,8 +148,10 @@ framework_relocation (const string &pref debug_output (_f ("Relocation: framework_prefix=%s", prefix)); sane_putenv ("INSTALLER_PREFIX", prefix, true); ++++++ Issue-5243-1-editor-scm-Add-shell-quote-argument-function.diff ++++++ --- /var/tmp/diff_new_pack.54z6Co/_old 2020-05-08 23:08:18.022223663 +0200 +++ /var/tmp/diff_new_pack.54z6Co/_new 2020-05-08 23:08:18.022223663 +0200 @@ -8,13 +8,13 @@ This is mostly stolen from Emacs. --- -Index: scm/editor.scm +Index: b/scm/editor.scm =================================================================== ---- scm/editor.scm.orig 2014-03-17 17:29:16.000000000 +0200 -+++ scm/editor.scm 2018-05-15 10:48:31.408441118 +0200 -@@ -40,6 +40,100 @@ - (else - "emacs")))) +--- a/scm/editor.scm 2020-03-01 16:00:51.000000000 +0200 ++++ b/scm/editor.scm 2020-05-05 09:49:44.506168014 +0200 +@@ -134,6 +134,100 @@ See Info node `(elisp)Security Considera + )) + +;; A bunch of stuff stolen from Emacs + @@ -111,5 +111,5 @@ + + (define editor-command-template-alist - '(("emacs" . "emacsclient --no-wait +%(line)s:%(column)s %(file)s || (emacs +%(line)s:%(column)s %(file)s&)") - ("gvim" . "gvim --remote +:%(line)s:norm%(column)s %(file)s") + '(("atom" . "atom %(file)s:%(line)s:%(column)s") + ("emacs" . "emacsclient --no-wait +%(line)s:%(column)s %(file)s || (emacs +%(line)s:%(column)s %(file)s&)") ++++++ add_dircategories_to_documentation.patch ++++++ ++++ 681 lines (skipped) ++++ between /work/SRC/openSUSE:Factory/lilypond/add_dircategories_to_documentation.patch ++++ and /work/SRC/openSUSE:Factory/.lilypond.new.2738/add_dircategories_to_documentation.patch ++++++ lilypond-2.18.2.tar.gz -> lilypond-2.20.0.tar.gz ++++++ /work/SRC/openSUSE:Factory/lilypond/lilypond-2.18.2.tar.gz /work/SRC/openSUSE:Factory/.lilypond.new.2738/lilypond-2.20.0.tar.gz differ: char 5, line 1 ++++++ reproducible.patch ++++++ --- /var/tmp/diff_new_pack.54z6Co/_old 2020-05-08 23:08:18.086223794 +0200 +++ /var/tmp/diff_new_pack.54z6Co/_new 2020-05-08 23:08:18.086223794 +0200 @@ -1,7 +1,7 @@ -Index: lilypond-2.18.2/stepmake/stepmake/c++-vars.make +Index: b/stepmake/stepmake/c++-vars.make =================================================================== ---- lilypond-2.18.2.orig/stepmake/stepmake/c++-vars.make -+++ lilypond-2.18.2/stepmake/stepmake/c++-vars.make +--- a/stepmake/stepmake/c++-vars.make 2020-05-05 09:11:20.826176975 +0200 ++++ b/stepmake/stepmake/c++-vars.make 2020-05-05 09:11:28.450535489 +0200 @@ -11,7 +11,7 @@ ALL_CXXFLAGS = $(CXXFLAGS) $(ALL_CXXPPFL TCC_FILES := $(call src-wildcard,*.tcc) @@ -11,23 +11,10 @@ INL_FILES := $(call src-wildcard,*.icc) YY_FILES := $(call src-wildcard,*.yy) LL_FILES := $(call src-wildcard,*.ll) -Index: lilypond-2.18.2/scripts/build/help2man.pl +Index: b/scripts/build/mf2pt1.pl =================================================================== ---- lilypond-2.18.2.orig/scripts/build/help2man.pl -+++ lilypond-2.18.2/scripts/build/help2man.pl -@@ -218,7 +218,7 @@ $version_text ||= get_option_value $ARGV - # the English version expands to the month as a word and the full year. It - # is used on the footer of the generated manual pages. If in doubt, you may - # just use %x as the value (which should be the full locale-specific date). --my $date = enc strftime _("%B %Y"), localtime; -+my $date = enc strftime _("%B %Y"), gmtime($ENV{SOURCE_DATE_EPOCH} || time); - (my $program = $ARGV[0]) =~ s!.*/!!; - my $package = $program; - my $version; -Index: lilypond-2.18.2/scripts/build/mf2pt1.pl -=================================================================== ---- lilypond-2.18.2.orig/scripts/build/mf2pt1.pl -+++ lilypond-2.18.2/scripts/build/mf2pt1.pl +--- a/scripts/build/mf2pt1.pl 2020-05-05 09:11:20.826176975 +0200 ++++ b/scripts/build/mf2pt1.pl 2020-05-05 09:11:28.450535489 +0200 @@ -800,7 +800,9 @@ assign_default $creationdate, scalar loc assign_default $comment, $opthash{comment}, "Font converted to Type 1 by mf2pt1, written by Scott Pakin."; assign_default $weight, $opthash{weight}, "Medium"; ++++++ use_cstring_and_ctype_includes.patch ++++++ --- /var/tmp/diff_new_pack.54z6Co/_old 2020-05-08 23:08:18.094223810 +0200 +++ /var/tmp/diff_new_pack.54z6Co/_new 2020-05-08 23:08:18.094223810 +0200 @@ -2,10 +2,10 @@ Forwarded: Origin: vendor Author: Don Armstrong <[email protected]> -Index: lily/midi-stream.cc +Index: b/lily/midi-stream.cc =================================================================== ---- lily/midi-stream.cc.orig 2014-03-17 17:29:16.000000000 +0200 -+++ lily/midi-stream.cc 2018-05-15 10:50:35.852394146 +0200 +--- a/lily/midi-stream.cc 2020-03-01 16:00:51.000000000 +0200 ++++ b/lily/midi-stream.cc 2020-05-05 14:26:03.659464956 +0200 @@ -18,7 +18,7 @@ */ @@ -15,10 +15,10 @@ #include <cerrno> using namespace std; -Index: lily/piano-pedal-engraver.cc +Index: b/lily/piano-pedal-engraver.cc =================================================================== ---- lily/piano-pedal-engraver.cc.orig 2014-03-17 17:29:16.000000000 +0200 -+++ lily/piano-pedal-engraver.cc 2018-05-15 10:50:35.852394146 +0200 +--- a/lily/piano-pedal-engraver.cc 2020-03-01 16:00:51.000000000 +0200 ++++ b/lily/piano-pedal-engraver.cc 2020-05-05 14:26:03.679465747 +0200 @@ -38,6 +38,7 @@ #include "item.hh" @@ -27,23 +27,10 @@ #include <string.h> -Index: lily/prob.cc +Index: b/lily/relocate.cc =================================================================== ---- lily/prob.cc.orig 2014-03-17 17:29:16.000000000 +0200 -+++ lily/prob.cc 2018-05-15 10:50:35.852394146 +0200 -@@ -22,7 +22,7 @@ - #include "item.hh" - #include "input.hh" - #include "profile.hh" -- -+#include <cstring> - #include "ly-smobs.icc" - - IMPLEMENT_SMOBS (Prob); -Index: lily/relocate.cc -=================================================================== ---- lily/relocate.cc.orig 2018-05-15 10:43:59.399752162 +0200 -+++ lily/relocate.cc 2018-05-15 10:50:35.852394146 +0200 +--- a/lily/relocate.cc 2020-05-05 14:26:03.131444019 +0200 ++++ b/lily/relocate.cc 2020-05-05 14:26:03.679465747 +0200 @@ -23,8 +23,10 @@ /* TODO: autoconf support */ @@ -55,10 +42,10 @@ #if HAVE_GETTEXT #include <libintl.h> -Index: lily/source-file.cc +Index: b/lily/source-file.cc =================================================================== ---- lily/source-file.cc.orig 2014-03-17 17:29:16.000000000 +0200 -+++ lily/source-file.cc 2018-05-15 10:50:35.852394146 +0200 +--- a/lily/source-file.cc 2020-03-01 16:00:51.000000000 +0200 ++++ b/lily/source-file.cc 2020-05-05 14:26:03.683465906 +0200 @@ -24,7 +24,7 @@ #endif /* GCC_MAJOR < 4 */ @@ -68,10 +55,10 @@ #include "config.hh" #include <cstdio> -Index: lily/translator.cc +Index: b/lily/translator.cc =================================================================== ---- lily/translator.cc.orig 2014-03-17 17:29:16.000000000 +0200 -+++ lily/translator.cc 2018-05-15 10:50:35.852394146 +0200 +--- a/lily/translator.cc 2020-03-01 16:00:51.000000000 +0200 ++++ b/lily/translator.cc 2020-05-05 14:26:03.687466065 +0200 @@ -18,7 +18,7 @@ */ @@ -81,3 +68,15 @@ #include "context-def.hh" #include "dispatcher.hh" #include "global-context.hh" +Index: b/lily/prob.cc +=================================================================== +--- a/lily/prob.cc 2020-03-01 16:00:51.000000000 +0200 ++++ b/lily/prob.cc 2020-05-05 14:26:03.699466541 +0200 +@@ -22,6 +22,7 @@ + #include "item.hh" + #include "input.hh" + #include "profile.hh" ++#include <cstring> + + const char *const Prob::type_p_name_ = "ly:prob?"; +
