From a6bbcc182867476641ac45755a1fe47209f25b76 Mon Sep 17 00:00:00 2001 From: tibequadorian Date: Fri, 15 Apr 2022 18:17:16 +0200 Subject: [PATCH] aisleriot: update to 3.22.22. --- srcpkgs/aisleriot/patches/guile-2.2.patch | 36 ----------------------- srcpkgs/aisleriot/template | 4 +-- 2 files changed, 2 insertions(+), 38 deletions(-) delete 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 deleted file mode 100644 index eb2ce5610b44..000000000000 --- a/srcpkgs/aisleriot/patches/guile-2.2.patch +++ /dev/null @@ -1,36 +0,0 @@ -From 5e9b538db5304ccfed6c0d048a94d8c47dd27e31 Mon Sep 17 00:00:00 2001 -From: Jeremy Bicha -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 d4d178b13c9e..11ad75cf3ad8 100644 --- a/srcpkgs/aisleriot/template +++ b/srcpkgs/aisleriot/template @@ -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 " 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"