amaharaneko/guix-mirrors
1
1
Fork 0
mirror of https://codeberg.org/guix/guix.git synced 2025-10-02 02:15:12 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

gnu: libmateweather: Update to 1.26.1.

Browse source 
* gnu/packages/mate.scm (libmateweather): Update to 1.26.1.
[source]: Add libmateweather-use-TZDIR.patch.
[inputs]: Replace tzdata with tzdata-for-tests.
[arguments]: Set TZDIR, ignore test failure for 'check-timezones.sh'.
* gnu/packages/patches/libmateweather-use-TZDIR.patch: New file.
* gnu/local.mk (dist_patch_DATA): Register it.

Co-authored-by: 宋文武 <iyzsong@member.fsf.org>
This commit is contained in:
Andy Tai 2023-06-15 10:35:04 -07:00 • committed by 宋文武
parent 1c814ec90b
commit 27d4563e82
No known key found for this signature in database
GPG key ID: D415BF253B515976
3 changed files with 53 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

42
gnu/packages/patches/libmateweather-use-TZDIR.patch Normal file
View file

@ -0,0 +1,42 @@
From 109fef8208188ddf4be76d6899f7d8fde5b8b3be Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=AE=8B=E6=96=87=E6=AD=A6?= <iyzsong@member.fsf.org>
Date: Sat, 22 Jul 2023 14:40:31 +0800
Subject: [PATCH] Use TZDIR for ZONEINFO_DIR if the variable is set.
---
libmateweather/mateweather-timezone.c | 8 +++++---
1 file changed, 5 insertions(+), 3 deletions(-)
diff --git a/libmateweather/mateweather-timezone.c b/libmateweather/mateweather-timezone.c
index 2754728..6c858c4 100644
--- a/libmateweather/mateweather-timezone.c
+++ b/libmateweather/mateweather-timezone.c
@@ -61,7 +61,7 @@ static gboolean
parse_tzdata (const char *tzname, time_t start, time_t end,
int *offset, gboolean *has_dst, int *dst_offset)
{
- char *filename, *contents;
+ char *tzdir, *filename, *contents;
gsize length;
int timecnt, transitions_size, ttinfo_map_size;
int initial_transition = -1, second_transition = -1;
@@ -71,7 +71,10 @@ parse_tzdata (const char *tzname, time_t start, time_t end,
char initial_isdst, second_isdst;
int i;
- filename = g_build_filename (ZONEINFO_DIR, tzname, NULL);
+ tzdir = g_getenv("TZDIR");
+ if (tzdir == NULL)
+ tzdir = ZONEINFO_DIR;
+ filename = g_build_filename (tzdir, tzname, NULL);
if (!g_file_get_contents (filename, &contents, &length, NULL)) {
g_free (filename);
return FALSE;
@@ -403,4 +406,3 @@ mateweather_timezone_get_dst_offset (MateWeatherTimezone *zone)
g_return_val_if_fail (zone->has_dst, 0);
return zone->dst_offset;
}
-
--
2.41.0