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

[Kei Yamashita]

On Tue, 10 May 2016 15:36:19 +0200
address@hidden (Ludovic Courtès) wrote:

> Hi,
> 
> Good catch!
> 
> Kei Yamashita <address@hidden> 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"))))

0001-gnu-Correct-libical-zoneinfo-search-path.patch
Description: Text document

pgp_6McAYFwln.pgp
Description: OpenPGP digital signature