manuel/void-packages
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

gcr: update to 3.41.2

Browse Source
This commit is contained in:
chrysos349 2024-04-19 15:24:52 +03:00 committed by oreo639
parent d1cc8a4498
commit 783f8005e6
2 changed files with 46 additions and 3 deletions

41
srcpkgs/gcr/patches/Fix-FTBFS-on-x32.patch Normal file
View File

@ -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 */

8
srcpkgs/gcr/template
View File

@ -1,10 +1,11 @@
# Template file for 'gcr'
pkgname=gcr
version=3.41.1
version=3.41.2
revision=1
build_style=meson
build_helper="gir"
configure_args="$(vopt_bool gir introspection) $(vopt_bool gir gtk_doc)"
configure_args="$(vopt_bool gir introspection) $(vopt_bool gir gtk_doc)
-Dssh_agent=false"
hostmakedepends="gettext glib-devel gnupg gi-docgen gettext pkg-config openssh
libxslt $(vopt_if gir vala)"
makedepends="gtk+3-devel libgcrypt-devel libsecret-devel p11-kit-devel libxslt-devel"
@ -14,8 +15,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)