diff options
| author | Maxim Cournoyer <maxim.cournoyer@gmail.com> | 2021-01-13 23:39:52 -0500 |
|---|---|---|
| committer | Maxim Cournoyer <maxim.cournoyer@gmail.com> | 2021-01-13 23:45:53 -0500 |
| commit | 01f0707207741ce2a5d7509a175464799b08aea6 (patch) | |
| tree | 08e8f4da56f26363c3b53e0442a21b286b55e0e5 /gnu/packages/libreoffice.scm | |
| parent | 734bcf13139119daf8685f93b056c3422dbfa264 (diff) | |
| parent | 6985a1acb3e9cc4cad8b6f63d77154842d25c929 (diff) | |
Merge branch 'staging' into 'core-updates'.
Conflicts:
gnu/local.mk
gnu/packages/cmake.scm
gnu/packages/curl.scm
gnu/packages/gl.scm
gnu/packages/glib.scm
gnu/packages/guile.scm
gnu/packages/node.scm
gnu/packages/openldap.scm
gnu/packages/package-management.scm
gnu/packages/python-xyz.scm
gnu/packages/python.scm
gnu/packages/tls.scm
gnu/packages/vpn.scm
gnu/packages/xorg.scm
Diffstat (limited to 'gnu/packages/libreoffice.scm')
| -rw-r--r-- | gnu/packages/libreoffice.scm | 16 |
1 files changed, 12 insertions, 4 deletions
diff --git a/gnu/packages/libreoffice.scm b/gnu/packages/libreoffice.scm index 76836d718b..714072e84b 100644 --- a/gnu/packages/libreoffice.scm +++ b/gnu/packages/libreoffice.scm @@ -713,19 +713,19 @@ text documents, vector drawings, presentations and spreadsheets.") (define-public libmwaw (package (name "libmwaw") - (version "0.3.16") + (version "0.3.17") (source (origin (method url-fetch) (uri (string-append "mirror://sourceforge/libmwaw/libmwaw/libmwaw-" version "/libmwaw-" version ".tar.xz")) (sha256 - (base32 "0s0qvrmxzs8wv4304p7zx9mrasglyaszafqrfmaxwyr9lpdrwqqc")))) + (base32 "074ipcq9w7jbd5x316dzclddgia2ydw098ph9d7p3d713pmkf5cf")))) (build-system gnu-build-system) (native-inputs `(("doxygen" ,doxygen) ("pkg-config" ,pkg-config))) - (propagated-inputs ; in Requires field of .pkg + (propagated-inputs ; in Requires field of .pc file `(("librevenge" ,librevenge))) (inputs `(("boost" ,boost) @@ -1102,7 +1102,8 @@ converting QuarkXPress file format. It supports versions 3.1 to 4.1.") ("flex" ,flex) ("pkg-config" ,pkg-config) ("python" ,python-wrapper) - ("which" ,which))) + ("which" ,which) + ("ziptime" ,ziptime))) (inputs `(("bluez" ,bluez) ("boost" ,boost) @@ -1216,6 +1217,13 @@ converting QuarkXPress file format. It supports versions 3.1 to 4.1.") "/bin/xdg-open"))) #t)) + (add-after 'install 'reset-zip-timestamps + (lambda* (#:key outputs #:allow-other-keys) + (let ((out (assoc-ref outputs "out"))) + (for-each (lambda (file) + (invoke "ziptime" file)) + ;; So many different extensions for .zip files. + (find-files out "\\.(bau|dat|otp|ott|zip)$"))))) (add-after 'install 'bin-and-desktop-install ;; Create 'soffice' and 'libreoffice' symlinks to the executable ;; script. |