From 1c7c2506a8eb1efd1ea49e85c1b024e1a1b7edc9 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sun, 8 Oct 2017 17:09:49 +0200 Subject: gnu: librevenge: Update to 0.0.4. * gnu/packages/libreoffice.scm (librevenge): Update to 0.0.4. --- gnu/packages/libreoffice.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages/libreoffice.scm') diff --git a/gnu/packages/libreoffice.scm b/gnu/packages/libreoffice.scm index 77c9ae108f..f1526303a5 100644 --- a/gnu/packages/libreoffice.scm +++ b/gnu/packages/libreoffice.scm @@ -129,14 +129,14 @@ CSV, CSS and XML.") (define-public librevenge (package (name "librevenge") - (version "0.0.2") + (version "0.0.4") (source (origin (method url-fetch) (uri (string-append "mirror://sourceforge/libwpd/" name "/" name "-" version "/" name "-" version ".tar.xz")) (sha256 (base32 - "03ygxyb0vfjv8raif5q62sl33b54wkr5rzgadb8slijm6k281wpn")))) + "1cj76cz4mqcy2mgv9l5xlc95bypyk8zbq0ls9cswqrs2y0lhfgwk")))) (build-system gnu-build-system) (native-inputs `(("cppunit" ,cppunit) -- cgit v1.2.3 From 3f6c5b831acbed1dbc84374820b373356c39155f Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sun, 8 Oct 2017 17:16:34 +0200 Subject: gnu: libwpd: Update to 0.10.2. * gnu/packages/libreoffice.scm (libwpd): Update to 0.10.2. --- gnu/packages/libreoffice.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages/libreoffice.scm') diff --git a/gnu/packages/libreoffice.scm b/gnu/packages/libreoffice.scm index f1526303a5..64b8e13d61 100644 --- a/gnu/packages/libreoffice.scm +++ b/gnu/packages/libreoffice.scm @@ -161,14 +161,14 @@ spreadsheets and presentations.") (define-public libwpd (package (name "libwpd") - (version "0.10.0") + (version "0.10.2") (source (origin (method url-fetch) (uri (string-append "mirror://sourceforge/" name "/" name "/" name "-" version "/" name "-" version ".tar.xz")) (sha256 (base32 - "0b6krzr6kxzm89g6bapn805kdayq70hn16n5b5wfs2lwrf0ag2wx")))) + "0436gnidx45a9vx114hhh216jrh57mqb9zyssyjfadagmyz6hgrj")))) (build-system gnu-build-system) (native-inputs `(("doxygen" ,doxygen) -- cgit v1.2.3 From feef3b2a08ce7769e29bc27421dbc19724d9ec31 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sun, 8 Oct 2017 17:16:58 +0200 Subject: gnu: libwpg: Update to 0.3.2. * gnu/packages/libreoffice.scm (libwpg): Update to 0.3.2. --- gnu/packages/libreoffice.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages/libreoffice.scm') diff --git a/gnu/packages/libreoffice.scm b/gnu/packages/libreoffice.scm index 64b8e13d61..8344ec97ce 100644 --- a/gnu/packages/libreoffice.scm +++ b/gnu/packages/libreoffice.scm @@ -223,14 +223,14 @@ ZVR (simple compressed text format).") (define-public libwpg (package (name "libwpg") - (version "0.3.0") + (version "0.3.2") (source (origin (method url-fetch) (uri (string-append "mirror://sourceforge/" name "/" name "/" name "-" version "/" name "-" version ".tar.xz")) (sha256 (base32 - "097jx8a638fwwfrzf6v29r1yhc34rq9526py7wf0ck2z4fcr2w3g")))) + "0cwc5zkp210c661l0bvk6q21jg9ak5g8gmy578w5fgfnjymz3yjp")))) (build-system gnu-build-system) (native-inputs `(("doxygen" ,doxygen) -- cgit v1.2.3 From d35db297e77bd3e8db3dfe413659944c6388ad35 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sun, 8 Oct 2017 17:21:21 +0200 Subject: gnu: libcdr: Update to 0.1.4. * gnu/packages/libreoffice.scm (libcdr): Update to 0.1.4. [native-inputs]: Add CPPUNIT. --- gnu/packages/libreoffice.scm | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'gnu/packages/libreoffice.scm') diff --git a/gnu/packages/libreoffice.scm b/gnu/packages/libreoffice.scm index 8344ec97ce..8ff4d14006 100644 --- a/gnu/packages/libreoffice.scm +++ b/gnu/packages/libreoffice.scm @@ -323,17 +323,18 @@ AbiWord documents.") (define-public libcdr (package (name "libcdr") - (version "0.1.1") + (version "0.1.4") (source (origin (method url-fetch) (uri (string-append "http://dev-www.libreoffice.org/src/" name "/" name "-" version ".tar.xz")) (sha256 (base32 - "07yzb1yr5kzv0binzj5swz3zzay2gw3xb0fbkc2zwdssgrkf19nh")))) + "0vd6likgk51j46llybkx4wq3674xzrhp0k82220pkx9x1aqfi9z7")))) (build-system gnu-build-system) (native-inputs - `(("doxygen" ,doxygen) + `(("cppunit" ,cppunit) + ("doxygen" ,doxygen) ("pkg-config" ,pkg-config))) (propagated-inputs ; in Requires or Requires.private field of .pkg `(("icu4c" ,icu4c) -- cgit v1.2.3 From 603231c1c32d3dda52c564a02559fabc558486b4 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sun, 8 Oct 2017 17:25:47 +0200 Subject: gnu: liblangtag: Update to 0.6.2. * gnu/packages/libreoffice.scm (liblangtag): Update to 0.6.2. --- gnu/packages/libreoffice.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages/libreoffice.scm') diff --git a/gnu/packages/libreoffice.scm b/gnu/packages/libreoffice.scm index 8ff4d14006..0eb4ffb493 100644 --- a/gnu/packages/libreoffice.scm +++ b/gnu/packages/libreoffice.scm @@ -394,7 +394,7 @@ Apple Keynote documents. It currently supports Keynote versions 2 to 5.") (define-public liblangtag (package (name "liblangtag") - (version "0.5.8") + (version "0.6.2") (source (origin (method url-fetch) @@ -402,7 +402,7 @@ Apple Keynote documents. It currently supports Keynote versions 2 to 5.") name "-" version ".tar.bz2")) (sha256 (base32 - "1akf0d7yp29pv3j2pw2riii4n5kyjr9szc0y77khnx9zzr5zdqh8")))) + "0bnm4hllr8cfrybm8rw7b8n0nlhzhnv73bkg1bxk452g6a82f96n")))) (build-system gnu-build-system) (native-inputs `(("libtool" ,libtool) -- cgit v1.2.3 From c6234e8ac881b7d60441811fe54866b8fe4cad4a Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sun, 8 Oct 2017 18:58:03 +0200 Subject: gnu: libetonyek: Fix FTBFS with later liblangtag. * gnu/packages/libreoffice.scm (libetonyek)[source]: Add upstream patch. --- gnu/packages/libreoffice.scm | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) (limited to 'gnu/packages/libreoffice.scm') diff --git a/gnu/packages/libreoffice.scm b/gnu/packages/libreoffice.scm index 0eb4ffb493..5c44fb31e1 100644 --- a/gnu/packages/libreoffice.scm +++ b/gnu/packages/libreoffice.scm @@ -7,6 +7,7 @@ ;;; Copyright © 2017 Tobias Geerinckx-Rice ;;; Copyright © 2017 Andy Wingo ;;; Copyright © 2017 Ludovic Courtès +;;; Copyright © 2017 Marius Bakke ;;; ;;; This file is part of GNU Guix. ;;; @@ -363,7 +364,19 @@ CorelDRAW documents of all versions.") name "-" version ".tar.xz")) (sha256 (base32 "0y60vi1plyq69fqbcjnc0v8mvcjqjsl1ry6rmb3bq3q7j8a2fm6z")) - (patches (search-patches "libetonyek-build-with-mdds-1.2.patch")))) + (patches + (cons + (origin + (method url-fetch) + ;; Drop incorrect test that fails with latest liblangtag. + (uri (string-append "https://cgit.freedesktop.org/libreoffice" + "/libetonyek/patch/?id=" + "1a20d8ece2ea3e8aa1d319cd88e8a6aa637982f2")) + (file-name "libetonyek-build-with-liblangtag-0.6.patch") + (sha256 + (base32 + "0zdyykg3cmq226m54yjhg1fj5200c371h2qgjfna62dxa1jd6m97"))) + (search-patches "libetonyek-build-with-mdds-1.2.patch"))))) (build-system gnu-build-system) (arguments `(#:configure-flags '("--with-mdds=1.2") -- cgit v1.2.3 From ae443ec1fa4cb992b297ee4a4e240c263c026856 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sun, 8 Oct 2017 17:27:12 +0200 Subject: gnu: libexttextcat: Update to 3.4.5. * gnu/packages/libreoffice.scm (libexttextcat): Update to 3.4.5. --- gnu/packages/libreoffice.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages/libreoffice.scm') diff --git a/gnu/packages/libreoffice.scm b/gnu/packages/libreoffice.scm index 5c44fb31e1..34cd894922 100644 --- a/gnu/packages/libreoffice.scm +++ b/gnu/packages/libreoffice.scm @@ -434,14 +434,14 @@ standard 21.0.2.") (define-public libexttextcat (package (name "libexttextcat") - (version "3.4.4") + (version "3.4.5") (source (origin (method url-fetch) (uri (string-append "http://dev-www.libreoffice.org/src/" name "/" name "-" version ".tar.xz")) (sha256 (base32 - "14v2hkygnmf1zgahfm1fha47cr67iikrz2ymiqi28d2jydn0hk7j")))) + "1j6sjwkyhqvsgyw938bxxfwkzzi1mahk66g5342lv6j89jfvrz8k")))) (build-system gnu-build-system) (home-page "http://www.freedesktop.org/wiki/Software/libexttextcat/") (synopsis "Text Categorization library") -- cgit v1.2.3 From e9d8b8872b77b0f17302f55abb39a58127280c48 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sun, 8 Oct 2017 17:28:19 +0200 Subject: gnu: libfreehand: Update to 0.1.2. * gnu/packages/libreoffice.scm (libfreehand): Update to 0.1.2. [native-inputs]: Add CPPUNIT. [inputs]: Add ICU4C and LCMS. New field. --- gnu/packages/libreoffice.scm | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) (limited to 'gnu/packages/libreoffice.scm') diff --git a/gnu/packages/libreoffice.scm b/gnu/packages/libreoffice.scm index 34cd894922..de59de375d 100644 --- a/gnu/packages/libreoffice.scm +++ b/gnu/packages/libreoffice.scm @@ -453,20 +453,24 @@ library primarily intended for language guessing.") (define-public libfreehand (package (name "libfreehand") - (version "0.1.0") + (version "0.1.2") (source (origin (method url-fetch) (uri (string-append "http://dev-www.libreoffice.org/src/" name "/" name "-" version ".tar.xz")) (sha256 (base32 - "01j7mxi4lmf72w1mv2r098p8l0csdd94w2gq0ncp93djn34al6ai")))) + "1b1lvqh68rwij1yvmxy02hsmh7i74ma5767mk8mg5nx6chajshhf")))) (build-system gnu-build-system) (native-inputs - `(("doxygen" ,doxygen) + `(("cppunit" ,cppunit) + ("doxygen" ,doxygen) ("gperf" ,gperf) ("perl" ,perl) ("pkg-config" ,pkg-config))) + (inputs + `(("icu4c" ,icu4c) + ("lcms" ,lcms))) (propagated-inputs ; in Requires or Requires.private field of .pkg `(("librevenge" ,librevenge) ("zlib" ,zlib))) -- cgit v1.2.3 From 2036709b7f7bcf522a392600361923d1ff27bdc6 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sun, 8 Oct 2017 17:34:56 +0200 Subject: gnu: libpagemaker: Update to 0.0.3. * gnu/packages/libreoffice.scm (libpagemaker): Update to 0.0.3. [arguments]: Remove. --- gnu/packages/libreoffice.scm | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) (limited to 'gnu/packages/libreoffice.scm') diff --git a/gnu/packages/libreoffice.scm b/gnu/packages/libreoffice.scm index de59de375d..535772dfff 100644 --- a/gnu/packages/libreoffice.scm +++ b/gnu/packages/libreoffice.scm @@ -510,14 +510,14 @@ Microsoft Publisher documents of all versions.") (define-public libpagemaker (package (name "libpagemaker") - (version "0.0.2") + (version "0.0.3") (source (origin (method url-fetch) (uri (string-append "http://dev-www.libreoffice.org/src/" name "/" name "-" version ".tar.xz")) (sha256 (base32 - "05zgj5ngg9z4b7dnrfs59nm0macm99lzyxv4mg53jcvp0mkgigfd")))) + "1minj0q14d44qfas81a8lkpgj288h5xlkjp084sfx17xv9axr5nq")))) (build-system gnu-build-system) (native-inputs `(("doxygen" ,doxygen) @@ -527,9 +527,6 @@ Microsoft Publisher documents of all versions.") (inputs `(("boost" ,boost) ("zlib" ,zlib))) - (arguments - ;; avoid triggering a build failure due to warnings - `(#:configure-flags '("--disable-werror"))) (home-page "https://wiki.documentfoundation.org/DLP/Libraries/libpagemaker") (synopsis "Library for parsing the PageMaker format") (description "Libpagemaker is a library that parses the file format of -- cgit v1.2.3 From 5124e6377578c0346efa7d839b5c4e5cfc1d6d72 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sun, 8 Oct 2017 17:53:36 +0200 Subject: gnu: libvisio: Update to 0.1.5. * gnu/packages/patches/libvisio-fix-tests.patch: New file. * gnu/local.mk (dist_patch_DATA): Add it. * gnu/packages/libreoffice.scm (libvisio): Update to 0.1.5. [source]: Add 'libvisio-fix-tests.patch'. [arguments]: Remove. --- gnu/local.mk | 1 + gnu/packages/libreoffice.scm | 10 +++----- gnu/packages/patches/libvisio-fix-tests.patch | 35 +++++++++++++++++++++++++++ 3 files changed, 39 insertions(+), 7 deletions(-) create mode 100644 gnu/packages/patches/libvisio-fix-tests.patch (limited to 'gnu/packages/libreoffice.scm') diff --git a/gnu/local.mk b/gnu/local.mk index a866c9084a..566791ede9 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -816,6 +816,7 @@ dist_patch_DATA = \ %D%/packages/patches/libtool-skip-tests2.patch \ %D%/packages/patches/libunistring-gnulib-multi-core.patch \ %D%/packages/patches/libusb-0.1-disable-tests.patch \ + %D%/packages/patches/libvisio-fix-tests.patch \ %D%/packages/patches/libvpx-CVE-2016-2818.patch \ %D%/packages/patches/libxcb-python-3.5-compat.patch \ %D%/packages/patches/libxml2-CVE-2016-4658.patch \ diff --git a/gnu/packages/libreoffice.scm b/gnu/packages/libreoffice.scm index 535772dfff..9c392c536b 100644 --- a/gnu/packages/libreoffice.scm +++ b/gnu/packages/libreoffice.scm @@ -537,15 +537,15 @@ created by PageMaker version 6.x and 7.") (define-public libvisio (package (name "libvisio") - ;; FIXME: The newer version 0.1.1 fails its tests. - (version "0.1.0") + (version "0.1.5") (source (origin (method url-fetch) (uri (string-append "http://dev-www.libreoffice.org/src/" name "/" name "-" version ".tar.xz")) + (patches (search-patches "libvisio-fix-tests.patch")) (sha256 (base32 - "0vvd2wyp4rw6s9xnj1dc9vgdpfvm45gnb5b9hhzif0fdnx4iskqf")))) + "132szijxm95ibzq5qqaylifbf6wa81g08jxggnwv22v60dwhc2j3")))) (build-system gnu-build-system) (native-inputs `(("cppunit" ,cppunit) @@ -559,10 +559,6 @@ created by PageMaker version 6.x and 7.") ("libxml2" ,libxml2))) (inputs `(("boost" ,boost))) - ;; FIXME: Not needed any more for newer version 0.1.1. - (arguments - ;; avoid triggering a build failure due to warnings - `(#:configure-flags '("--disable-werror"))) (home-page "https://wiki.documentfoundation.org/DLP/Libraries/libvisio") (synopsis "Library for parsing the Microsoft Visio format") (description "Libvisio is a library that parses the file format of diff --git a/gnu/packages/patches/libvisio-fix-tests.patch b/gnu/packages/patches/libvisio-fix-tests.patch new file mode 100644 index 0000000000..335f7c11a8 --- /dev/null +++ b/gnu/packages/patches/libvisio-fix-tests.patch @@ -0,0 +1,35 @@ +Tests assume a CET timezone, but do not respect the "TZ" variable. + +This patch is a "squashed" version of these upstream commits: + + + +diff --git a/src/test/Makefile.am b/src/test/Makefile.am +index 59d3419..23049b5 100644 +--- a/src/test/Makefile.am ++++ b/src/test/Makefile.am +@@ -29,4 +29,7 @@ EXTRA_DIST = \ + data/dwg.vsdx \ + $(test_SOURCES) + ++# ImportTest::testVsdMetadataTitleUtf8 checks formatted date string ++AM_TESTS_ENVIRONMENT = TZ=UTC; export TZ; ++ + TESTS = test +diff --git a/src/test/importtest.cpp b/src/test/importtest.cpp +index e05b3c1..32fb185 100644 +--- a/src/test/importtest.cpp ++++ b/src/test/importtest.cpp +@@ -242,8 +242,8 @@ void ImportTest::testVsdMetadataTitleUtf8() + // Test the case when the string is UTF-8 encoded already in the file. + assertXPath(m_doc, "/document/setDocumentMetaData", "title", "mytitle\xC3\xA9\xC3\xA1\xC5\x91\xC5\xB1"); + // Test and . +- assertXPath(m_doc, "/document/setDocumentMetaData", "creation-date", "2014-11-26T09:24:56Z"); +- assertXPath(m_doc, "/document/setDocumentMetaData", "date", "2014-11-26T09:24:56Z"); ++ assertXPath(m_doc, "/document/setDocumentMetaData", "creation-date", "2014-11-26T08:24:56Z"); ++ assertXPath(m_doc, "/document/setDocumentMetaData", "date", "2014-11-26T08:24:56Z"); + } + + void ImportTest::testVsdUserDefinedMetadata() +-- +2.1.4 -- cgit v1.2.3 From cab4188f8b0cc6bbd41bab1f691596c1ad346cf5 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sun, 8 Oct 2017 17:56:47 +0200 Subject: gnu: libodfgen: Update to 0.1.6. * gnu/packages/libreoffice.scm (libodfgen): Update to 0.1.6. --- gnu/packages/libreoffice.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages/libreoffice.scm') diff --git a/gnu/packages/libreoffice.scm b/gnu/packages/libreoffice.scm index 9c392c536b..83dedd6b1d 100644 --- a/gnu/packages/libreoffice.scm +++ b/gnu/packages/libreoffice.scm @@ -568,14 +568,14 @@ Microsoft Visio documents of all versions.") (define-public libodfgen (package (name "libodfgen") - (version "0.1.3") + (version "0.1.6") (source (origin (method url-fetch) (uri (string-append "http://dev-www.libreoffice.org/src/" name "-" version ".tar.bz2")) (sha256 (base32 - "074qsav86ixwi9zm1f77g9vxdf1ihm6n930vxjg8q3lwzd8g7lb6")))) + "1hn91bm6dni7n3frh7lpbj3mjqmdrpn12ipq8rswd9445y4j2yrc")))) (build-system gnu-build-system) (native-inputs `(("doxygen" ,doxygen) -- cgit v1.2.3 From c334058f6e7d7f1f1964869e7b11051156ad0e72 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sun, 8 Oct 2017 17:59:07 +0200 Subject: gnu: libmwaw: Update to 0.3.12. * gnu/packages/libreoffice.scm (libmwaw): Update to 0.3.12. [source](patches): Remove. [arguments]: Remove. * gnu/packages/patches/libmwaw-CVE-2017-9433.patch: Delete file. * gnu/local.mk (dist_patch_DATA): Remove it. --- gnu/local.mk | 1 - gnu/packages/libreoffice.scm | 8 ++---- gnu/packages/patches/libmwaw-CVE-2017-9433.patch | 33 ------------------------ 3 files changed, 2 insertions(+), 40 deletions(-) delete mode 100644 gnu/packages/patches/libmwaw-CVE-2017-9433.patch (limited to 'gnu/packages/libreoffice.scm') diff --git a/gnu/local.mk b/gnu/local.mk index 566791ede9..21b4b9532d 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -797,7 +797,6 @@ dist_patch_DATA = \ %D%/packages/patches/libmad-armv7-thumb-pt2.patch \ %D%/packages/patches/libmad-frame-length.patch \ %D%/packages/patches/libmad-mips-newgcc.patch \ - %D%/packages/patches/libmwaw-CVE-2017-9433.patch \ %D%/packages/patches/libsndfile-armhf-type-checks.patch \ %D%/packages/patches/libsndfile-CVE-2017-8361-8363-8365.patch \ %D%/packages/patches/libsndfile-CVE-2017-8362.patch \ diff --git a/gnu/packages/libreoffice.scm b/gnu/packages/libreoffice.scm index 83dedd6b1d..c7e1d81c76 100644 --- a/gnu/packages/libreoffice.scm +++ b/gnu/packages/libreoffice.scm @@ -599,15 +599,14 @@ text documents, vector drawings, presentations and spreadsheets.") (define-public libmwaw (package (name "libmwaw") - (version "0.3.11") + (version "0.3.12") (source (origin (method url-fetch) (uri (string-append "mirror://sourceforge/" name "/" name "/" name "-" version "/" name "-" version ".tar.xz")) - (patches (search-patches "libmwaw-CVE-2017-9433.patch")) (sha256 (base32 - "16i9s9p4sjpdpbm3gq6jkc9r3nyfy47ggkdlgh7vr0mydccklj2b")))) + "1ryi1v38lgy5kv84fzjqkawidrg30y4hlqrz1v262792wzkad4bn")))) (build-system gnu-build-system) (native-inputs `(("doxygen" ,doxygen) @@ -617,9 +616,6 @@ text documents, vector drawings, presentations and spreadsheets.") (inputs `(("boost" ,boost) ("zlib" ,zlib))) - (arguments - ;; avoid triggering configure errors by simple inclusion of boost headers - `(#:configure-flags '("--disable-werror"))) (home-page "https://sourceforge.net/p/libmwaw/wiki/Home/") (synopsis "Import library for some old Macintosh text documents") (description "Libmwaw contains some import filters for old Macintosh diff --git a/gnu/packages/patches/libmwaw-CVE-2017-9433.patch b/gnu/packages/patches/libmwaw-CVE-2017-9433.patch deleted file mode 100644 index 502a11d2a8..0000000000 --- a/gnu/packages/patches/libmwaw-CVE-2017-9433.patch +++ /dev/null @@ -1,33 +0,0 @@ -Fix CVE-2017-9433: - -https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2017-9433 - -Patch copied from upstream source repository: - -https://sourceforge.net/p/libmwaw/libmwaw/ci/68b3b74569881248bfb6cbb4266177cc253b292f - -From 68b3b74569881248bfb6cbb4266177cc253b292f Mon Sep 17 00:00:00 2001 -From: David Tardon -Date: Sat, 8 Apr 2017 14:03:29 +0200 -Subject: [PATCH] ofz#1037 resize vector correctly - ---- - src/lib/MsWrd1Parser.cxx | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/lib/MsWrd1Parser.cxx b/src/lib/MsWrd1Parser.cxx -index 63547e6..3626064 100644 ---- a/src/lib/MsWrd1Parser.cxx -+++ b/src/lib/MsWrd1Parser.cxx -@@ -902,7 +902,7 @@ bool MsWrd1Parser::readFootnoteCorrespondance(MWAWVec2i limits) - int id = fIt++->second; - fPos[1] = fIt==footnoteMap.end() ? m_state->m_eot : fIt->first; - if (id >= int(m_state->m_footnotesList.size())) -- m_state->m_footnotesList.resize(size_t(id),MWAWVec2l(0,0)); -+ m_state->m_footnotesList.resize(size_t(id)+1,MWAWVec2l(0,0)); - m_state->m_footnotesList[size_t(id)]=fPos; - } - ascii().addDelimiter(input->tell(),'|'); --- -2.13.1 - -- cgit v1.2.3 From 37a68784a65260d0c3a103ff526f2bf96e37da85 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sun, 8 Oct 2017 18:14:46 +0200 Subject: gnu: libwps: Update to 0.4.7. * gnu/packages/libreoffice.scm (libwps): Update to 0.4.7. [arguments]: Remove. --- gnu/packages/libreoffice.scm | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) (limited to 'gnu/packages/libreoffice.scm') diff --git a/gnu/packages/libreoffice.scm b/gnu/packages/libreoffice.scm index c7e1d81c76..5ad1bb6277 100644 --- a/gnu/packages/libreoffice.scm +++ b/gnu/packages/libreoffice.scm @@ -649,14 +649,14 @@ from the old StarOffice (.sdc, .sdw, ...).") (define-public libwps (package (name "libwps") - (version "0.4.0") + (version "0.4.7") (source (origin (method url-fetch) (uri (string-append "mirror://sourceforge/" name "/" name "/" name "-" version "/" name "-" version ".tar.xz")) (sha256 (base32 - "0nlrdk7di015l0sk0ivjdqs86zdcvf73p9z9s9ry5glyhrknzxjk")))) + "05xjb35y5ha9grgjqs3viaglq7ydsry1hzdvkm7y5b6f1disnb1g")))) (build-system gnu-build-system) (native-inputs `(("doxygen" ,doxygen) @@ -666,9 +666,6 @@ from the old StarOffice (.sdc, .sdw, ...).") (inputs `(("boost" ,boost) ("zlib" ,zlib))) - (arguments - ;; avoid triggering configure errors by simple inclusion of boost headers - `(#:configure-flags '("--disable-werror"))) (home-page "http://libwps.sourceforge.net/") (synopsis "Import library for Microsoft Works text documents") (description "Libwps is a library for importing files in the Microsoft -- cgit v1.2.3 From 7cb3e9d3fca15c8a4f049102e1e8dea5dad5b8f6 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sun, 8 Oct 2017 18:17:58 +0200 Subject: gnu: libzmf: Update to 0.0.2. * gnu/packages/libreoffice.scm (libzmf): Update to 0.0.2. --- gnu/packages/libreoffice.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages/libreoffice.scm') diff --git a/gnu/packages/libreoffice.scm b/gnu/packages/libreoffice.scm index 5ad1bb6277..78139ff4d8 100644 --- a/gnu/packages/libreoffice.scm +++ b/gnu/packages/libreoffice.scm @@ -675,14 +675,14 @@ Works word processor file format.") (define-public libzmf (package (name "libzmf") - (version "0.0.1") + (version "0.0.2") (source (origin (method url-fetch) (uri (string-append "http://dev-www.libreoffice.org/src/libzmf/libzmf-" version ".tar.xz")) (sha256 (base32 - "0yp5l1b90xim506zmr3ljkn3qkvbc7qk3dnwq1snxdpr57m37xga")))) + "08mg5kmkjrmqrd8j5rkzw9vdqlvibhb1ynp6bmfxnzq5rcq1l197")))) (build-system gnu-build-system) (inputs `(("boost" ,boost) -- cgit v1.2.3 From f51befedbbcd29eb8a054296b569ca54cafd7d97 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sun, 8 Oct 2017 21:37:44 +0200 Subject: gnu: libreoffice: Don't replace "/bin/sh" reference with bash. * gnu/packages/libreoffice.scm (libreoffice)[arguments]: Use (which "sh") instead of (which "bash") in /bin/sh substitution. --- gnu/packages/libreoffice.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'gnu/packages/libreoffice.scm') diff --git a/gnu/packages/libreoffice.scm b/gnu/packages/libreoffice.scm index 78139ff4d8..9980837c85 100644 --- a/gnu/packages/libreoffice.scm +++ b/gnu/packages/libreoffice.scm @@ -966,7 +966,7 @@ and to return information on pronunciations, meanings and synonyms.") (list "sysui/CustomTarget_share.mk" "solenv/gbuild/gbuild.mk" "solenv/gbuild/platform/unxgcc.mk") - (("/bin/sh") (which "bash"))) + (("/bin/sh") (which "sh"))) (mkdir "external/tarballs") (symlink xmlsec -- cgit v1.2.3