Skip to content

Commit

Permalink
aisleriot: update to 3.22.21.
Browse files Browse the repository at this point in the history
  • Loading branch information
paper42 committed Mar 25, 2022
1 parent d797c8b commit b3bd7df
Show file tree
Hide file tree
Showing 2 changed files with 38 additions and 2 deletions.
36 changes: 36 additions & 0 deletions 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

4 changes: 2 additions & 2 deletions 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
Expand All @@ -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"

0 comments on commit b3bd7df

Please sign in to comment.