Use TZDIR for ZONEINFO_DIR if the variable is set.

[iyzsong]

Hello, this is needed on Guix where there is no /usr and TZDIR is changed when the tzdata package got updated.
Also glibc use it, so it seems reasonable thing to me. eg: https://www.man7.org/linux/man-pages/man3/tzset.3.html

Thanks.

[zhuyaliang]

TZDIR： If this variable is set its value takes precedence over the system configured timezone database directory path.

[raveit65]

How is that testable?
Should i add a new location with a different timezone in clock-applet?

[iyzsong]

For test, I think you can set TZDIR point to a tzdata-2022a version, which will lack Europe/Kiev.

[raveit65]

How did you test that it works?

[iyzsong]

It can be seen in the Clock (top-right panel)'s Locactions settings, the Timezone will be empty when TZDIR set to an invalid value, and works fine when TZDIR point to the right directory (in my case: /gnu/store/19z4zyx0nykgcmj75izhsbi6z0ascq4i-tzdata-2022a/share/zoneinfo).

Thanks.

[raveit65]

The question was more how/where to set old obsolete TZ data, and not to set up a location in our gui.
Any way, i will try to do that for my self when i found time.

[raveit65]

Deleting/re-adding /usr/share/africa and selecting Johannesburg works fine, so i assume this change is working.

[raveit65]

LGTM

[raveit65]

Sorry , i didn't saw that during review.
We got a build warning here.
https://app.travis-ci.com/github/mate-desktop/libmateweather/jobs/606993727#L1649

mateweather-timezone.c:74:11: warning: assignment discards 'const' qualifier from pointer target type [-Wdiscarded-qualifiers]

   74 |     tzdir = g_getenv ("TZDIR");

      |           ^

@iyzsong
Any chance to fix the warning?

[iyzsong]

raveit65 ***@***.***> writes:

@raveit65 commented on this pull request. -------------------------------------------------------------------------------------------------------------------- In libmateweather/mateweather-timezone.c: > @@ -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"); Sorry , i didn't saw that during review. We got a build warning here. https://app.travis-ci.com/github/mate-desktop/libmateweather/jobs/606993727#L1649 Sorry , i didn't saw that during review. We got a build warning here @iyzsong Any chance to fix the warning?

Hello, declare tzdir as 'const char *tzdir' instead of 'char *tzdir' should fix the the warning.

[raveit65]

Hello, declare tzdir as 'const char *tzdir' instead of 'char *tzdir'
should fix the the warning.

@iyzsong
Can you fix your work please and do a pull request?