From: Jan Rękorajski <baggins@pld-linux.org>
Date: Fri, 11 Mar 2022 17:47:15 +0000 (+0100)
Subject: - enable building with guile 3.0, rel 2
X-Git-Tag: auto/th/aisleriot-3.22.9-2
X-Git-Url: http://git.pld-linux.org/gitweb.cgi?a=commitdiff_plain;h=a789ebe447f6dd9c638b047f16fd78cf5a5a7b16;p=packages%2Faisleriot.git

- enable building with guile 3.0, rel 2
---

diff --git a/aisleriot.spec b/aisleriot.spec
index dd2ee15..ed8bb06 100644
--- a/aisleriot.spec
+++ b/aisleriot.spec
@@ -6,11 +6,12 @@ Summary:	A collection of card games
 Summary(pl.UTF-8):	Kolekcja gier karcianych
 Name:		aisleriot
 Version:	3.22.9
-Release:	1
+Release:	2
 License:	GPL v3+ and LGPL v3+ and GFDL
 Group:		X11/Applications/Games
 Source0:	http://ftp.gnome.org/pub/GNOME/sources/aisleriot/3.22/%{name}-%{version}.tar.xz
 # Source0-md5:	121678a799d027640ddfb267384440b5
+Patch0:		guile3.0.patch
 URL:		https://wiki.gnome.org/Apps/Aisleriot
 BuildRequires:	GConf2-devel >= 2.0
 %{?with_qt:BuildRequires:	Qt5Svg-devel >= 5.0.0}
@@ -76,6 +77,7 @@ Obsługa Aisleriota dla Valgrinda.
 
 %prep
 %setup -q
+%patch0 -p1
 
 %build
 %{__intltoolize}
@@ -89,7 +91,7 @@ bash %configure \
 	--with-card-theme-formats=svg,fixed,pysol%{?with_qt:,kde,native} \
 	--with-kde-card-theme-path=%{_datadir}/apps/carddecks \
 	--with-pysol-card-theme-path=%{_datadir}/pysol \
-	--with-guile="2.2"
+	--with-guile="3.0"
 %{__make} -j1
 
 %install
diff --git a/guile3.0.patch b/guile3.0.patch
new file mode 100644
index 0000000..002eefc
--- /dev/null
+++ b/guile3.0.patch
@@ -0,0 +1,19 @@
+--- aisleriot-3.22.9/configure.ac.orig	2019-09-09 21:51:48.000000000 +0200
++++ aisleriot-3.22.9/configure.ac	2022-03-11 18:42:44.387093335 +0100
+@@ -476,13 +476,13 @@
+ # 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)])],
++  [AS_HELP_STRING([--with-guile=3.0|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],