commit e6b6dd0c01152875e21757e62134be853f0d26cf
Author: Jakub Bogusz <[email protected]>
Date: Fri Mar 18 17:02:16 2022 +0100
- updated to 2.22.2
- updated guile3.0 patch
guile3.0.patch | 14 +++++++-------
lilypond.spec | 8 ++++----
2 files changed, 11 insertions(+), 11 deletions(-)
---
diff --git a/lilypond.spec b/lilypond.spec
index f41e0d5..33303dd 100644
--- a/lilypond.spec
+++ b/lilypond.spec
@@ -6,18 +6,18 @@ Summary: Music typesetter
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: 2
+Version: 2.22.2
+Release: 1
License: GPL v3+ with font exception
Group: Applications/Sound
Source0:
https://lilypond.org/download/sources/v2.22/%{name}-%{version}.tar.gz
-# Source0-md5: 4b0d869873b0120bda2e8bd94e1a628a
+# Source0-md5: 677e68e728b24f66be5d20072294f41c
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/
+URL: https://lilypond.org/
BuildRequires: autoconf >= 2.60
BuildRequires: automake
BuildRequires: bison >= 2.4.1
diff --git a/guile3.0.patch b/guile3.0.patch
index 064f1d6..19ad9a0 100644
--- a/guile3.0.patch
+++ b/guile3.0.patch
@@ -1,6 +1,6 @@
---- 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 @@
+--- lilypond-2.22.2/aclocal.m4.orig 2022-03-18 16:13:32.567418463 +0100
++++ lilypond-2.22.2/aclocal.m4 2022-03-18 16:21:08.664947571 +0100
+@@ -505,7 +505,7 @@ AC_DEFUN(STEPMAKE_GUILE, [
AC_MSG_CHECKING([for guile])
guile="guile"
found="no"
@@ -9,7 +9,7 @@
guile1 guile19 guile18 \
guile1.9 guile1.8 \
guile-1 guile-1.9 guile-1.8; do
-@@ -613,6 +613,9 @@
+@@ -577,6 +577,9 @@ AC_DEFUN(STEPMAKE_GUILE_DEVEL, [
PKG_CHECK_MODULES([GUILE], [$GUILE_FLAVOR],
[true], [GUILE_FLAVOR="missing"])
else
@@ -18,9 +18,9 @@
+ 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"])
+ PKG_CHECK_MODULES([GUILE], [guile-2.2 >= 2.2.0],
+@@ -584,6 +587,7 @@ AC_DEFUN(STEPMAKE_GUILE_DEVEL, [
+ GUILE_FLAVOR="missing"
])
])
+ ])
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/lilypond.git/commitdiff/e6b6dd0c01152875e21757e62134be853f0d26cf
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
