mirror of
https://git.in.rschanz.org/ryan77627/guix.git
synced 2024-12-24 21:38:07 -05:00
gnu: libical: Update to 3.0.14, enable tests and use gexps.
* gnu/packages/calendar.scm (libical): Update to 3.0.14. [tests?]: Delete argument. [parallel-build?]: Likewise. [configure-flags]: Use gexps. [phases]: Use gexps. Delete trailing #t. {patch-docbook-reference}: Use this-package-native-input. {patch-paths}: Use search-input-directory. Set TZDIR for tests.
This commit is contained in:
parent
78696a6d31
commit
d0ab003987
1 changed files with 28 additions and 26 deletions
|
@ -11,6 +11,7 @@
|
|||
;;; Copyright © 2020 Tanguy Le Carrour <tanguy@bioneland.org>
|
||||
;;; Copyright © 2020 Peng Mei Yu <pengmeiyu@riseup.net>
|
||||
;;; Copyright © 2021 Wamm K. D. <jaft.r@outlook.com>
|
||||
;;; Copyright © 2022 Maxim Cournoyer <maxim.cournoyer@gmail.com>
|
||||
;;;
|
||||
;;; This file is part of GNU Guix.
|
||||
;;;
|
||||
|
@ -29,6 +30,7 @@
|
|||
|
||||
(define-module (gnu packages calendar)
|
||||
#:use-module (gnu packages)
|
||||
#:use-module (guix gexp)
|
||||
#:use-module ((guix licenses) #:prefix license:)
|
||||
#:use-module (guix git-download)
|
||||
#:use-module (guix packages)
|
||||
|
@ -130,32 +132,32 @@ (define-public libical
|
|||
"13ycghsi4iv8mnm0xv97bs0x6qvfhdxkw20n3yhcc7bg6n0bg122"))))
|
||||
(build-system cmake-build-system)
|
||||
(arguments
|
||||
'(#:tests? #f ; test suite appears broken
|
||||
#:parallel-build? #f ;may cause GIR generation failure
|
||||
#:configure-flags '("-DSHARED_ONLY=true"
|
||||
(list
|
||||
#:configure-flags #~(list "-DSHARED_ONLY=true"
|
||||
;; required by evolution-data-server
|
||||
"-DGOBJECT_INTROSPECTION=true"
|
||||
"-DICAL_GLIB_VAPI=true")
|
||||
#:phases
|
||||
(modify-phases %standard-phases
|
||||
#~(modify-phases %standard-phases
|
||||
(add-after 'unpack 'patch-docbook-reference
|
||||
(lambda* (#:key inputs #:allow-other-keys)
|
||||
(lambda _
|
||||
(substitute* "doc/reference/libical-glib/libical-glib-docs.sgml.in"
|
||||
(("http://www.oasis-open.org/docbook/xml/4.3/")
|
||||
(string-append (assoc-ref inputs "docbook-xml")
|
||||
(string-append #$(this-package-native-input "docbook-xml")
|
||||
"/xml/dtd/docbook/")))))
|
||||
(add-before 'configure 'patch-paths
|
||||
(lambda* (#:key inputs #:allow-other-keys)
|
||||
;; TODO: libical 3.1.0 supports using TZDIR instead of a hard-coded
|
||||
;; zoneinfo database. When that is released we can drop
|
||||
;; the tzdata dependency.
|
||||
(let ((tzdata (assoc-ref inputs "tzdata")))
|
||||
(define zoneinfo (search-input-directory inputs "share/zoneinfo"))
|
||||
;; The timezones test fails if TZDIR is not set, for some
|
||||
;; reason. If only TZDIR is set, tests checking the timezone
|
||||
;; fallback fail, so also patch the source.
|
||||
(setenv "TZDIR" zoneinfo) ;for tests
|
||||
(substitute* "src/libical/icaltz-util.c"
|
||||
(("\\\"/usr/share/zoneinfo\\\",")
|
||||
(string-append "\"" tzdata "/share/zoneinfo\""))
|
||||
(format #f "~s" zoneinfo))
|
||||
(("\\\"/usr/lib/zoneinfo\\\",") "")
|
||||
(("\\\"/etc/zoneinfo\\\",") "")
|
||||
(("\\\"/usr/share/lib/zoneinfo\\\"") ""))))))))
|
||||
(("\\\"/usr/share/lib/zoneinfo\\\"") "")))))))
|
||||
(native-inputs
|
||||
(list docbook-xml-4.3
|
||||
gobject-introspection
|
||||
|
|
Loading…
Reference in a new issue