aisleriot: update to 3.22.22.

This commit is contained in:
tibequadorian 2022-04-15 18:17:16 +02:00 committed by Echo
parent 83dc506a93
commit 33babef5a9
2 changed files with 2 additions and 38 deletions

View File

@ -1,36 +0,0 @@
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

View File

@ -1,6 +1,6 @@
# Template file for 'aisleriot'
pkgname=aisleriot
version=3.22.21
version=3.22.22
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=fd7e7b58e1480dcc9d41b1ae8c9fcb1dd0e6c66eef0a5c1090784dddca9dd655
checksum=0666b7b35037f796334cda104be5bda65977053f3cab0a3928624da7f236f8ae
replaces="aisleriot-data>=0"