Compare commits

...
Sign in to create a new pull request.

1 commit

Author SHA1 Message Date
David King
3dd51e06dd Update to 3.22.21 2022-02-14 15:42:39 +00:00
4 changed files with 6 additions and 44 deletions

1
.gitignore vendored
View file

@ -46,3 +46,4 @@
/aisleriot-3.22.17.tar.bz2
/aisleriot-3.22.19.tar.bz2
/aisleriot-3.22.20.tar.bz2
/aisleriot-3.22.21.tar.bz2

View file

@ -1,40 +0,0 @@
From df91e4fe72f9992dc79375c00a19e6286ee01742 Mon Sep 17 00:00:00 2001
From: Christian Persch <chpe@src.gnome.org>
Date: Fri, 31 Dec 2021 18:49:27 +0100
Subject: [PATCH] games: Compile scheme code with -Ono-letrectify
Fixes the games that include-and-modify the code of other games, e.g.
spider-three-decks.
Fixes: https://gitlab.gnome.org/GNOME/aisleriot/-/issues/919
---
games/meson.build | 6 ++++++
1 file changed, 6 insertions(+)
diff --git a/games/meson.build b/games/meson.build
index afbd003e..e552beab 100644
--- a/games/meson.build
+++ b/games/meson.build
@@ -119,6 +119,11 @@ guile_warnings = [
'-Wunsupported-warning',
'-Wunused-toplevel',
'-Wunused-variable',
+ '-W1',
+]
+
+guile_flags = [
+ '-Ono-letrectify',
]
# FIXME: this should use files('...') (allowed as per docs),
@@ -131,6 +136,7 @@ guile_compile = [
meson.current_build_dir(),
guile,
'compile',
+ guile_flags,
guile_warnings,
'-o',
'@OUTPUT@',
--
GitLab

View file

@ -1,6 +1,6 @@
Name: aisleriot
Epoch: 1
Version: 3.22.20
Version: 3.22.21
Release: 1%{?dist}
Summary: A collection of card games
@ -8,8 +8,6 @@ License: GPLv3+ and LGPLv3+ and GFDL
URL: https://wiki.gnome.org/Apps/Aisleriot
Source0: https://gitlab.gnome.org/GNOME/${name}/-/archive/%{version}/%{name}-%{version}.tar.bz2
Patch0: aisleriot-3.22.19-appdata-namespace.patch
# https://bugzilla.redhat.com/show_bug.cgi?id=2030392
Patch1: aisleriot-3.22.20-guile3.patch
BuildRequires: pkgconfig(gtk+-3.0)
BuildRequires: pkgconfig(guile-3.0)
@ -74,6 +72,9 @@ desktop-file-validate %{buildroot}%{_datadir}/applications/sol.desktop
%{_mandir}/man6/sol.6*
%changelog
* Mon Feb 14 2022 David King <amigadave@amigadave.com> - 1:3.22.21-1
- Update to 3.22.21
* Tue Jan 04 2022 David King <amigadave@amigadave.com> - 1:3.22.20-1
- Update to 3.22.20
- Fix game logic bug with Guile 3 (#2035617)

View file

@ -1 +1 @@
SHA512 (aisleriot-3.22.20.tar.bz2) = 99b64549b0acdf3425bec4081bc3c2e409345b60f0358249b71730744e2639a3e0787ee20b57e57311e3269270f79b0b25a7501c0d4e8962b15053fe74336665
SHA512 (aisleriot-3.22.21.tar.bz2) = 0f454b7770ea24ce6837e43f4bf5068ef89bea062f7c80d621cdeabbc261dae083859d966c6f8809c437f04c221e89ea3bfdaebb4d390e65b4b000feb197d582