* [PR PATCH] aisleriot: update to 3.22.22.
@ 2022-04-15 16:19 tibequadorian
2022-04-18 21:01 ` [PR PATCH] [Merged]: " paper42
0 siblings, 1 reply; 2+ messages in thread
From: tibequadorian @ 2022-04-15 16:19 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1250 bytes --]
There is a new pull request by tibequadorian against master on the void-packages repository
https://github.com/tibequadorian/void-packages aisleriot
https://github.com/void-linux/void-packages/pull/36708
aisleriot: update to 3.22.22.
<!-- 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 add ci skip tag as described in
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/36708.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-aisleriot-36708.patch --]
[-- Type: text/x-diff, Size: 2460 bytes --]
From a6bbcc182867476641ac45755a1fe47209f25b76 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
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 <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 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 <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"
^ permalink raw reply [flat|nested] 2+ messages in thread
* Re: [PR PATCH] [Merged]: aisleriot: update to 3.22.22.
2022-04-15 16:19 [PR PATCH] aisleriot: update to 3.22.22 tibequadorian
@ 2022-04-18 21:01 ` paper42
0 siblings, 0 replies; 2+ messages in thread
From: paper42 @ 2022-04-18 21:01 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1085 bytes --]
There's a merged pull request on the void-packages repository
aisleriot: update to 3.22.22.
https://github.com/void-linux/void-packages/pull/36708
Description:
<!-- 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 add ci skip tag as described in
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
-->
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2022-04-18 21:01 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2022-04-15 16:19 [PR PATCH] aisleriot: update to 3.22.22 tibequadorian
2022-04-18 21:01 ` [PR PATCH] [Merged]: " paper42
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).