Attachment 230135 Details for Bug 260294 – updated patch

[patch] updated patch

lilypond-devel-2.23.5.diff (text/plain), 5.76 KB, created by Martin Neubauer on 2021-12-15 09:24:42 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Martin Neubauer

Created: 2021-12-15 09:24:42 UTC

Size: 5.76 KB

patch

obsolete

>diff --git a/print/lilypond-devel/Makefile b/print/lilypond-devel/Makefile
>index ea4400ce8749..85c476bf9a16 100644
>--- a/print/lilypond-devel/Makefile
>+++ b/print/lilypond-devel/Makefile
>@@ -1,7 +1,7 @@
> # Created by: patrick, trevor
> 
> PORTNAME=	lilypond
>-DISTVERSION=	2.23.4
>+DISTVERSION=	2.23.5
> CATEGORIES=	print audio
> MASTER_SITES=	http://lilypond.org/download/source/v${DISTVERSION:R}/
> PKGNAMESUFFIX=	-devel
>diff --git a/print/lilypond-devel/distinfo b/print/lilypond-devel/distinfo
>index 01dd7f204a74..f59b892a2a4f 100644
>--- a/print/lilypond-devel/distinfo
>+++ b/print/lilypond-devel/distinfo
>@@ -1,3 +1,3 @@
>-TIMESTAMP = 1635618361
>-SHA256 (lilypond-2.23.4.tar.gz) = e300cfd7b94d81f1fb782ffee2aca8249002ece2f4868004274cebde32764b1e
>-SIZE (lilypond-2.23.4.tar.gz) = 17165846
>+TIMESTAMP = 1638223494
>+SHA256 (lilypond-2.23.5.tar.gz) = 53fd289eac318356003bf19b2d9e8ec43cb32e2ea926363145c1b26482bd1678
>+SIZE (lilypond-2.23.5.tar.gz) = 17180401
>diff --git a/print/lilypond-devel/files/patch-config.make.in b/print/lilypond-devel/files/patch-config.make.in
>index 1a5ed7480e7e..bf2c4bf5f08e 100644
>--- a/print/lilypond-devel/files/patch-config.make.in
>+++ b/print/lilypond-devel/files/patch-config.make.in
>@@ -1,6 +1,6 @@
>---- config.make.in.orig	2020-08-16 10:58:56 UTC
>+--- config.make.in.orig	2021-11-28 13:46:28 UTC
> +++ config.make.in
>-@@ -94,7 +94,7 @@ mandir = @mandir@
>+@@ -95,7 +95,7 @@ mandir = @mandir@
>  package = lilypond
>  package_datadir = $(datadir)/$(package)
>  package_docdir = $(docdir)/$(package)
>diff --git a/print/lilypond-devel/files/patch-configure b/print/lilypond-devel/files/patch-configure
>index af0a1056ec86..c0c6cada9a89 100644
>--- a/print/lilypond-devel/files/patch-configure
>+++ b/print/lilypond-devel/files/patch-configure
>@@ -1,6 +1,6 @@
>---- configure.orig	2020-07-13 14:02:44 UTC
>+--- configure.orig	2021-11-28 13:46:28 UTC
> +++ configure
>-@@ -9035,71 +9035,10 @@ test -n "$PKG_CONFIG" || PKG_CONFIG="no"
>+@@ -8623,71 +8623,10 @@ test -n "$PKG_CONFIG" || PKG_CONFIG="no"
>      if test $? -eq 0; then
>          if test -n "0.9.0" -o -n ""; then
>  
>diff --git a/print/lilypond-devel/files/patch-lily_dispatcher.cc b/print/lilypond-devel/files/patch-lily_dispatcher.cc
>new file mode 100644
>index 000000000000..e33d090c2f6e
>--- /dev/null
>+++ b/print/lilypond-devel/files/patch-lily_dispatcher.cc
>@@ -0,0 +1,14 @@
>+--- lily/dispatcher.cc.orig	2021-11-28 13:46:28 UTC
>++++ lily/dispatcher.cc
>+@@ -23,8 +23,10 @@
>+ #include "warn.hh"
>+ #include "lily-imports.hh"
>+ 
>+-#ifdef __MINGW32__
>++#if defined __MINGW32__
>+ #include <malloc.h>
>++#elif defined __FreeBSD__
>++#include <stdlib.h>
>+ #else
>+ #include <alloca.h>
>+ #endif
>diff --git a/print/lilypond-devel/files/patch-lily_midi-item.cc b/print/lilypond-devel/files/patch-lily_midi-item.cc
>deleted file mode 100644
>index fc56a5ecc90b..000000000000
>--- a/print/lilypond-devel/files/patch-lily_midi-item.cc
>+++ /dev/null
>@@ -1,11 +0,0 @@
>---- lily/midi-item.cc.orig	2020-04-29 11:39:18 UTC
>-+++ lily/midi-item.cc
>-@@ -319,7 +319,7 @@ Midi_text::Midi_text (Audio_text *a)
>- string
>- Midi_text::to_string () const
>- {
>--  uint8_t text_code[] = {0xff, audio_->type_};
>-+  uint8_t text_code[] = {0xff, uint8_t (audio_->type_)};
>-   string str ((char *) text_code, sizeof (text_code));
>-   str += int2midi_varint_string (int (audio_->text_string_.length ()));
>-   str += audio_->text_string_;
>diff --git a/print/lilypond-devel/files/patch-stepmake_stepmake_texinfo-vars.make b/print/lilypond-devel/files/patch-stepmake_stepmake_texinfo-vars.make
>index 2765792a6700..08b50d4363fa 100644
>--- a/print/lilypond-devel/files/patch-stepmake_stepmake_texinfo-vars.make
>+++ b/print/lilypond-devel/files/patch-stepmake_stepmake_texinfo-vars.make
>@@ -1,6 +1,6 @@
>---- stepmake/stepmake/texinfo-vars.make.orig	2020-04-26 09:45:49 UTC
>+--- stepmake/stepmake/texinfo-vars.make.orig	2021-11-28 13:46:28 UTC
> +++ stepmake/stepmake/texinfo-vars.make
>-@@ -26,7 +26,7 @@ DO_TEXI_DEP = ( echo ./$@: $(call scan-texi,$<) > $(ba
>+@@ -3,7 +3,7 @@ TEXINFO_SOURCES = $(TEXI_FILES)
>  
>  TEXINFO_PAPERSIZE_OPTION= $(if $(findstring $(PAPERSIZE),a4),,-t @afourpaper)
>  
>@@ -8,4 +8,4 @@
> +MAKEINFO_FLAGS += --enable-encoding --force $(DOCUMENTATION_INCLUDES)
>  MAKEINFO = LANG=C $(MAKEINFO_PROGRAM) $(MAKEINFO_FLAGS)
>  
>- # texi2html xref map files
>+ ###########
>diff --git a/print/lilypond-devel/pkg-plist b/print/lilypond-devel/pkg-plist
>index 6a945b76be27..f5b4f92a03ee 100644
>--- a/print/lilypond-devel/pkg-plist
>+++ b/print/lilypond-devel/pkg-plist
>@@ -296,6 +296,7 @@ share/emacs/site-lisp/lilypond-words.el
> %%DATADIR%%/%%DISTVERSION%%/scm/lily/document-markup.scm
> %%DATADIR%%/%%DISTVERSION%%/scm/lily/document-music.scm
> %%DATADIR%%/%%DISTVERSION%%/scm/lily/document-outside-staff-priorities.scm
>+%%DATADIR%%/%%DISTVERSION%%/scm/lily/document-paper-sizes.scm
> %%DATADIR%%/%%DISTVERSION%%/scm/lily/document-translation.scm
> %%DATADIR%%/%%DISTVERSION%%/scm/lily/document-type-predicates.scm
> %%DATADIR%%/%%DISTVERSION%%/scm/lily/documentation-generate.scm
>@@ -305,7 +306,6 @@ share/emacs/site-lisp/lilypond-words.el
> %%DATADIR%%/%%DISTVERSION%%/scm/lily/flag-styles.scm
> %%DATADIR%%/%%DISTVERSION%%/scm/lily/font.scm
> %%DATADIR%%/%%DISTVERSION%%/scm/lily/framework-cairo.scm
>-%%DATADIR%%/%%DISTVERSION%%/scm/lily/framework-eps.scm
> %%DATADIR%%/%%DISTVERSION%%/scm/lily/framework-ps.scm
> %%DATADIR%%/%%DISTVERSION%%/scm/lily/framework-svg.scm
> %%DATADIR%%/%%DISTVERSION%%/scm/lily/fret-diagrams.scm
>@@ -338,6 +338,7 @@ share/emacs/site-lisp/lilypond-words.el
> %%DATADIR%%/%%DISTVERSION%%/scm/lily/safe-lily.scm
> %%DATADIR%%/%%DISTVERSION%%/scm/lily/safe-utility-defs.scm
> %%DATADIR%%/%%DISTVERSION%%/scm/lily/scheme-engravers.scm
>+%%DATADIR%%/%%DISTVERSION%%/scm/lily/scheme-performers.scm
> %%DATADIR%%/%%DISTVERSION%%/scm/lily/script.scm
> %%DATADIR%%/%%DISTVERSION%%/scm/lily/skyline.scm
> %%DATADIR%%/%%DISTVERSION%%/scm/lily/song-util.scm

Flags:

m.ne: maintainer-approval+

Actions: View | Diff

Attachments on bug 260294: 229997 | 230128 | 230135