- fix building with guile 3.0, rel 3

diff --git a/denemo.spec b/denemo.spec
index 12fb3ba64db00b28781b545b1e35cb3bc2b8e13a..6e61b1d5be7b24b7fb9b7aa7b33d1629c0c9c5c6 100644 (file)
--- a/denemo.spec
+++ b/denemo.spec
@@ -14,12 +14,13 @@ Summary:    GTK+ frontend for GNU lilypond
 Summary(pl.UTF-8):     Frontend GTK+ na GNU lilypond
 Name:          denemo
 Version:       2.5.0
-Release:       2
+Release:       3
 License:       GPL v3+
 Group:         X11/Applications/Sound
 Source0:       https://ftp.gnu.org/gnu/denemo/%{name}-%{version}.tar.gz
 # Source0-md5: 6382d9f4cde24feab1121963801fe32f
 Patch0:                %{name}-fontsdir.patch
+Patch1:                guile3.0.patch
 URL:           http://www.denemo.org/
 %{?with_alsa:BuildRequires:    alsa-lib-devel >= 1.0.0}
 %{?with_aubio:BuildRequires:   aubio-devel >= 0.4.0}
@@ -76,6 +77,7 @@ ale może być zaadaptowany do innych celów związanych z muzyką.
 %prep
 %setup -q
 %patch0 -p1
+%patch1 -p1
 
 %build
 %{__intltoolize}

diff --git a/guile3.0.patch b/guile3.0.patch
new file mode 100644 (file)
index 0000000..d7acb9c
--- /dev/null
+++ b/guile3.0.patch
@@ -0,0 +1,38 @@
+--- denemo-2.5.0/configure.ac~ 2021-02-10 05:01:18.000000000 +0100
++++ denemo-2.5.0/configure.ac  2022-03-12 13:48:43.205226842 +0100
+@@ -99,8 +99,25 @@
+     fi
+   ], [ useguile_2_2=no ])
+ 
+-if [test "x$useguile_1_8" = "xno"] && [test "x$useguile_2_0" = "xno"] && [test "x$useguile_2_2" = "xno"]; then
+-  PKG_CHECK_MODULES([GUILE_2_2], [guile-2.2],
++AC_ARG_ENABLE(
++  guile_3_0,
++  AS_HELP_STRING([--enable-guile_3_0], [use GUILE_3_0 @<:@default=no@:>@]),
++  [
++    if test "x$enableval" != "xno"; then
++      useguile_3_0=yes
++      PKG_CHECK_MODULES(GUILE_3_0, guile-3.0 >= 3.0)
++      LIBS="$LIBS $GUILE_3_0_LIBS"
++      CFLAGS="$CFLAGS $GUILE_3_0_CFLAGS"
++    fi
++  ], [ useguile_3_0=no ])
++
++if [test "x$useguile_1_8" = "xno"] && [test "x$useguile_2_0" = "xno"] && [test "x$useguile_2_2" = "xno"] && [test "x$useguile_3_0" = "xno"]; then
++  PKG_CHECK_MODULES([GUILE_3_0], [guile-3.0],
++    [ useguile_3_0=yes
++      LIBS="$LIBS $GUILE_3_0_LIBS"
++      CFLAGS="$CFLAGS $GUILE_3_0_CFLAGS"
++    ],
++  [PKG_CHECK_MODULES([GUILE_2_2], [guile-2.2],
+     [ useguile_2_2=yes
+       LIBS="$LIBS $GUILE_2_2_LIBS"
+       CFLAGS="$CFLAGS $GUILE_2_2_CFLAGS"
+@@ -117,6 +134,7 @@
+         ]
+       )]
+     )]
++    )]
+   )
+ fi
+