From b1d2e0b4e0a22c1cdda376b1c9950f14ca99230e Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Wed, 2 Jan 2019 23:11:36 +0100 Subject: gnu: libcdr: Update to 0.1.5. * gnu/packages/libreoffice.scm (libcdr): Update to 0.1.5. [source](uri): Download over HTTPS. [arguments]: Remove. --- gnu/packages/libreoffice.scm | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) (limited to 'gnu/packages/libreoffice.scm') diff --git a/gnu/packages/libreoffice.scm b/gnu/packages/libreoffice.scm index 7e179ebfb9..631c1722d0 100644 --- a/gnu/packages/libreoffice.scm +++ b/gnu/packages/libreoffice.scm @@ -7,7 +7,7 @@ ;;; Copyright © 2017, 2018 Tobias Geerinckx-Rice ;;; Copyright © 2017 Andy Wingo ;;; Copyright © 2017, 2018 Ludovic Courtès -;;; Copyright © 2017, 2018 Marius Bakke +;;; Copyright © 2017, 2018, 2019 Marius Bakke ;;; Copyright © 2017 Rutger Helling ;;; Copyright © 2018 Ricardo Wurmus ;;; Copyright © 2018 Jonathan Brielmaier @@ -370,14 +370,14 @@ (define-public libabw (define-public libcdr (package (name "libcdr") - (version "0.1.4") + (version "0.1.5") (source (origin (method url-fetch) - (uri (string-append "http://dev-www.libreoffice.org/src/" name "/" + (uri (string-append "https://dev-www.libreoffice.org/src/" name "/" name "-" version ".tar.xz")) (sha256 (base32 - "0vd6likgk51j46llybkx4wq3674xzrhp0k82220pkx9x1aqfi9z7")))) + "0j1skr11jwvafn0l6p37v3i4lqc8wcn489g8f7c4mqwbk94mrkka")))) (build-system gnu-build-system) (native-inputs `(("cppunit" ,cppunit) @@ -390,9 +390,6 @@ (define-public libcdr ("zlib" ,zlib))) (inputs `(("boost" ,boost))) - (arguments - ;; avoid triggering a build failure due to warnings - `(#:configure-flags '("--disable-werror"))) (home-page "https://wiki.documentfoundation.org/DLP/Libraries/libcdr") (synopsis "Library for parsing the CorelDRAW format") (description "Libcdr is a library that parses the file format of -- cgit v1.2.3 From 7c3acfcb69c00bc59b5c8cb51540560042045043 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Wed, 2 Jan 2019 23:12:16 +0100 Subject: gnu: libetonyek: Update to 0.1.9. * gnu/packages/libreoffice.scm (libetonyek): Update to 0.1.9. [arguments]: Remove #:phases. --- gnu/packages/libreoffice.scm | 15 +++------------ 1 file changed, 3 insertions(+), 12 deletions(-) (limited to 'gnu/packages/libreoffice.scm') diff --git a/gnu/packages/libreoffice.scm b/gnu/packages/libreoffice.scm index 631c1722d0..cd300b05f4 100644 --- a/gnu/packages/libreoffice.scm +++ b/gnu/packages/libreoffice.scm @@ -399,26 +399,17 @@ (define-public libcdr (define-public libetonyek (package (name "libetonyek") - (version "0.1.8") + (version "0.1.9") (source (origin (method url-fetch) (uri (string-append "http://dev-www.libreoffice.org/src/" name "/" name "-" version ".tar.xz")) (sha256 (base32 - "0bfq9rwm040xhh7b3v0gsdavwvnrz4hkwnhpggarxk70mr3j7jcx")))) + "0jhsbdimiyijdqriy0zzkjjgc4wi6fjimhdg4mdybrlwg7l7f5p6")))) (build-system gnu-build-system) (arguments - `(#:configure-flags '("--with-mdds=1.4") - #:phases (modify-phases %standard-phases - (add-before 'configure 'support-mdds-1.4 - (lambda _ - ;; This package already works fine with mdds 1.4, but the - ;; configure check is too strict. Taken from upstream. - (substitute* "configure" - (("mdds=1\\.2") "mdds=1.4") - (("mdds=\"1\\.2\"") "mdds=\"1.4\"")) - #t))))) + `(#:configure-flags '("--with-mdds=1.4"))) (native-inputs `(("cppunit" ,cppunit) ("doxygen" ,doxygen) -- cgit v1.2.3 From 9c2094785d5077d82b8f238e4d7aaf372e61fd06 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Wed, 2 Jan 2019 23:22:58 +0100 Subject: gnu: libetonyek: Adjust inputs. * gnu/packages/libreoffice.scm (libetonyek)[native-inputs]: Remove LIBLANGTAG. Move GLM and MDDS to ... [inputs]: ... here. [propagated-inputs]: Add LIBLANGTAG and ZLIB. --- gnu/packages/libreoffice.scm | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) (limited to 'gnu/packages/libreoffice.scm') diff --git a/gnu/packages/libreoffice.scm b/gnu/packages/libreoffice.scm index cd300b05f4..2cbb0ca2e5 100644 --- a/gnu/packages/libreoffice.scm +++ b/gnu/packages/libreoffice.scm @@ -413,16 +413,17 @@ (define-public libetonyek (native-inputs `(("cppunit" ,cppunit) ("doxygen" ,doxygen) - ("glm" ,glm) ("gperf" ,gperf) - ("liblangtag" ,liblangtag) - ("mdds" ,mdds) ("pkg-config" ,pkg-config))) (propagated-inputs ; in Requires or Requires.private field of .pkg - `(("librevenge" ,librevenge) - ("libxml2" ,libxml2))) + `(("liblangtag" ,liblangtag) + ("librevenge" ,librevenge) + ("libxml2" ,libxml2) + ("zlib" ,zlib))) (inputs - `(("boost" ,boost))) + `(("boost" ,boost) + ("glm" ,glm) + ("mdds" ,mdds))) (home-page "https://wiki.documentfoundation.org/DLP/Libraries/libetonyek") (synopsis "Library for parsing the Apple Keynote format") (description "Libetonyek is a library that parses the file format of -- cgit v1.2.3 From 0c4cee13b26a953e54f47da081e1f461b46c1976 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Thu, 3 Jan 2019 00:38:28 +0100 Subject: gnu: libcmis: Update to 0.5.2. * gnu/packages/libreoffice.scm (libcmis): Update to 0.5.2. [source](uri): Use XZ-compressed tarball. [arguments]: Remove #:phases. Don't pass "--disable-werror" in #:configure-flags. --- gnu/packages/libreoffice.scm | 20 ++++---------------- 1 file changed, 4 insertions(+), 16 deletions(-) (limited to 'gnu/packages/libreoffice.scm') diff --git a/gnu/packages/libreoffice.scm b/gnu/packages/libreoffice.scm index 2cbb0ca2e5..ccef2c2e9b 100644 --- a/gnu/packages/libreoffice.scm +++ b/gnu/packages/libreoffice.scm @@ -287,15 +287,15 @@ (define-public libwpg (define-public libcmis (package (name "libcmis") - (version "0.5.1") + (version "0.5.2") (source (origin (method url-fetch) (uri (string-append "https://github.com/tdf/libcmis/releases/download/v" - version "/libcmis-" version ".tar.gz")) + version "/libcmis-" version ".tar.xz")) (sha256 (base32 - "03kvl8ywsv5qrxblf0m6955mmvl5q2zpb6vj51vs7ayvxhidzjva")))) + "18h0a2gsfxvlv03nlcfvw9bzsflq5sin9agq6za103hr0ab8vcfp")))) (build-system gnu-build-system) (native-inputs `(("cppunit" ,cppunit) @@ -313,22 +313,10 @@ (define-public libcmis ;; FIXME: Man pages generation requires docbook-to-man; reenable ;; it once this is available. "--without-man" - ;; avoid triggering configure errors by simple inclusion of - ;; boost headers - "--disable-werror" ;; During configure, the boost headers are found, but linking ;; fails without the following flag. (string-append "--with-boost=" - (assoc-ref %build-inputs "boost"))) - #:phases (modify-phases %standard-phases - (add-before 'build 'fix-boost-include - (lambda _ - ;; This library moved in Boost and the compatibility - ;; redirect is no longer available since version 1.68.0. - (substitute* "src/libcmis/xml-utils.cxx" - (("boost/uuid/sha1.hpp") - "boost/uuid/detail/sha1.hpp")) - #t))))) + (assoc-ref %build-inputs "boost"))))) (home-page "https://github.com/tdf/libcmis") (synopsis "CMIS client library") (description "LibCMIS is a C++ client library for the CMIS interface. It -- cgit v1.2.3