Re: [PR PATCH] [Updated] gcr: update to 3.41.2

[chrysos349 <chrysos349@users.noreply.github.com>]

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

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

https://github.com/chrysos349/void-packages gcr
https://github.com/void-linux/void-packages/pull/49906

gcr: update to 3.41.2
#### Testing the changes
- I tested the changes in this PR: **YES**

#### Local build testing
- I built this PR locally for my native architecture, (x86_64)

p.s. all tests pass locally.  tests below fail in ci

**x86_64, i686**
`22/47 gcr:gck / object                  FAIL            0.16s   killed by signal 11 SIGSEGV`
**x86_64-musl**
`43/47 gcr:gcr-base / gnupg-collection   FAIL            0.17s   killed by signal 6 SIGABRT`


A patch file from https://github.com/void-linux/void-packages/pull/49906.patch is attached

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

From 03425ba0e95d553316dda11f99ae43992ca56d0d Mon Sep 17 00:00:00 2001
From: chrysos349 <chrysostom349@gmail.com>
Date: Fri, 19 Apr 2024 15:24:52 +0300
Subject: [PATCH] gcr: update to 3.41.2

---
 srcpkgs/gcr/patches/Fix-FTBFS-on-x32.patch | 41 ++++++++++++++++++++++
 srcpkgs/gcr/template                       |  5 +--
 2 files changed, 44 insertions(+), 2 deletions(-)
 create mode 100644 srcpkgs/gcr/patches/Fix-FTBFS-on-x32.patch

diff --git a/srcpkgs/gcr/patches/Fix-FTBFS-on-x32.patch b/srcpkgs/gcr/patches/Fix-FTBFS-on-x32.patch
new file mode 100644
index 00000000000000..b8e99600a831db
--- /dev/null
+++ b/srcpkgs/gcr/patches/Fix-FTBFS-on-x32.patch
@@ -0,0 +1,41 @@
+From: Laurent Bigonville <bigon@debian.org>
+Date: Sun, 19 Mar 2023 12:15:50 +0100
+Subject: Fix FTBFS on x32
+
+This patch is inspired from Simon proposal on the upstream bug:
+https://gitlab.gnome.org/GNOME/gcr/-/issues/45
+---
+ egg/egg-asn1x.c | 6 +++---
+ 1 file changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/egg/egg-asn1x.c b/egg/egg-asn1x.c
+index b7d9d11..63e6b16 100644
+--- a/egg/egg-asn1x.c
++++ b/egg/egg-asn1x.c
+@@ -2213,7 +2213,7 @@ anode_read_time (GNode *node,
+ 		return anode_failure (node, "invalid time content");
+ 
+ 	/* In order to work with 32 bit time_t. */
+-	if (sizeof (time_t) <= 4 && when->tm_year >= 138) {
++	if ((sizeof (time_t) <= 4 || sizeof (glong) <= 4) && when->tm_year >= 138) {
+ 		*value = (time_t)2145914603;  /* 2037-12-31 23:23:23 */
+ 
+ 	/* Convert to seconds since epoch */
+@@ -4740,7 +4740,7 @@ egg_asn1x_parse_time_general (const gchar *time, gssize n_time)
+ 		return -1;
+ 
+ 	/* In order to work with 32 bit time_t. */
+-	if (sizeof (time_t) <= 4 && when.tm_year >= 138) {
++	if ((sizeof (time_t) <= 4 || sizeof (glong) <= 4) && when.tm_year >= 138) {
+ 		value = (time_t)2145914603;  /* 2037-12-31 23:23:23 */
+ 
+ 	/* Convert to seconds since epoch */
+@@ -4771,7 +4771,7 @@ egg_asn1x_parse_time_utc (const gchar *time, gssize n_time)
+ 		return -1;
+ 
+ 	/* In order to work with 32 bit time_t. */
+-	if (sizeof (time_t) <= 4 && when.tm_year >= 138) {
++	if ((sizeof (time_t) <= 4 || sizeof (glong) <= 4) && when.tm_year >= 138) {
+ 		value = (time_t)2145914603;  /* 2037-12-31 23:23:23 */
+ 
+ 	/* Convert to seconds since epoch */
diff --git a/srcpkgs/gcr/template b/srcpkgs/gcr/template
index b43ee6b1b423ed..a5cdbffe164dff 100644
--- a/srcpkgs/gcr/template
+++ b/srcpkgs/gcr/template
@@ -1,6 +1,6 @@
 # Template file for 'gcr'
 pkgname=gcr
-version=3.41.1
+version=3.41.2
 revision=1
 build_style=meson
 build_helper="gir"
@@ -14,8 +14,9 @@ short_desc="GNOME crypto package"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="LGPL-2.0-or-later, LGPL-2.1-or-later, GPL-2.0-or-later"
 homepage="https://gitlab.gnome.org/GNOME/gcr"
+changelog="https://gitlab.gnome.org/GNOME/gcr/-/raw/gcr-3-41/NEWS"
 distfiles="${GNOME_SITE}/gcr/${version%.*}/gcr-${version}.tar.xz"
-checksum=bb7128a3c2febbfee9c03b90d77d498d0ceb237b0789802d60185c71c4bea24f
+checksum=bad10f3c553a0e1854649ab59c5b2434da22ca1a54ae6138f1f53961567e1ab7
 make_check_pre="dbus-run-session"
 make_check=no # Gcr:ERROR:../gcr/test-gnupg-collection.c:203:test_load: assertion failed: (record)