[PR PATCH] aisleriot: update to 3.22.24

[PR PATCH] aisleriot: update to 3.22.24

[oreo639]

[-- Attachment #1: Type: text/plain, Size: 1236 bytes --]

There is a new pull request by oreo639 against master on the void-packages repository

https://github.com/oreo639/void-packages aisleriot
https://github.com/void-linux/void-packages/pull/37965

aisleriot: update to 3.22.24
<!-- 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/37965.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-aisleriot-37965.patch --]
[-- Type: text/x-diff, Size: 1496 bytes --]

From 2d234936a3af99540b22dcae530b238d483c82bd Mon Sep 17 00:00:00 2001
From: oreo639 <31916379+Oreo639@users.noreply.github.com>
Date: Sun, 10 Jul 2022 01:21:16 -0700
Subject: [PATCH] aisleriot: update to 3.22.24

---
 srcpkgs/aisleriot/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/aisleriot/template b/srcpkgs/aisleriot/template
index 686e7cdf9bdd..a791f3a41a8e 100644
--- a/srcpkgs/aisleriot/template
+++ b/srcpkgs/aisleriot/template
@@ -1,12 +1,12 @@
 # Template file for 'aisleriot'
 pkgname=aisleriot
-version=3.22.23
+version=3.22.24
 revision=1
 build_style=meson
 # build requires assertions to be turned on -> n_debug=false
 configure_args="-Dtheme_pysol_path=/usr/share/PySolFC/cardsets -Dtheme_pysol=true
  -Dtheme_kde=false -Db_ndebug=false"
-hostmakedepends="desktop-file-utils glib-devel guile intltool itstool pkg-config
+hostmakedepends="desktop-file-utils glib-devel guile gettext itstool pkg-config
  pysolfc-cardsets"
 makedepends="guile-devel libcanberra-devel librsvg-devel"
 depends="guile yelp"
@@ -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=7f2afda7cc698e1d2ecd4d5bdeebf8ff4d5eceb975119ae21437b45e74b36db7
+checksum=ade5a13de6173bb1f07c0badc1c9b64bda3072c4e2651efe8cb4491afebb63b1
 replaces="aisleriot-data>=0"

Re: [PR PATCH] [Updated] aisleriot: update to 3.22.24

[oreo639]

[-- Attachment #1: Type: text/plain, Size: 1241 bytes --]

There is an updated pull request by oreo639 against master on the void-packages repository

https://github.com/oreo639/void-packages aisleriot
https://github.com/void-linux/void-packages/pull/37965

aisleriot: update to 3.22.24
<!-- 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/37965.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-aisleriot-37965.patch --]
[-- Type: text/x-diff, Size: 1497 bytes --]

From ab8f1ff846cb04681e6ae2f442cc0dda35c65d72 Mon Sep 17 00:00:00 2001
From: oreo639 <31916379+Oreo639@users.noreply.github.com>
Date: Sun, 10 Jul 2022 01:21:16 -0700
Subject: [PATCH] aisleriot: update to 3.22.24.

---
 srcpkgs/aisleriot/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/aisleriot/template b/srcpkgs/aisleriot/template
index 686e7cdf9bdd..a791f3a41a8e 100644
--- a/srcpkgs/aisleriot/template
+++ b/srcpkgs/aisleriot/template
@@ -1,12 +1,12 @@
 # Template file for 'aisleriot'
 pkgname=aisleriot
-version=3.22.23
+version=3.22.24
 revision=1
 build_style=meson
 # build requires assertions to be turned on -> n_debug=false
 configure_args="-Dtheme_pysol_path=/usr/share/PySolFC/cardsets -Dtheme_pysol=true
  -Dtheme_kde=false -Db_ndebug=false"
-hostmakedepends="desktop-file-utils glib-devel guile intltool itstool pkg-config
+hostmakedepends="desktop-file-utils glib-devel guile gettext itstool pkg-config
  pysolfc-cardsets"
 makedepends="guile-devel libcanberra-devel librsvg-devel"
 depends="guile yelp"
@@ -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=7f2afda7cc698e1d2ecd4d5bdeebf8ff4d5eceb975119ae21437b45e74b36db7
+checksum=ade5a13de6173bb1f07c0badc1c9b64bda3072c4e2651efe8cb4491afebb63b1
 replaces="aisleriot-data>=0"

Re: [PR PATCH] [Updated] aisleriot: update to 3.22.24.

[oreo639]

[-- Attachment #1: Type: text/plain, Size: 1242 bytes --]

There is an updated pull request by oreo639 against master on the void-packages repository

https://github.com/oreo639/void-packages aisleriot
https://github.com/void-linux/void-packages/pull/37965

aisleriot: update to 3.22.24.
<!-- 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/37965.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-aisleriot-37965.patch --]
[-- Type: text/x-diff, Size: 1099 bytes --]

From f8ebfee87b9fb26c92f5fe6ce546c36ac85899b6 Mon Sep 17 00:00:00 2001
From: oreo639 <31916379+Oreo639@users.noreply.github.com>
Date: Sun, 10 Jul 2022 01:21:16 -0700
Subject: [PATCH] aisleriot: use gettext instead of intltool

Upstream droped the dependency on intltool in favor of just plain gettext.
https://gitlab.gnome.org/GNOME/aisleriot/-/issues/13
---
 srcpkgs/aisleriot/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/aisleriot/template b/srcpkgs/aisleriot/template
index d76029e58b19..a791f3a41a8e 100644
--- a/srcpkgs/aisleriot/template
+++ b/srcpkgs/aisleriot/template
@@ -6,7 +6,7 @@ build_style=meson
 # build requires assertions to be turned on -> n_debug=false
 configure_args="-Dtheme_pysol_path=/usr/share/PySolFC/cardsets -Dtheme_pysol=true
  -Dtheme_kde=false -Db_ndebug=false"
-hostmakedepends="desktop-file-utils glib-devel guile intltool itstool pkg-config
+hostmakedepends="desktop-file-utils glib-devel guile gettext itstool pkg-config
  pysolfc-cardsets"
 makedepends="guile-devel libcanberra-devel librsvg-devel"
 depends="guile yelp"

Re: [PR PATCH] [Closed]: aisleriot: use gettext instead of intltool

[ericonr]

[-- Attachment #1: Type: text/plain, Size: 1098 bytes --]

There's a closed pull request on the void-packages repository

aisleriot: use gettext instead of intltool 
https://github.com/void-linux/void-packages/pull/37965

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
-->

Re: aisleriot: use gettext instead of intltool

[ericonr]

[-- Attachment #1: Type: text/plain, Size: 197 bytes --]

New comment by ericonr on void-packages repository

https://github.com/void-linux/void-packages/pull/37965#issuecomment-1186596718

Comment:
I fixed line wrapping in the commit and pushed, thanks!