Attachment 242420 Details for Bug 271638 – updated patch

[patch] updated patch

lilypond-devel-2.25.5.diff (text/plain), 9.25 KB, created by Martin Neubauer on 2023-05-26 10:44:00 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Martin Neubauer

Created: 2023-05-26 10:44:00 UTC

Size: 9.25 KB

patch

obsolete

>diff --git a/print/lilypond-devel/Makefile b/print/lilypond-devel/Makefile
>index d96801687413..c1933f793195 100644
>--- a/print/lilypond-devel/Makefile
>+++ b/print/lilypond-devel/Makefile
>@@ -1,6 +1,5 @@
> PORTNAME=	lilypond
>-DISTVERSION=	2.23.80
>-PORTREVISION=	1
>+DISTVERSION=	2.25.5
> CATEGORIES=	print audio
> MASTER_SITES=	http://lilypond.org/download/source/v${DISTVERSION:R}/
> PKGNAMESUFFIX=	-devel
>@@ -27,14 +26,15 @@ LIB_DEPENDS=	libfontconfig.so:x11-fonts/fontconfig \
> 		libgmp.so:math/gmp \
> 		libguile-2.2.so:lang/guile2 \
> 		libharfbuzz.so:print/harfbuzz \
>-		libltdl.so:devel/libltdl
>+		libltdl.so:devel/libltdl \
>+		libpng16.so:graphics/png
> RUN_DEPENDS=	${LOCALBASE}/share/fonts/dejavu/DejaVuSans-Bold.ttf:x11-fonts/dejavu \
> 		mftrace:print/mftrace
> 
> USES=		bison:build compiler:c++11-lib cpe ghostscript gmake gnome \
> 		magick:7,build perl5 pkgconfig python:3.5+
> USE_CXXSTD=	c++14
>-USE_GNOME=	pango
>+USE_GNOME=	cairo pango
> USE_PERL5=	build
> 
> GNU_CONFIGURE=		yes
>@@ -75,8 +75,6 @@ URW_RUN_DEPENDS_OFF=	urw-base35-fonts>0:x11-fonts/urw-base35-fonts
> URW_CONFIGURE_WITH=	urwotf-dir=${LOCALBASE}/share/fonts/urw-base35-fonts
> 
> post-patch:
>-	@${REINPLACE_CMD} -e 's|<FlexLexer.h>|"/usr/include/FlexLexer.h"|' \
>-		${WRKSRC}/lily/include/includable-lexer.hh
> 	@${SED} -e 's|%%FONTDIR%%|${WRKDIR}/fontconfig/cache/|'  \
> 		${FILESDIR}/fonts.conf > ${WRKDIR}/.fonts.conf
> 
>diff --git a/print/lilypond-devel/distinfo b/print/lilypond-devel/distinfo
>index fa3b109962af..0aafa786b9a2 100644
>--- a/print/lilypond-devel/distinfo
>+++ b/print/lilypond-devel/distinfo
>@@ -1,3 +1,3 @@
>-TIMESTAMP = 1666615818
>-SHA256 (lilypond-2.23.80.tar.gz) = 2b0c80d4ca73a7208eb593682a0cef79bae5ee86780f3c24b18c995c9264cff9
>-SIZE (lilypond-2.23.80.tar.gz) = 19345330
>+TIMESTAMP = 1684879480
>+SHA256 (lilypond-2.25.5.tar.gz) = 42014688d2aa7c2ed0ec4d3fca1b17170299a23fbfd3b7341b04cf5a20f3feee
>+SIZE (lilypond-2.25.5.tar.gz) = 18954996
>diff --git a/print/lilypond-devel/files/patch-Documentation_GNUmakefile b/print/lilypond-devel/files/patch-Documentation_GNUmakefile
>index fc70919262da..2ffbceed179d 100644
>--- a/print/lilypond-devel/files/patch-Documentation_GNUmakefile
>+++ b/print/lilypond-devel/files/patch-Documentation_GNUmakefile
>@@ -1,6 +1,6 @@
>---- Documentation/GNUmakefile.orig	2022-03-26 15:12:51 UTC
>+--- Documentation/GNUmakefile.orig	2023-05-21 08:46:38 UTC
> +++ Documentation/GNUmakefile
>-@@ -188,6 +188,7 @@ INFO_DOCS = \
>+@@ -139,6 +139,7 @@ INFO_DOCS = \
>    lilypond-internals \
>    lilypond-learning \
>    lilypond-notation \
>@@ -8,7 +8,7 @@
>    lilypond-usage \
>    music-glossary
>  # Some info files should only be processed if `$(out)` is equal to `www`, but we
>-@@ -196,11 +197,9 @@ INFO_DOCS = \
>+@@ -147,11 +148,9 @@ INFO_DOCS = \
>  # older LilyPond versions inserted more entries that are no longer present.
>  ALL_INFO_DOCS = \
>    $(INFO_DOCS) \
>diff --git a/print/lilypond-devel/files/patch-config.make.in b/print/lilypond-devel/files/patch-config.make.in
>index 5659220262ee..a8a98af907c2 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	2022-05-20 13:40:50 UTC
>+--- config.make.in.orig	2023-05-21 08:46:38 UTC
> +++ config.make.in
>-@@ -99,7 +99,7 @@ mandir = @mandir@
>+@@ -78,7 +78,7 @@ mandir = @mandir@
>  package = lilypond
>  package_datadir = $(datadir)/$(package)
>  package_docdir = $(docdir)/$(package)
>diff --git a/print/lilypond-devel/files/patch-make_texinfo-vars.make b/print/lilypond-devel/files/patch-make_texinfo-vars.make
>deleted file mode 100644
>index 9778be230e4b..000000000000
>--- a/print/lilypond-devel/files/patch-make_texinfo-vars.make
>+++ /dev/null
>@@ -1,11 +0,0 @@
>---- make/texinfo-vars.make.orig	2022-05-20 13:40:50 UTC
>-+++ make/texinfo-vars.make
>-@@ -3,7 +3,7 @@ TEXINFO_SOURCES = $(TEXI_FILES)
>- 
>- TEXINFO_PAPERSIZE_OPTION= $(if $(findstring $(PAPERSIZE),a4),,-t @afourpaper)
>- 
>--MAKEINFO_FLAGS += --enable-encoding --error-limit=0 $(DOCUMENTATION_INCLUDES)
>-+MAKEINFO_FLAGS += --enable-encoding --force $(DOCUMENTATION_INCLUDES)
>- MAKEINFO = LANG=C $(MAKEINFO_PROGRAM) $(MAKEINFO_FLAGS)
>- 
>- ###########
>diff --git a/print/lilypond-devel/pkg-plist b/print/lilypond-devel/pkg-plist
>index 0d463ade6a9e..7ef03716a970 100644
>--- a/print/lilypond-devel/pkg-plist
>+++ b/print/lilypond-devel/pkg-plist
>@@ -27,6 +27,7 @@ share/emacs/site-lisp/lilypond-what-beat.el
> share/emacs/site-lisp/lilypond-words.el
> %%DATADIR%%/%%DISTVERSION%%/fonts/00-lilypond-fonts.conf
> %%DATADIR%%/%%DISTVERSION%%/fonts/99-lilypond-fonts.conf
>+%%DATADIR%%/%%DISTVERSION%%/fonts/emmentaler-font.conf
> %%DATADIR%%/%%DISTVERSION%%/fonts/otf/emmentaler-11.otf
> %%DATADIR%%/%%DISTVERSION%%/fonts/otf/emmentaler-13.otf
> %%DATADIR%%/%%DISTVERSION%%/fonts/otf/emmentaler-14.otf
>@@ -140,24 +141,15 @@ share/emacs/site-lisp/lilypond-words.el
> %%DATADIR%%/%%DISTVERSION%%/fonts/source/parmesan23.mf
> %%DATADIR%%/%%DISTVERSION%%/fonts/source/parmesan26.mf
> %%DATADIR%%/%%DISTVERSION%%/fonts/svg/emmentaler-11.svg
>-%%DATADIR%%/%%DISTVERSION%%/fonts/svg/emmentaler-11.woff
> %%DATADIR%%/%%DISTVERSION%%/fonts/svg/emmentaler-13.svg
>-%%DATADIR%%/%%DISTVERSION%%/fonts/svg/emmentaler-13.woff
> %%DATADIR%%/%%DISTVERSION%%/fonts/svg/emmentaler-14.svg
>-%%DATADIR%%/%%DISTVERSION%%/fonts/svg/emmentaler-14.woff
> %%DATADIR%%/%%DISTVERSION%%/fonts/svg/emmentaler-16.svg
>-%%DATADIR%%/%%DISTVERSION%%/fonts/svg/emmentaler-16.woff
> %%DATADIR%%/%%DISTVERSION%%/fonts/svg/emmentaler-18.svg
>-%%DATADIR%%/%%DISTVERSION%%/fonts/svg/emmentaler-18.woff
> %%DATADIR%%/%%DISTVERSION%%/fonts/svg/emmentaler-20.svg
>-%%DATADIR%%/%%DISTVERSION%%/fonts/svg/emmentaler-20.woff
> %%DATADIR%%/%%DISTVERSION%%/fonts/svg/emmentaler-23.svg
>-%%DATADIR%%/%%DISTVERSION%%/fonts/svg/emmentaler-23.woff
> %%DATADIR%%/%%DISTVERSION%%/fonts/svg/emmentaler-26.svg
>-%%DATADIR%%/%%DISTVERSION%%/fonts/svg/emmentaler-26.woff
> %%DATADIR%%/%%DISTVERSION%%/fonts/svg/emmentaler-brace.svg
>-%%DATADIR%%/%%DISTVERSION%%/fonts/svg/emmentaler-brace.woff
>-%%DATADIR%%/%%DISTVERSION%%/ly/Welcome_to_LilyPond.ly
>+%%DATADIR%%/%%DISTVERSION%%/ly/ancient-init.ly
> %%DATADIR%%/%%DISTVERSION%%/ly/arabic.ly
> %%DATADIR%%/%%DISTVERSION%%/ly/articulate.ly
> %%DATADIR%%/%%DISTVERSION%%/ly/bagpipe.ly
>@@ -182,6 +174,7 @@ share/emacs/site-lisp/lilypond-words.el
> %%DATADIR%%/%%DISTVERSION%%/ly/guile-debugger.ly
> %%DATADIR%%/%%DISTVERSION%%/ly/hel-arabic.ly
> %%DATADIR%%/%%DISTVERSION%%/ly/init.ly
>+%%DATADIR%%/%%DISTVERSION%%/ly/internal-backend-test.ly
> %%DATADIR%%/%%DISTVERSION%%/ly/italiano.ly
> %%DATADIR%%/%%DISTVERSION%%/ly/lilypond-book-preamble.ly
> %%DATADIR%%/%%DISTVERSION%%/ly/lyrics-tkit.ly
>@@ -279,6 +272,7 @@ share/emacs/site-lisp/lilypond-words.el
> %%DATADIR%%/%%DISTVERSION%%/scm/lily/display-lily.scm
> %%DATADIR%%/%%DISTVERSION%%/scm/lily/display-woodwind-diagrams.scm
> %%DATADIR%%/%%DISTVERSION%%/scm/lily/document-backend.scm
>+%%DATADIR%%/%%DISTVERSION%%/scm/lily/document-colors.scm
> %%DATADIR%%/%%DISTVERSION%%/scm/lily/document-context-mods.scm
> %%DATADIR%%/%%DISTVERSION%%/scm/lily/document-functions.scm
> %%DATADIR%%/%%DISTVERSION%%/scm/lily/document-identifiers.scm
>@@ -293,7 +287,6 @@ share/emacs/site-lisp/lilypond-words.el
> %%DATADIR%%/%%DISTVERSION%%/scm/lily/file-cache.scm
> %%DATADIR%%/%%DISTVERSION%%/scm/lily/flag-styles.scm
> %%DATADIR%%/%%DISTVERSION%%/scm/lily/font-encodings.scm
>-%%DATADIR%%/%%DISTVERSION%%/scm/lily/font.scm
> %%DATADIR%%/%%DISTVERSION%%/scm/lily/framework-cairo.scm
> %%DATADIR%%/%%DISTVERSION%%/scm/lily/framework-ps.scm
> %%DATADIR%%/%%DISTVERSION%%/scm/lily/framework-svg.scm
>@@ -324,6 +317,7 @@ share/emacs/site-lisp/lilypond-words.el
> %%DATADIR%%/%%DISTVERSION%%/scm/lily/part-combiner.scm
> %%DATADIR%%/%%DISTVERSION%%/scm/lily/predefined-fretboards.scm
> %%DATADIR%%/%%DISTVERSION%%/scm/lily/ps-to-png.scm
>+%%DATADIR%%/%%DISTVERSION%%/scm/lily/qr-code.scm
> %%DATADIR%%/%%DISTVERSION%%/scm/lily/scheme-engravers.scm
> %%DATADIR%%/%%DISTVERSION%%/scm/lily/scheme-performers.scm
> %%DATADIR%%/%%DISTVERSION%%/scm/lily/script.scm
>@@ -332,7 +326,6 @@ share/emacs/site-lisp/lilypond-words.el
> %%DATADIR%%/%%DISTVERSION%%/scm/lily/song.scm
> %%DATADIR%%/%%DISTVERSION%%/scm/lily/stencil.scm
> %%DATADIR%%/%%DISTVERSION%%/scm/lily/tablature.scm
>-%%DATADIR%%/%%DISTVERSION%%/scm/lily/text-replacements.scm
> %%DATADIR%%/%%DISTVERSION%%/scm/lily/time-signature-settings.scm
> %%DATADIR%%/%%DISTVERSION%%/scm/lily/time-signature.scm
> %%DATADIR%%/%%DISTVERSION%%/scm/lily/titling.scm
>@@ -363,6 +356,7 @@ share/emacs/site-lisp/lilypond-words.el
> %%NLS%%share/locale/tr/LC_MESSAGES/lilypond.mo
> %%NLS%%share/locale/uk/LC_MESSAGES/lilypond.mo
> %%NLS%%share/locale/vi/LC_MESSAGES/lilypond.mo
>+%%NLS%%share/locale/zh_CN/LC_MESSAGES/lilypond.mo
> %%NLS%%share/locale/zh_TW/LC_MESSAGES/lilypond.mo
> %%URW%%%%DATADIR%%/%%DISTVERSION%%/fonts/otf/C059-BdIta.otf
> %%URW%%%%DATADIR%%/%%DISTVERSION%%/fonts/otf/C059-Bold.otf
>diff --git a/print/lilypond-devel/files/patch-lily_include_includable-lexer.hh b/print/lilypond-devel/files/patch-lily_include_includable-lexer.hh
>new file mode 100644
>index 000000000000..eb443276028a
>--- /dev/null
>+++ b/print/lilypond-devel/files/patch-lily_include_includable-lexer.hh
>@@ -0,0 +1,11 @@
>+--- lily/include/includable-lexer.hh.orig	2023-02-10 17:44:03 UTC
>++++ lily/include/includable-lexer.hh
>+@@ -21,7 +21,7 @@
>+ #define INCLUDABLE_LEXER_HH
>+ 
>+ #ifndef LEXER_CC
>+-#include <FlexLexer.h>
>++#include "/usr/include/FlexLexer.h"
>+ #endif
>+ 
>+ #include "std-string.hh"

Flags:

m.ne: maintainer-approval+

Actions: View | Diff

Attachments on bug 271638: 242404 | 242420