From 3bf1b585e7d714fd1393c485bc878ecddf38fd2c Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Wed, 9 Mar 2022 12:37:45 +0100
Subject: [PATCH] aisleriot: update to 3.22.21.

---
 srcpkgs/aisleriot/patches/guile-2.2.patch | 36 +++++++++++++++++++++++
 srcpkgs/aisleriot/template                |  4 +--
 2 files changed, 38 insertions(+), 2 deletions(-)
 create mode 100644 srcpkgs/aisleriot/patches/guile-2.2.patch

diff --git a/srcpkgs/aisleriot/patches/guile-2.2.patch b/srcpkgs/aisleriot/patches/guile-2.2.patch
new file mode 100644
index 000000000000..eb2ce5610b44
--- /dev/null
+++ b/srcpkgs/aisleriot/patches/guile-2.2.patch
@@ -0,0 +1,36 @@
+From 5e9b538db5304ccfed6c0d048a94d8c47dd27e31 Mon Sep 17 00:00:00 2001
+From: Jeremy Bicha <jeremy.bicha@canonical.com>
+Date: Thu, 17 Feb 2022 23:51:15 +0100
+Subject: [PATCH] games: Only use -Ono-letrectify with guile 3.0
+
+This fixes a build failure on guile 2.2 where this flag is unknown.
+
+Fixes: https://gitlab.gnome.org/GNOME/aisleriot/-/issues/925
+---
+ games/meson.build | 10 +++++++---
+ 1 file changed, 7 insertions(+), 3 deletions(-)
+
+diff --git a/games/meson.build b/games/meson.build
+index e552beab..56819b4d 100644
+--- a/games/meson.build
++++ b/games/meson.build
+@@ -122,9 +122,13 @@ guile_warnings = [
+   '-W1',
+ ]
+ 
+-guile_flags = [
+-  '-Ono-letrectify',
+-]
++guile_flags = []
++
++if guile_version.version_compare('>= 3.0')
++  guile_flags += [
++    '-Ono-letrectify',
++  ]
++endif
+ 
+ # FIXME: this should use files('...') (allowed as per docs),
+ # but that crashes meson, see https://gitlab.gnome.org/chpe/meson/issues/2
+-- 
+GitLab
+
diff --git a/srcpkgs/aisleriot/template b/srcpkgs/aisleriot/template
index 6655dbb76606..d4d178b13c9e 100644
--- a/srcpkgs/aisleriot/template
+++ b/srcpkgs/aisleriot/template
@@ -1,6 +1,6 @@
 # Template file for 'aisleriot'
 pkgname=aisleriot
-version=3.22.20
+version=3.22.21
 revision=1
 build_style=meson
 # build requires assertions to be turned on -> n_debug=false
@@ -15,5 +15,5 @@ maintainer="Érico Nogueira <ericonr@disroot.org>"
 license="GPL-3.0-or-later"
 homepage="https://wiki.gnome.org/Apps/Aisleriot"
 distfiles="https://gitlab.gnome.org/GNOME/${pkgname}/-/archive/${version}/${pkgname}-${version}.tar.gz"
-checksum=e5f4d00156060a8ecf410ed5d4e485b0f19177c554009c2b0ea6ee6579af549a
+checksum=fd7e7b58e1480dcc9d41b1ae8c9fcb1dd0e6c66eef0a5c1090784dddca9dd655
 replaces="aisleriot-data>=0"