;;; Copyright © 2015 David Thompson <davet@gnu.org>
;;; Copyright © 2015, 2016, 2017 Leo Famulari <leo@famulari.name>
;;; Copyright © 2016 Kei Kebreau <kkebreau@posteo.net>
-;;; Copyright © 2016, 2017 Efraim Flashner <efraim@flashner.co.il>
+;;; Copyright © 2016, 2017, 2020 Efraim Flashner <efraim@flashner.co.il>
;;; Copyright © 2016 Troy Sankey <sankeytms@gmail.com>
;;; Copyright © 2016 Stefan Reichoer <stefan@xsteve.at>
;;; Copyright © 2018, 2019 Tobias Geerinckx-Rice <me@tobias.gr>
;;; Copyright © 2020 Marius Bakke <mbakke@fastmail.com
+;;; Copyright © 2020 Brendan Tildesley <mail@brendan.scot>
+;;; Copyright © 2020 Tanguy Le Carrour <tanguy@bioneland.org>
;;;
;;; This file is part of GNU Guix.
;;;
(define-module (gnu packages calendar)
#:use-module (gnu packages)
#:use-module ((guix licenses) #:prefix license:)
+ #:use-module (guix git-download)
#:use-module (guix packages)
#:use-module (guix download)
#:use-module (guix build-system gnu)
#:use-module (gnu packages dav)
#:use-module (gnu packages freedesktop)
#:use-module (gnu packages glib)
+ #:use-module (gnu packages gnome)
#:use-module (gnu packages gtk)
#:use-module (gnu packages icu4c)
#:use-module (gnu packages perl)
#:use-module (gnu packages pkg-config)
#:use-module (gnu packages python)
#:use-module (gnu packages python-xyz)
+ #:use-module (gnu packages qt)
#:use-module (gnu packages sphinx)
#:use-module (gnu packages sqlite)
#:use-module (gnu packages time)
#:use-module (gnu packages xml)
#:use-module (srfi srfi-26))
+(define-public date
+ ;; We make the same choice as the Arch package maintainer by choosing a
+ ;; recent commit to fix some bugs.
+ ;; https://github.com/Alexays/Waybar/issues/565
+ (let ((commit "9a0ee2542848ab8625984fc8cdbfb9b5414c0082"))
+ (package
+ (name "date")
+ (version (string-append "2.4.1-" (string-take commit 8)))
+ (source
+ (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/HowardHinnant/date")
+ (commit "9a0ee2542848ab8625984fc8cdbfb9b5414c0082")))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32 "0yxsn0hj22n61bjywysxqgfv7hj5xvsl6isma95fl8xrimpny083"))
+ (patches
+ ;; Install pkg-config files
+ ;; https://github.com/HowardHinnant/date/pull/538
+ (search-patches "date-output-pkg-config-files.patch"))))
+ (inputs `(("tzdata" ,tzdata)))
+ (build-system cmake-build-system)
+ (arguments
+ '(#:configure-flags (list "-DUSE_SYSTEM_TZ_DB=ON"
+ "-DBUILD_SHARED_LIBS=ON"
+ "-DBUILD_TZ_LIB=ON"
+ "-DENABLE_DATE_TESTING=ON")
+ #:phases
+ (modify-phases %standard-phases
+ (add-after 'unpack 'patch-bin-bash
+ (lambda* (#:key inputs #:allow-other-keys)
+ (substitute* "compile_fail.sh"
+ (("/bin/bash") (which "bash")))
+ #t))
+ (add-after 'unpack 'patch-zoneinfo-path
+ (lambda* (#:key inputs #:allow-other-keys)
+ (substitute* "src/tz.cpp"
+ (("/usr/share/zoneinfo")
+ (string-append (assoc-ref inputs "tzdata") "/share/zoneinfo")))
+ #t))
+ (replace 'check
+ (lambda _
+ ;; Disable test that requires checking timezone that
+ ;; isn't set in the build environment.
+ (substitute* "CTestTestfile.cmake"
+ (("add_test.tz_test_pass_zoned_time_deduction_test.*") "")
+ (("set_tests_properties.tz_test_pass_zoned_time_deduction_test.*") ""))
+ (invoke "make" "testit"))))))
+ (synopsis "Date and time library for C++11 and C++14")
+ (description "Date is a header only C++ library that extends the chrono
+date algorithms library for calendar dates and durations. It also provides
+the <tz.h> library for handling time zones and leap seconds.")
+ (home-page "https://howardhinnant.github.io/date/date.html")
+ (license license:expat))))
+
(define-public libical
(package
(name "libical")
- (version "3.0.7")
+ (version "3.0.8")
(source (origin
(method url-fetch)
(uri (string-append
version "/libical-" version ".tar.gz"))
(sha256
(base32
- "1z33wzaazbd7drl6qbh1750whd78xl2cg0gjnxyya9m83vgndgha"))
- (patches
- ;; Add a patch slated for 3.0.8 which preserves backwards-
- ;; compatibility in the icalattach_new_from_data() function,
- ;; which accidentally changed in 3.0.7 and could break some uses.
- ;; https://gitlab.gnome.org/GNOME/evolution-data-server/issues/185
- ;; http://lists.infradead.org/pipermail/libical-devel/2020-January/000907.html
- (list (origin
- (method url-fetch)
- (uri (string-append
- "https://github.com/libical/libical/commit/"
- "ae394010c889e4c185160da5e81527849f9de350.patch"))
- (file-name "libical-3.0.7-preserve-icalattach-api.patch")
- (sha256
- (base32
- "0v8qcxn8a6sh78grzxd61j9478928dx38l5mf8mkdrbxv47vmvvp")))))))
+ "0vr8s7hn8204lyc4ys5bs3j5qss4lmc9ffly2m1a59avyz5cmzh9"))))
(build-system cmake-build-system)
(arguments
'(#:tests? #f ; test suite appears broken
- #:configure-flags '("-DSHARED_ONLY=true")
+ #:configure-flags '("-DSHARED_ONLY=true"
+ ;; required by evolution-data-server
+ "-DGOBJECT_INTROSPECTION=true"
+ "-DICAL_GLIB_VAPI=true")
#:phases
(modify-phases %standard-phases
(add-before 'configure 'patch-paths
(("\\\"/usr/share/lib/zoneinfo\\\"") "")))
#t)))))
(native-inputs
- `(("gtk-doc" ,gtk-doc)
+ `(("gobject-introspection" ,gobject-introspection)
+ ("gtk-doc" ,gtk-doc)
("perl" ,perl)
- ("pkg-config" ,pkg-config)))
+ ("pkg-config" ,pkg-config)
+ ("vala" ,vala)))
(inputs
`(("glib" ,glib)
("libxml2" ,libxml2)
(uri (pypi-uri "khal" version))
(sha256
(base32
- "1r8bkgjwkh7i8ygvsv51h1cnax50sb183vafg66x5snxf3dgjl6l"))))
+ "1r8bkgjwkh7i8ygvsv51h1cnax50sb183vafg66x5snxf3dgjl6l"))
+ (patches
+ (list
+ (origin
+ (method url-fetch)
+ ;; This patch fixes an issue with python-urwid-2.1.0
+ (uri "https://github.com/pimutils/khal/commit/2c5990c2de2015b251ba23617faa40ee11b8c22a.patch")
+ (file-name "khal-compat-urwid-2.1.0.patch")
+ (sha256
+ (base32
+ "11nd8hkjz68imwqqn0p54zmb53z2pfxmzchaviy7jc1ky5s9l663")))))))
(build-system python-build-system)
(arguments
`(#:phases (modify-phases %standard-phases
"doc/build/man/khal.1"
(string-append (assoc-ref outputs "out") "/share/man/man1"))
#t))
+ (add-before 'check 'fix-tests
+ (lambda _
+ ;; Reported upstream: <https://github.com/pimutils/khal/issues/947>.
+ (substitute* "tests/cli_test.py"
+ (("Invalid value for \"\\[ICS\\]\"") "Invalid value for \\'[ICS]\\'"))
+ #t))
(replace 'check
(lambda* (#:key inputs #:allow-other-keys)
;; The tests require us to choose a timezone.
("python-sphinxcontrib-newsfeed" ,python-sphinxcontrib-newsfeed)
("python-sphinx" ,python-sphinx)))
(inputs
- `(("sqlite" ,sqlite)))
- (propagated-inputs
- `(("python-configobj" ,python-configobj)
+ `(("sqlite" ,sqlite)
+ ("python-configobj" ,python-configobj)
("python-dateutil" ,python-dateutil)
("python-icalendar" ,python-icalendar)
("python-tzlocal" ,python-tzlocal)
and ruby. It includes two illustrative command-line programs, @code{hcal} and
@code{hdate}, and some snippets and scripts written in the binding languages.")
(license license:gpl3+)))
+
+(define-public confclerk
+ (package
+ (name "confclerk")
+ (version "0.6.4")
+ (source
+ (origin
+ (method url-fetch)
+ (uri (string-append "https://www.toastfreeware.priv.at/tarballs/"
+ "confclerk/confclerk-" version ".tar.gz"))
+ (sha256
+ (base32
+ "10rhg44px4nvbkd3p341cmp2ds43jn8r4rvgladda9v8zmsgr2b3"))))
+ (build-system gnu-build-system)
+ (arguments
+ '(#:phases
+ (modify-phases %standard-phases
+ (replace 'configure
+ (lambda* (#:key outputs #:allow-other-keys)
+ (let ((out (assoc-ref outputs "out")))
+ ;; Install directory is currently hard-coded.
+ (substitute* "src/app/app.pro"
+ (("PREFIX = /usr/bin")
+ (string-append "PREFIX =" out "/bin")))
+ (invoke "qmake"))))
+ (add-after 'install 'install-docs
+ (lambda* (#:key outputs #:allow-other-keys)
+ (let* ((out (assoc-ref outputs "out"))
+ (share (string-append out "/share")))
+ (install-file "data/confclerk.1"
+ (string-append share "/man/man1"))
+ (install-file "data/confclerk.desktop"
+ (string-append share "/applications"))
+ (install-file "data/confclerk.svg"
+ (string-append share "/icons/hicolor/scalable/apps"))
+ #t))))
+ #:tests? #f)) ; no tests
+ (native-inputs
+ `(("perl" ,perl))) ; pod2man
+ (inputs
+ `(("qtbase" ,qtbase)))
+ (home-page "https://www.toastfreeware.priv.at/confclerk")
+ (synopsis "Offline conference schedule application")
+ (description
+ "ConfClerk is an application written in Qt, which makes conference schedules
+available offline. It displays the conference schedule from various views,
+support searches on various items (speaker, speech topic, location, etc.) and
+enables you to select favorite events and create your own schedule.
+
+At the moment ConfClerk is able to import schedules in XML format created by
+the PentaBarf conference management system (or frab) used by e.g. FOSDEM,
+DebConf, FrOSCon, Grazer LinuxTage, and the CCC congresses.
+
+ConfClerk is targeted at mobile devices but works on any system running Qt.")
+ (license (list license:gpl2+
+ license:lgpl3)))) ; or cc-by3.0 for src/icons/*