Attachment 234456 Details for Bug 264465 – patch for print/lilypond-devel to 2.23.9

[patch] patch for print/lilypond-devel to 2.23.9

lilypond-devel-2.23.9.diff (text/plain), 8.15 KB, created by Martin Neubauer on 2022-06-05 08:49:52 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Martin Neubauer

Created: 2022-06-05 08:49:52 UTC

Size: 8.15 KB

patch

obsolete

>diff --git a/print/lilypond-devel/Makefile b/print/lilypond-devel/Makefile
>index 51a24002b235..5bfb66bc6bec 100644
>--- a/print/lilypond-devel/Makefile
>+++ b/print/lilypond-devel/Makefile
>@@ -1,7 +1,7 @@
> # Created by: patrick, trevor
> 
> PORTNAME=	lilypond
>-DISTVERSION=	2.23.6
>+DISTVERSION=	2.23.9
> CATEGORIES=	print audio
> MASTER_SITES=	http://lilypond.org/download/source/v${DISTVERSION:R}/
> PKGNAMESUFFIX=	-devel
>@@ -23,14 +23,16 @@ BUILD_DEPENDS=	bash:shells/bash \
> 		zip:archivers/zip
> LIB_DEPENDS=	libfontconfig.so:x11-fonts/fontconfig \
> 		libfreetype.so:print/freetype2 \
>+		libgc-threaded.so:devel/boehm-gc-threaded \
> 		libgmp.so:math/gmp \
>+		libguile-2.2.so:lang/guile2 \
> 		libharfbuzz.so:print/harfbuzz \
> 		libltdl.so:devel/libltdl
> 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+
>+USES=		bison:build compiler:c++11-lib cpe ghostscript gmake gnome \
>+		magick:7,build perl5 pkgconfig python:3.5+
> USE_CXXSTD=	c++11
> USE_GNOME=	pango
> USE_PERL5=	build
>@@ -40,6 +42,7 @@ GNU_CONFIGURE=		yes
> CONFIGURE_ARGS+=	--with-texgyre-dir=${LOCALBASE}/${TEXMFDISTDIR}/fonts/opentype/public/tex-gyre
> CONFIGURE_ENV+=		ac_cv_prog_MAKEINFO="${LOCALBASE}/bin/makeinfo" \
> 			FLEX=${FLEX} \
>+			GUILE_FLAVOR=guile-2.2 \
> 			HOME=${WRKDIR} \
> 			YACC=${YACC}
> 
>@@ -62,22 +65,15 @@ INFO=		lilypond-changes \
> 		music-glossary
> PLIST_SUB=	DISTVERSION=${DISTVERSION}
> 
>-OPTIONS_DEFINE=	GUILE2 NLS URW
>+OPTIONS_DEFINE=	NLS URW
> OPTIONS_SUB=	yes
> 
>-GUILE2_DESC=	Use guile2 (will incur some performance penalty)
> URW_DESC=	Use bundled URW fonts
> 
>-GUILE2_LIB_DEPENDS=	libgc-threaded.so:devel/boehm-gc-threaded \
>-			libguile-2.2.so:lang/guile2
>-GUILE2_LIB_DEPENDS_OFF=	libguile.so:lang/guile1
>-GUILE2_CONFIGURE_ENV=	GUILE_FLAVOR=guile-2.2
>-
> NLS_USES=	gettext
> 
> URW_BUILD_DEPENDS=	urw-base35-fonts>0:x11-fonts/urw-base35-fonts
> 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:
>diff --git a/print/lilypond-devel/distinfo b/print/lilypond-devel/distinfo
>index 6d765fc48a7a..e7bdce2de7c0 100644
>--- a/print/lilypond-devel/distinfo
>+++ b/print/lilypond-devel/distinfo
>@@ -1,3 +1,3 @@
>-TIMESTAMP = 1644228992
>-SHA256 (lilypond-2.23.6.tar.gz) = a179bd974a0e64390efef5bb0cc1e7287f1218237548433adba51c4f25bba2ce
>-SIZE (lilypond-2.23.6.tar.gz) = 17311135
>+TIMESTAMP = 1653168738
>+SHA256 (lilypond-2.23.9.tar.gz) = 11204fab661a5324f55c607dc8f9363a47afc741563f8dc867cdd60c173b27db
>+SIZE (lilypond-2.23.9.tar.gz) = 17490519
>diff --git a/print/lilypond-devel/files/patch-Documentation_GNUmakefile b/print/lilypond-devel/files/patch-Documentation_GNUmakefile
>index bd69aeb82a41..fc70919262da 100644
>--- a/print/lilypond-devel/files/patch-Documentation_GNUmakefile
>+++ b/print/lilypond-devel/files/patch-Documentation_GNUmakefile
>@@ -1,6 +1,6 @@
>---- Documentation/GNUmakefile.orig	2021-07-03 16:12:20 UTC
>+--- Documentation/GNUmakefile.orig	2022-03-26 15:12:51 UTC
> +++ Documentation/GNUmakefile
>-@@ -187,6 +187,7 @@ INFO_DOCS = \
>+@@ -188,6 +188,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
>-@@ -195,11 +196,9 @@ INFO_DOCS = \
>+@@ -196,11 +197,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 bf2c4bf5f08e..5659220262ee 100644
>--- a/print/lilypond-devel/files/patch-config.make.in
>+++ b/print/lilypond-devel/files/patch-config.make.in
>@@ -1,11 +1,11 @@
>---- config.make.in.orig	2021-11-28 13:46:28 UTC
>+--- config.make.in.orig	2022-05-20 13:40:50 UTC
> +++ config.make.in
>-@@ -95,7 +95,7 @@ mandir = @mandir@
>+@@ -99,7 +99,7 @@ mandir = @mandir@
>  package = lilypond
>  package_datadir = $(datadir)/$(package)
>  package_docdir = $(docdir)/$(package)
> -package_infodir = $(infodir)/$(package)
> +package_infodir = $(infodir)
>+ package_libdir = $(libdir)/$(package)
>  prefix = @prefix@
>  program_prefix = @program_prefix@
>- program_suffix = @program_suffix@
>diff --git a/print/lilypond-devel/files/patch-configure b/print/lilypond-devel/files/patch-configure
>index c0c6cada9a89..fd6b0e6af92e 100644
>--- a/print/lilypond-devel/files/patch-configure
>+++ b/print/lilypond-devel/files/patch-configure
>@@ -1,12 +1,12 @@
>---- configure.orig	2021-11-28 13:46:28 UTC
>+--- configure.orig	2022-05-20 13:40:50 UTC
> +++ configure
>-@@ -8623,71 +8623,10 @@ test -n "$PKG_CONFIG" || PKG_CONFIG="no"
>+@@ -8770,71 +8770,10 @@ test -n "$PKG_CONFIG" || PKG_CONFIG="no"
>      if test $? -eq 0; then
>          if test -n "0.9.0" -o -n ""; then
>  
> -    r="`eval echo '$'"PKG_CONFIG"`"
>--    { $as_echo "$as_me:${as_lineno-$LINENO}: checking $r version" >&5
>--$as_echo_n "checking $r version... " >&6; }
>+-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking $r version" >&5
>+-printf %s "checking $r version... " >&6; }
> -    exe=`
> -    ## which doesn't work in ash, if /usr/bin/which isn't installed
> -    ## type -p doesn't work in ash
>@@ -66,8 +66,8 @@
> -    }
> -    {printf "%.0f\n", $1*1000000 + $2*1000 + three}'
> -`
>--    { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ver" >&5
>--$as_echo "$ver" >&6; }
>+-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ver" >&5
>+-printf "%s\n" "$ver" >&6; }
> -    if test "$num" -lt "$min"; then
> -
> +    if test ! $?; then
>diff --git a/print/lilypond-devel/files/patch-stepmake_stepmake_texinfo-vars.make b/print/lilypond-devel/files/patch-stepmake_stepmake_texinfo-vars.make
>deleted file mode 100644
>index 08b50d4363fa..000000000000
>--- a/print/lilypond-devel/files/patch-stepmake_stepmake_texinfo-vars.make
>+++ /dev/null
>@@ -1,11 +0,0 @@
>---- stepmake/stepmake/texinfo-vars.make.orig	2021-11-28 13:46:28 UTC
>-+++ stepmake/stepmake/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 ea19211db351..9e39d291cfb2 100644
>--- a/print/lilypond-devel/pkg-plist
>+++ b/print/lilypond-devel/pkg-plist
>@@ -268,7 +268,7 @@ share/emacs/site-lisp/lilypond-words.el
> %%DATADIR%%/%%DISTVERSION%%/scm/lily/autochange.scm
> %%DATADIR%%/%%DISTVERSION%%/scm/lily/backend-library.scm
> %%DATADIR%%/%%DISTVERSION%%/scm/lily/bar-line.scm
>-%%DATADIR%%/%%DISTVERSION%%/scm/lily/bezier-tools.scm
>+%%DATADIR%%/%%DISTVERSION%%/scm/lily/breath.scm
> %%DATADIR%%/%%DISTVERSION%%/scm/lily/c++.scm
> %%DATADIR%%/%%DISTVERSION%%/scm/lily/chord-entry.scm
> %%DATADIR%%/%%DISTVERSION%%/scm/lily/chord-ignatzek-names.scm
>@@ -351,7 +351,6 @@ share/emacs/site-lisp/lilypond-words.el
> %%DATADIR%%/%%DISTVERSION%%/scm/lily/titling.scm
> %%DATADIR%%/%%DISTVERSION%%/scm/lily/to-xml.scm
> %%DATADIR%%/%%DISTVERSION%%/scm/lily/translation-functions.scm
>-%%DATADIR%%/%%DISTVERSION%%/tex/texinfo-ja.tex
> %%DATADIR%%/%%DISTVERSION%%/vim/compiler/lilypond.vim
> %%DATADIR%%/%%DISTVERSION%%/vim/ftdetect/lilypond.vim
> %%DATADIR%%/%%DISTVERSION%%/vim/ftplugin/lilypond.vim
>diff --git a/print/lilypond-devel/files/patch-make_texinfo-vars.make b/print/lilypond-devel/files/patch-make_texinfo-vars.make
>new file mode 100644
>index 000000000000..9778be230e4b
>--- /dev/null
>+++ b/print/lilypond-devel/files/patch-make_texinfo-vars.make
>@@ -0,0 +1,11 @@
>+--- 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)
>+ 
>+ ###########

Flags:

m.ne: maintainer-approval+

Actions: View | Diff

Attachments on bug 264465: 234456