Patchwork gnu: Correct libical zoneinfo search path.

login
register
mail settings
Submitter Kei Yamashita
Date May 10, 2016, 4:08 a.m.
Message ID <20160510000811.42fc6522@openmailbox.org>
Download mbox | patch
Permalink /patch/12171/
State New
Headers show

Comments

Kei Yamashita - May 10, 2016, 4:08 a.m.
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.
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(-)

-- 
2.7.4
Ludovic Courtès - May 10, 2016, 1:36 p.m.
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’.

Patch

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