From: paper42 <paper42@users.noreply.github.com>
To: ml@inbox.vuxu.org
Subject: [PR PATCH] aisleriot: update to 3.22.21.
Date: Fri, 25 Mar 2022 22:34:27 +0100 [thread overview]
Message-ID: <gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-36348@inbox.vuxu.org> (raw)
[-- Attachment #1: Type: text/plain, Size: 1224 bytes --]
There is a new pull request by paper42 against master on the void-packages repository
https://github.com/paper42/void-packages aisleriot-3.22.21
https://github.com/void-linux/void-packages/pull/36348
aisleriot: update to 3.22.21.
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Testing the changes
- I tested the changes in this PR: **YES**
<!--
#### New package
- This new package conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements): **YES**|**NO**
-->
<!-- Note: If the build is likely to take more than 2 hours, please [skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration)
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
- aarch64-musl
- armv7l
- armv6l-musl
-->
A patch file from https://github.com/void-linux/void-packages/pull/36348.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-aisleriot-3.22.21-36348.patch --]
[-- Type: text/x-diff, Size: 2450 bytes --]
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"
next reply other threads:[~2022-03-25 21:34 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-03-25 21:34 paper42 [this message]
2022-03-25 21:45 ` [PR PATCH] [Merged]: " paper42
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-36348@inbox.vuxu.org \
--to=paper42@users.noreply.github.com \
--cc=ml@inbox.vuxu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).