[packages/lilypond] - rebuild with guile 3.0, rel 2
baggins
baggins at pld-linux.org
Sat Mar 12 14:53:22 CET 2022
commit b08946d9a7b03c4a413a86aa556df859a5c3983c
Author: Jan Rękorajski <baggins at pld-linux.org>
Date: Sat Mar 12 14:52:54 2022 +0100
- rebuild with guile 3.0, rel 2
guile3.0.patch | 29 +++++++++++++++++++++++++++++
lilypond.spec | 4 +++-
2 files changed, 32 insertions(+), 1 deletion(-)
---
diff --git a/lilypond.spec b/lilypond.spec
index 36c1f56..f41e0d5 100644
--- a/lilypond.spec
+++ b/lilypond.spec
@@ -7,7 +7,7 @@ Summary(pl.UTF-8): Program do składania nut
Name: lilypond
# note: 2.22.x is stable, 2.23.x devel
Version: 2.22.0
-Release: 1
+Release: 2
License: GPL v3+ with font exception
Group: Applications/Sound
Source0: https://lilypond.org/download/sources/v2.22/%{name}-%{version}.tar.gz
@@ -16,6 +16,7 @@ Patch0: %{name}-info.patch
Patch1: %{name}-sh.patch
Patch2: %{name}-aclocal.patch
Patch3: %{name}-mf.patch
+Patch4: guile3.0.patch
URL: http://www.lilypond.org/
BuildRequires: autoconf >= 2.60
BuildRequires: automake
@@ -122,6 +123,7 @@ Obsługa plików LilyPonda dla Vima.
%patch1 -p1
%patch2 -p1
%patch3 -p1
+%patch4 -p1
%build
%{__autoconf}
diff --git a/guile3.0.patch b/guile3.0.patch
new file mode 100644
index 0000000..064f1d6
--- /dev/null
+++ b/guile3.0.patch
@@ -0,0 +1,29 @@
+--- lilypond-2.22.0/aclocal.m4~ 2022-03-12 14:29:08.000000000 +0100
++++ lilypond-2.22.0/aclocal.m4 2022-03-12 14:33:10.973679189 +0100
+@@ -541,7 +541,7 @@
+ AC_MSG_CHECKING([for guile])
+ guile="guile"
+ found="no"
+- for r in $GUILE guile guile2 guile2.2 guile2.0 guile-2.0 \
++ for r in $GUILE guile guile3 guile3.0 guile-3.0 guile2 guile2.2 guile2.0 guile-2.0 \
+ guile1 guile19 guile18 \
+ guile1.9 guile1.8 \
+ guile-1 guile-1.9 guile-1.8; do
+@@ -613,6 +613,9 @@
+ PKG_CHECK_MODULES([GUILE], [$GUILE_FLAVOR],
+ [true], [GUILE_FLAVOR="missing"])
+ else
++ PKG_CHECK_MODULES([GUILE], [guile-3.0 >= 3.0.0],
++ [GUILE_FLAVOR="guile-3.0"], [
++ AC_MSG_RESULT([no])
+ PKG_CHECK_MODULES([GUILE], [guile-1.8 >= 1.8.2],
+ [GUILE_FLAVOR="guile-1.8"], [
+ AC_MSG_RESULT([no])
+@@ -625,6 +628,7 @@
+ GUILE_FLAVOR="missing"])
+ ])
+ ])
++ ])
+ fi
+
+ case "$GUILE_FLAVOR" in
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/lilypond.git/commitdiff/b08946d9a7b03c4a413a86aa556df859a5c3983c
More information about the pld-cvs-commit
mailing list