[PATCH] gnu: Correct libical zoneinfo search path.

[PATCH] gnu: Correct libical zoneinfo search path.

[Kei Yamashita]

[-- Attachment #1.1: Type: text/plain, Size: 118 bytes --]

This is a patch to fix the bug that stopped me from packaging GNOME
Calendar and possibly some other packages, too.

[-- Attachment #1.2: 0001-gnu-Correct-libical-zoneinfo-search-path.patch --]
[-- Type: application/octet-stream, Size: 1952 bytes --]

From 94bad2babd14d7220914ba2aaa43cd373d1fd5a3 Mon Sep 17 00:00:00 2001
From: Kei Yamashita <kei@openmailbox.org>
Date: Mon, 9 May 2016 23:59:53 -0400
Subject: [PATCH] gnu: Correct libical zoneinfo search path.

* gnu/packages/calendar.scm (libical): Modify variable.
---
 gnu/packages/calendar.scm | 18 ++++++++++++++++--
 1 file changed, 16 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/calendar.scm b/gnu/packages/calendar.scm
index 5ef5ec9..0dcfd47 100644
--- a/gnu/packages/calendar.scm
+++ b/gnu/packages/calendar.scm
@@ -1,6 +1,7 @@
 ;;; GNU Guix --- Functional package management for GNU
 ;;; Copyright © 2015 David Thompson <davet@gnu.org>
 ;;; Copyright © 2015, 2016 Leo Famulari <leo@famulari.name>
+;;; Copyright © 2016 Kei Yamashita <kei@openmailbox.org>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -47,11 +48,24 @@
                 "14lmjj63zyx88rf1z71l0v9ms4c2vpdhmixksjjxgywp5p2f7708"))))
     (build-system cmake-build-system)
     (arguments
-     '(#:tests? #f)) ; test suite appears broken
+     '(#:tests? #f ; test suite appears broken
+       #:phases
+       (modify-phases %standard-phases
+         (add-before 'configure 'patch-paths
+           (lambda _
+             (let ((tzdata (assoc-ref %build-inputs "tzdata")))
+               (substitute* "src/libical/icaltz-util.c"
+                 (((string-append "\"/usr/share/zoneinfo\","
+                                  "\"/usr/lib/zoneinfo\","
+                                  "\"/etc/zoneinfo\","
+                                  "\"/usr/share/lib/zoneinfo\""))
+                  (string-append "\"" tzdata "/share/zoneinfo\""))))
+             #t)))))
     (native-inputs
      `(("perl" ,perl)))
     (inputs
-     `(("icu4c" ,icu4c)))
+     `(("icu4c" ,icu4c)
+       ("tzdata" ,tzdata)))
     (home-page "https://libical.github.io/libical/")
     (synopsis "iCalendar protocols and data formats implementation")
     (description
-- 
2.7.4


[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 473 bytes --]

Re: [PATCH] gnu: Correct libical zoneinfo search path.

[Kei Yamashita]

[-- Attachment #1.1: Type: text/plain, Size: 298 bytes --]

On Tue, 10 May 2016 00:06:16 -0400
Kei Yamashita <kei@openmailbox.org> wrote:

> This is a patch to fix the bug that stopped me from packaging GNOME
> Calendar and possibly some other packages, too.

In case you are unable to read the former patch, I've reattached it as
a plain text file.

[-- Attachment #1.2: 0001-gnu-Correct-libical-zoneinfo-search-path.patch --]
[-- Type: text/plain, Size: 2004 bytes --]

From 94bad2babd14d7220914ba2aaa43cd373d1fd5a3 Mon Sep 17 00:00:00 2001
From: Kei Yamashita <kei@openmailbox.org>
Date: Mon, 9 May 2016 23:59:53 -0400
Subject: [PATCH] gnu: Correct libical zoneinfo search path.

* gnu/packages/calendar.scm (libical): Modify variable.
---
 gnu/packages/calendar.scm | 18 ++++++++++++++++--
 1 file changed, 16 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/calendar.scm b/gnu/packages/calendar.scm
index 5ef5ec9..0dcfd47 100644
--- a/gnu/packages/calendar.scm
+++ b/gnu/packages/calendar.scm
@@ -1,6 +1,7 @@
 ;;; GNU Guix --- Functional package management for GNU
 ;;; Copyright © 2015 David Thompson <davet@gnu.org>
 ;;; Copyright © 2015, 2016 Leo Famulari <leo@famulari.name>
+;;; Copyright © 2016 Kei Yamashita <kei@openmailbox.org>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -47,11 +48,24 @@
                 "14lmjj63zyx88rf1z71l0v9ms4c2vpdhmixksjjxgywp5p2f7708"))))
     (build-system cmake-build-system)
     (arguments
-     '(#:tests? #f)) ; test suite appears broken
+     '(#:tests? #f ; test suite appears broken
+       #:phases
+       (modify-phases %standard-phases
+         (add-before 'configure 'patch-paths
+           (lambda _
+             (let ((tzdata (assoc-ref %build-inputs "tzdata")))
+               (substitute* "src/libical/icaltz-util.c"
+                 (((string-append "\"/usr/share/zoneinfo\","
+                                  "\"/usr/lib/zoneinfo\","
+                                  "\"/etc/zoneinfo\","
+                                  "\"/usr/share/lib/zoneinfo\""))
+                  (string-append "\"" tzdata "/share/zoneinfo\""))))
+             #t)))))
     (native-inputs
      `(("perl" ,perl)))
     (inputs
-     `(("icu4c" ,icu4c)))
+     `(("icu4c" ,icu4c)
+       ("tzdata" ,tzdata)))
     (home-page "https://libical.github.io/libical/")
     (synopsis "iCalendar protocols and data formats implementation")
     (description
-- 
2.7.4


[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 473 bytes --]

Re: [PATCH] gnu: Correct libical zoneinfo search path.

[Ludovic Courtès]

Hi,

Good catch!

Kei Yamashita <kei@openmailbox.org> skribis:

> +       (modify-phases %standard-phases
> +         (add-before 'configure 'patch-paths
> +           (lambda _
> +             (let ((tzdata (assoc-ref %build-inputs "tzdata")))
> +               (substitute* "src/libical/icaltz-util.c"
> +                 (((string-append "\"/usr/share/zoneinfo\","
> +                                  "\"/usr/lib/zoneinfo\","
> +                                  "\"/etc/zoneinfo\","
> +                                  "\"/usr/share/lib/zoneinfo\""))
> +                  (string-append "\"" tzdata "/share/zoneinfo\""))))

Could you use a literal string for the pattern?  Maybe something like
“char \*foo =.*$” would be clearer?

Otherwise LGTM, thanks!

Ludo’.

Re: [PATCH] gnu: Correct libical zoneinfo search path.

[Kei Yamashita]

[-- Attachment #1.1: Type: text/plain, Size: 1283 bytes --]

On Tue, 10 May 2016 15:36:19 +0200
ludo@gnu.org (Ludovic Courtès) wrote:

> Hi,
> 
> Good catch!
> 
> Kei Yamashita <kei@openmailbox.org> skribis:
> 
> > +       (modify-phases %standard-phases
> > +         (add-before 'configure 'patch-paths
> > +           (lambda _
> > +             (let ((tzdata (assoc-ref %build-inputs "tzdata")))
> > +               (substitute* "src/libical/icaltz-util.c"
> > +                 (((string-append "\"/usr/share/zoneinfo\","
> > +                                  "\"/usr/lib/zoneinfo\","
> > +                                  "\"/etc/zoneinfo\","
> > +                                  "\"/usr/share/lib/zoneinfo\""))
> > +                  (string-append "\"" tzdata
> > "/share/zoneinfo\""))))  
> 
> Could you use a literal string for the pattern?  Maybe something like
> “char \*foo =.*$” would be clearer?
> 
> Otherwise LGTM, thanks!
> 
> Ludo’.

Is this what you mean?

+             (let ((tzdata (assoc-ref %build-inputs "tzdata")))
+               (substitute* "src/libical/icaltz-util.c"
+                 (("char \\*search_paths \\[\\] =.*$")
+                  (string-append
+                   "char *search_paths [] = "
+                   "{\"" tzdata "/share/zoneinfo\"};\n"))))

[-- Attachment #1.2: 0001-gnu-Correct-libical-zoneinfo-search-path.patch --]
[-- Type: text/plain, Size: 1966 bytes --]

From 3a1e3ef7815fb1ee7e79c00103471c01524de7dd Mon Sep 17 00:00:00 2001
From: Kei Yamashita <kei@openmailbox.org>
Date: Tue, 10 May 2016 16:56:42 -0400
Subject: [PATCH] gnu: Correct libical zoneinfo search path.

* gnu/packages/calendar.scm (libical)[arguments]: substitute FHS-compliant
zoneinfo folders with location of tzdata's zoneinfo folder.
---
 gnu/packages/calendar.scm | 17 +++++++++++++++--
 1 file changed, 15 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/calendar.scm b/gnu/packages/calendar.scm
index 5ef5ec9..5ddd358 100644
--- a/gnu/packages/calendar.scm
+++ b/gnu/packages/calendar.scm
@@ -1,6 +1,7 @@
 ;;; GNU Guix --- Functional package management for GNU
 ;;; Copyright © 2015 David Thompson <davet@gnu.org>
 ;;; Copyright © 2015, 2016 Leo Famulari <leo@famulari.name>
+;;; Copyright © 2016 Kei Yamashita <kei@openmailbox.org>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -47,11 +48,23 @@
                 "14lmjj63zyx88rf1z71l0v9ms4c2vpdhmixksjjxgywp5p2f7708"))))
     (build-system cmake-build-system)
     (arguments
-     '(#:tests? #f)) ; test suite appears broken
+     '(#:tests? #f ; test suite appears broken
+       #:phases
+       (modify-phases %standard-phases
+         (add-before 'configure 'patch-paths
+           (lambda _
+             (let ((tzdata (assoc-ref %build-inputs "tzdata")))
+               (substitute* "src/libical/icaltz-util.c"
+                 (("char \\*search_paths \\[\\] =.*$")
+                  (string-append
+                   "char *search_paths [] = "
+                   "{\"" tzdata "/share/zoneinfo\"};\n"))))
+             #t)))))
     (native-inputs
      `(("perl" ,perl)))
     (inputs
-     `(("icu4c" ,icu4c)))
+     `(("icu4c" ,icu4c)
+       ("tzdata" ,tzdata)))
     (home-page "https://libical.github.io/libical/")
     (synopsis "iCalendar protocols and data formats implementation")
     (description
-- 
2.7.4


[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 473 bytes --]

Re: [PATCH] gnu: Correct libical zoneinfo search path.

[Ludovic Courtès]

Kei Yamashita <kei@openmailbox.org> skribis:

> Is this what you mean?
>
> +             (let ((tzdata (assoc-ref %build-inputs "tzdata")))
> +               (substitute* "src/libical/icaltz-util.c"
> +                 (("char \\*search_paths \\[\\] =.*$")
> +                  (string-append
> +                   "char *search_paths [] = "
> +                   "{\"" tzdata "/share/zoneinfo\"};\n"))))

Exactly.

> From 3a1e3ef7815fb1ee7e79c00103471c01524de7dd Mon Sep 17 00:00:00 2001
> From: Kei Yamashita <kei@openmailbox.org>
> Date: Tue, 10 May 2016 16:56:42 -0400
> Subject: [PATCH] gnu: Correct libical zoneinfo search path.
>
> * gnu/packages/calendar.scm (libical)[arguments]: substitute FHS-compliant
> zoneinfo folders with location of tzdata's zoneinfo folder.

Pushed, thank you!

Ludo’.