nixo
/
guix-devel
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

gnu: libical: Update to 3.0.2. 

* gnu/packages/calendar.scm (libical)[native-inputs]: Add PKG-CONFIG.
[inputs]: Add GLIB and LIBXML2.  Move ICU4C to ...
[propagated-inputs]: ... here.
[arguments]: Add #:configure-flags to only build shared libs.  Don't access
%build-inputs directly in PATCH-PATHS-PHASE.
[license]: Add MPL2.0.
This commit is contained in:
Marius Bakke 2018-02-20 03:27:11 +01:00
parent 49057c8fc1
commit 09183df209
No known key found for this signature in database
GPG Key ID: A2A06DF2A33A54FA
1 changed files with 19 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
gnu/packages/calendar.scm
View File

@ -35,16 +35,19 @@
#:use-module (gnu packages databases) #:use-module (gnu packages databases)
#:use-module (gnu packages dav) #:use-module (gnu packages dav)
#:use-module (gnu packages freedesktop) #:use-module (gnu packages freedesktop)
#:use-module (gnu packages glib)
#:use-module (gnu packages icu4c) #:use-module (gnu packages icu4c)
#:use-module (gnu packages perl) #:use-module (gnu packages perl)
#:use-module (gnu packages pkg-config)
#:use-module (gnu packages python) #:use-module (gnu packages python)
#:use-module (gnu packages time) #:use-module (gnu packages time)
#:use-module (gnu packages xml)
#:use-module (srfi srfi-26)) #:use-module (srfi srfi-26))
(define-public libical (define-public libical
(package (package
(name "libical") (name "libical")
(version "2.0.0") (version "3.0.2")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (string-append (uri (string-append
@ -52,15 +55,18 @@
version "/libical-" version ".tar.gz")) version "/libical-" version ".tar.gz"))
(sha256 (sha256
(base32 (base32
"1njn2kr0rrjqv5g3hdhpdzrhankyj4fl1bgn76z3g4n1b7vi2k35")))) "03k45dg79bf8lgymn94z2in1c3926v93h76xsap1svln63b3zg0c"))))
(build-system cmake-build-system) (build-system cmake-build-system)
(arguments (arguments
'(#:tests? #f ; test suite appears broken '(#:tests? #f ; test suite appears broken
#:configure-flags '("-DSHARED_ONLY=true")
#:phases #:phases
(modify-phases %standard-phases (modify-phases %standard-phases
(add-before 'configure 'patch-paths (add-before 'configure 'patch-paths
(lambda _ (lambda* (#:key inputs #:allow-other-keys)
(let ((tzdata (assoc-ref %build-inputs "tzdata"))) ;; FIXME: This should be patched to use TZDIR so we can drop
;; the tzdata dependency.
(let ((tzdata (assoc-ref inputs "tzdata")))
(substitute* "src/libical/icaltz-util.c" (substitute* "src/libical/icaltz-util.c"
(("\\\"/usr/share/zoneinfo\\\",") (("\\\"/usr/share/zoneinfo\\\",")
(string-append "\"" tzdata "/share/zoneinfo\"")) (string-append "\"" tzdata "/share/zoneinfo\""))
@ -69,16 +75,22 @@
(("\\\"/usr/share/lib/zoneinfo\\\"") ""))) (("\\\"/usr/share/lib/zoneinfo\\\"") "")))
#t))))) #t)))))
(native-inputs (native-inputs
`(("perl" ,perl))) `(("perl" ,perl)
("pkg-config" ,pkg-config)))
(inputs (inputs
`(("icu4c" ,icu4c) `(("glib" ,glib)
("libxml2" ,libxml2)
("tzdata" ,tzdata))) ("tzdata" ,tzdata)))
(propagated-inputs
;; In Requires.private of libical.pc.
`(("icu4c" ,icu4c)))
(home-page "https://libical.github.io/libical/") (home-page "https://libical.github.io/libical/")
(synopsis "iCalendar protocols and data formats implementation") (synopsis "iCalendar protocols and data formats implementation")
(description (description
"Libical is an implementation of the iCalendar protocols and protocol "Libical is an implementation of the iCalendar protocols and protocol
data units.") data units.")
(license license:lgpl2.1))) ;; Can be used with either license. See COPYING.
(license (list license:lgpl2.1 license:mpl2.0))))
(define-public khal (define-public khal
(package (package