diff options
| author | Josselin Poiret <dev@jpoiret.xyz> | 2024-03-08 13:06:12 +0100 |
|---|---|---|
| committer | Ludovic Courtès <ludo@gnu.org> | 2024-08-31 10:44:56 +0200 |
| commit | 2008a30d4c2ee021481f5074a643833257c73473 (patch) | |
| tree | c235ff31415646e6c132ff8841a73bbbf88ccadb | |
| parent | 378ee3183a66398323882884c3396e091ecfdebd (diff) | |
| download | guix-2008a30d4c2ee021481f5074a643833257c73473.tar guix-2008a30d4c2ee021481f5074a643833257c73473.tar.gz | |
gnu: date: Fix build with newer tzdata.
* gnu/packages/patches/date-ignore-zonenow.patch: New patch.
* gnu/local.mk (dist_patch_DATA): Register it.
* gnu/packages/calendar.scm (date): Use it.
Change-Id: I29bdfb49237650706abd870f2b9875739d12c6d5
| -rw-r--r-- | gnu/local.mk | 1 | ||||
| -rw-r--r-- | gnu/packages/calendar.scm | 3 | ||||
| -rw-r--r-- | gnu/packages/patches/date-ignore-zonenow.patch | 13 |
3 files changed, 16 insertions, 1 deletions
diff --git a/gnu/local.mk b/gnu/local.mk index 44eda1c633..f5d9061548 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1115,6 +1115,7 @@ dist_patch_DATA = \ %D%/packages/patches/cvs-CVE-2017-12836.patch \ %D%/packages/patches/d-feet-drop-unused-meson-argument.patch \ %D%/packages/patches/dante-non-darwin.patch \ + %D%/packages/patches/date-ignore-zonenow.patch \ %D%/packages/patches/date-output-pkg-config-files.patch \ %D%/packages/patches/datefudge-gettimeofday.patch \ %D%/packages/patches/dbacl-include-locale.h.patch \ diff --git a/gnu/packages/calendar.scm b/gnu/packages/calendar.scm index 390b70382b..05c00df082 100644 --- a/gnu/packages/calendar.scm +++ b/gnu/packages/calendar.scm @@ -85,7 +85,8 @@ (patches ;; Install pkg-config files ;; https://github.com/HowardHinnant/date/pull/538 - (search-patches "date-output-pkg-config-files.patch")))) + (search-patches "date-ignore-zonenow.patch" + "date-output-pkg-config-files.patch")))) (inputs (list tzdata)) (build-system cmake-build-system) (arguments diff --git a/gnu/packages/patches/date-ignore-zonenow.patch b/gnu/packages/patches/date-ignore-zonenow.patch new file mode 100644 index 0000000000..7243eef80b --- /dev/null +++ b/gnu/packages/patches/date-ignore-zonenow.patch @@ -0,0 +1,13 @@ +Ignore the new zonenow.tab file introduced in tzdata 2023d. + +diff -u a/src/tz.cpp b/src/tz.cpp +--- a/src/tz.cpp 2024-03-08 11:14:14.822488065 +0100 ++++ b/src/tz.cpp 2024-03-08 11:47:12.105268426 +0100 +@@ -2667,6 +2667,7 @@ + strcmp(d->d_name, "right") == 0 || + strcmp(d->d_name, "+VERSION") == 0 || + strcmp(d->d_name, "zone.tab") == 0 || ++ strcmp(d->d_name, "zonenow.tab") == 0 || + strcmp(d->d_name, "zone1970.tab") == 0 || + strcmp(d->d_name, "tzdata.zi") == 0 || + strcmp(d->d_name, "leapseconds") == 0 || |