Control: tags 696694 +patch On 2020-09-06, Rob Browning wrote: > Please migrate to guile-3.0 as soon as it's feasible. If we can, I'd > like to have the option to drop guile-2.2 from bullseye, so that we > won't have to maintain two versions throughout that release.
With the following two patches, aisleriot builds successfully with guile-3.0. I haven't tested that it functions correctly. live well, vagrant
From 2d6adb9b3579bf105683898149c4c1e51736bd6e Mon Sep 17 00:00:00 2001
From: Vagrant Cascadian <vagr...@debian.org>
Date: Thu, 17 Mar 2022 00:04:27 +0000
Subject: [PATCH 1/3] configure.ac: Support guile 3.0.
---
configure.ac | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/configure.ac b/configure.ac
index bab2a0b..70b104a 100644
--- a/configure.ac
+++ b/configure.ac
@@ -476,13 +476,13 @@ IT_PROG_INTLTOOL([0.35.0])
# Guile
# *****
-guile_versions_all="2.2 2.0"
+guile_versions_all="3.0 2.2 2.0"
AC_MSG_CHECKING([which guile version to use])
AC_ARG_WITH([guile],
[AS_HELP_STRING([--with-guile=2.2|2.0|auto],[Which guile version to use (default: auto)])],
[case "$with_guile" in
1.8) AC_MSG_ERROR([unsupported guile version $with_guile requested]) ;;
- 2.0|2.2) guile_versions="$withval" ;;
+ 2.0|2.2|3.0) guile_versions="$withval" ;;
auto) guile_versions="$guile_versions_all" ;;
*) AC_MSG_ERROR([unsupported guile version $with_guile requested]) ;;
esac],
--
2.30.2
From cffd680b327fe4b79339214255edb7541129946a Mon Sep 17 00:00:00 2001
From: Vagrant Cascadian <vagr...@debian.org>
Date: Thu, 17 Mar 2022 00:04:45 +0000
Subject: [PATCH 2/3] debian/control: Update guile to 3.0.
---
debian/control | 2 +-
debian/control.in | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/debian/control b/debian/control
index 3806fdc..5832391 100644
--- a/debian/control
+++ b/debian/control
@@ -13,7 +13,7 @@ Build-Depends: debhelper-compat (= 12),
docbook-xml <!nocheck>,
lsb-release,
yelp-tools,
- guile-2.2-dev,
+ guile-3.0-dev,
intltool (>= 0.35.0),
libcairo2-dev (>= 1.10),
libcanberra-gtk3-dev (>= 0.26),
diff --git a/debian/control.in b/debian/control.in
index 2000d00..28b4a31 100644
--- a/debian/control.in
+++ b/debian/control.in
@@ -9,7 +9,7 @@ Build-Depends: debhelper-compat (= 12),
docbook-xml <!nocheck>,
lsb-release,
yelp-tools,
- guile-2.2-dev,
+ guile-3.0-dev,
intltool (>= 0.35.0),
libcairo2-dev (>= 1.10),
libcanberra-gtk3-dev (>= 0.26),
--
2.30.2
signature.asc
Description: PGP signature
