GNU bug report logs - #26235
core-updates: update libreoffice to 5.3.1.2

Previous Next

To add a comment to this bug, you must first unarchive it, by sending
a message to control AT debbugs.gnu.org, with unarchive 26235 in the body.
You can then email your comments to 26235 AT debbugs.gnu.org in the normal way.

Toggle the display of automated, internal messages from the tracker.

Message #5 received at submit <at> debbugs.gnu.org (full text, mbox):

From: Thomas Danckaert <post <at> thomasdanckaert.be>
To: guix-patches <at> gnu.org
Subject: core-updates: update libreoffice to 5.3.1.2
Date: Fri, 24 Mar 2017 16:38:34 +0100 (CET)

libreoffice 5.1.6.2 fails to build on core-updates, because of an API 
change in icu4c version 58. The following patch series updates 
libreoffice and some of its dependencies.

(Alternatively, we could keep version 5.1.6.2 and backport the patch 
to build with icu4c >= 58)

Thomas

Message #8 received at 26235 <at> debbugs.gnu.org (full text, mbox):

From: Thomas Danckaert <thomas.danckaert <at> gmail.com>
To: 26235 <at> debbugs.gnu.org
Cc: Thomas Danckaert <thomas.danckaert <at> gmail.com>
Subject: [PATCH 1/7] gnu: Add libzmf.
Date: Fri, 24 Mar 2017 16:44:14 +0100

* gnu/packages/libreoffice.scm (libzmf): New Variable.
---
 gnu/packages/libreoffice.scm | 29 +++++++++++++++++++++++++++++
 1 file changed, 29 insertions(+)

diff --git a/gnu/packages/libreoffice.scm b/gnu/packages/libreoffice.scm
index 52f426692..73f23427d 100644
--- a/gnu/packages/libreoffice.scm
+++ b/gnu/packages/libreoffice.scm
@@ -629,6 +629,35 @@ spreadsheet documents.")
 Works word processor file format.")
     (license (list mpl2.0 lgpl2.1+)))) ; dual license
 
+(define-public libzmf
+  (package
+   (name "libzmf")
+   (version "0.0.1")
+   (source
+    (origin
+      (method url-fetch)
+      (uri (string-append "http://dev-www.libreoffice.org/src/libzmf/libzmf-"
+                          version ".tar.xz"))
+      (sha256 (base32
+               "0yp5l1b90xim506zmr3ljkn3qkvbc7qk3dnwq1snxdpr57m37xga"))))
+    (build-system gnu-build-system)
+    (inputs
+     `(("boost" ,boost)
+       ("icu4c" ,icu4c)
+       ("libpng" ,libpng)
+       ("librevenge" ,librevenge)
+       ("zlib" ,zlib)))
+    (native-inputs
+     `(("cppunit" ,cppunit)
+       ("doxygen" ,doxygen)
+       ("pkg-config" ,pkg-config)))
+    (home-page "https://wiki.documentfoundation.org/DLP/Libraries/libzmf")
+    (synopsis "Parses file format of Zoner Callisto/Draw documents")
+    (description "Libzmf is a library that parses the file format of Zoner
+Callisto/Draw documents.  Currently it only understands documents created by
+Zoner Draw version 4 and 5.")
+    (license mpl2.0)))
+
 (define-public hunspell
   (package
     (name "hunspell")
-- 
2.12.0

Message #11 received at 26235 <at> debbugs.gnu.org (full text, mbox):

From: Thomas Danckaert <thomas.danckaert <at> gmail.com>
To: 26235 <at> debbugs.gnu.org
Cc: Thomas Danckaert <thomas.danckaert <at> gmail.com>
Subject: [PATCH 2/7] gnu: mdds: Upgrade to 1.2.2.
Date: Fri, 24 Mar 2017 16:44:15 +0100

* gnu/packages/boost.scm (mdds): Upgrade to 1.2.2.
---
 gnu/packages/boost.scm | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/gnu/packages/boost.scm b/gnu/packages/boost.scm
index b3fccdf2e..3191d0207 100644
--- a/gnu/packages/boost.scm
+++ b/gnu/packages/boost.scm
@@ -109,14 +109,14 @@ across a broad spectrum of applications.")
 (define-public mdds
   (package
     (name "mdds")
-    (version "0.12.1")
+    (version "1.2.2")
     (source (origin
              (method url-fetch)
              (uri (string-append
-                   "http://kohei.us/files/mdds/src/mdds_" version ".tar.bz2"))
+                   "http://kohei.us/files/mdds/src/mdds-" version ".tar.bz2"))
              (sha256
               (base32
-               "0gg8mb9kxh3wggh7njj1gf90xy27p0yq2cw88wqar9hhg2fmwmi3"))))
+               "17fcjhsq3bzqm7ba9sgp6my3y4226jnwai6q5jq3810i745p67hl"))))
     (build-system gnu-build-system)
     (propagated-inputs
       `(("boost" ,boost))) ; inclusion of header files
-- 
2.12.0

Message #14 received at 26235 <at> debbugs.gnu.org (full text, mbox):

From: Thomas Danckaert <thomas.danckaert <at> gmail.com>
To: 26235 <at> debbugs.gnu.org
Cc: Thomas Danckaert <thomas.danckaert <at> gmail.com>
Subject: [PATCH 3/7] gnu: ixion: Update to 0.12.2.
Date: Fri, 24 Mar 2017 16:44:16 +0100

* gnu/packages/libreoffice.scm (ixion): Update to 0.12.2.
[inputs]: Replace python-2 by python.
---
 gnu/packages/libreoffice.scm | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/gnu/packages/libreoffice.scm b/gnu/packages/libreoffice.scm
index 73f23427d..ac5908c31 100644
--- a/gnu/packages/libreoffice.scm
+++ b/gnu/packages/libreoffice.scm
@@ -70,20 +70,20 @@
 (define-public ixion
   (package
     (name "ixion")
-    (version "0.9.1")
+    (version "0.12.2")
     (source
      (origin
       (method url-fetch)
       (uri (string-append "http://kohei.us/files/ixion/src/libixion-"
                           version ".tar.xz"))
       (sha256 (base32
-               "18g3nk29ljiqbyi0ml49j2x3f3xrqckdm9i66sw5fxnj7hb5rqvp"))))
+               "1bnsqbxpbijwbg42rrqq6mz06wvcxjpl0gjdzwyilkmv6s400i4b"))))
     (build-system gnu-build-system)
     (native-inputs
      `(("pkg-config" ,pkg-config)))
      (inputs
       `(("mdds" ,mdds)
-        ("python" ,python-2))) ; looks for python.pc, not python3.pc
+        ("python" ,python)))
     (home-page "https://gitlab.com/ixion/ixion")
     (synopsis "General purpose formula parser and interpreter")
     (description "Ixion is a library for calculating the results of formula
-- 
2.12.0

Message #17 received at 26235 <at> debbugs.gnu.org (full text, mbox):

From: Thomas Danckaert <thomas.danckaert <at> gmail.com>
To: 26235 <at> debbugs.gnu.org
Cc: Thomas Danckaert <thomas.danckaert <at> gmail.com>
Subject: [PATCH 4/7] gnu: Add libstaroffice.
Date: Fri, 24 Mar 2017 16:44:17 +0100

* gnu/packages/libreoffice.scm (libstaroffice): New variable.
---
 gnu/packages/libreoffice.scm | 23 +++++++++++++++++++++++
 1 file changed, 23 insertions(+)

diff --git a/gnu/packages/libreoffice.scm b/gnu/packages/libreoffice.scm
index ac5908c31..476571586 100644
--- a/gnu/packages/libreoffice.scm
+++ b/gnu/packages/libreoffice.scm
@@ -600,6 +600,29 @@ text documents (MacWrite, ClarisWorks, ... ) and for some graphics and
 spreadsheet documents.")
     (license (list mpl2.0 lgpl2.1+)))) ; dual license
 
+(define-public libstaroffice
+  (package
+    (name "libstaroffice")
+    (version "0.0.3")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (string-append "https://github.com/fosnola/libstaroffice/releases/download/"
+                           version "/libstaroffice-" version ".tar.xz"))
+       (sha256 (base32
+                "1ii2wi3wr5npyz9gby1bjk8r4wyflpfpc6gx7mmqkhsc9c8frpmy"))))
+    (build-system gnu-build-system)
+    (inputs
+     `(("librevenge" ,librevenge)
+       ("zlib" ,zlib)))
+    (native-inputs
+     `(("pkg-config" ,pkg-config)))
+    (home-page "https://github.com/fosnola/libstaroffice")
+    (synopsis "Provides LibreOffice support for old StarOffice documents")
+    (description "libstaroffice is an import filter for the document formats
+from the old StarOffice (.sdc, .sdw, ...).")
+    (license (list mpl2.0 lgpl2.1+)))) ; dual license
+
 (define-public libwps
   (package
     (name "libwps")
-- 
2.12.0

Message #20 received at 26235 <at> debbugs.gnu.org (full text, mbox):

From: Thomas Danckaert <thomas.danckaert <at> gmail.com>
To: 26235 <at> debbugs.gnu.org
Cc: Thomas Danckaert <thomas.danckaert <at> gmail.com>
Subject: [PATCH 5/7] gnu: libetonyek: Update to 0.1.6.
Date: Fri, 24 Mar 2017 16:44:18 +0100

* gnu/packages/libreoffice.scm (libetonyek): Update to 0.1.6.
[arguments]: Add phase 'autoreconf, because configure.ac is patched.  Add
configure flag "--with-mdds=1.2".
[inputs]: Add liblangtag.
[native-inputs]: Add autoconf and automake.
* gnu/packages/patches/libetonyek-build-with-mdds-1.2.patch: New file.
* gnu/local.mk (dist_patch_DATA): Add it.
---
 gnu/local.mk                                       |  1 +
 gnu/packages/libreoffice.scm                       | 15 ++++-
 .../patches/libetonyek-build-with-mdds-1.2.patch   | 74 ++++++++++++++++++++++
 3 files changed, 87 insertions(+), 3 deletions(-)
 create mode 100644 gnu/packages/patches/libetonyek-build-with-mdds-1.2.patch

diff --git a/gnu/local.mk b/gnu/local.mk
index c9e3131c0..c17135e2d 100644
--- a/gnu/local.mk
+++ b/gnu/local.mk
@@ -677,6 +677,7 @@ dist_patch_DATA =						\
   %D%/packages/patches/libbonobo-activation-test-race.patch	\
   %D%/packages/patches/libcanberra-sound-theme-freedesktop.patch \
   %D%/packages/patches/libdrm-symbol-check.patch		\
+  %D%/packages/patches/libetonyek-build-with-mdds-1.2.patch     \
   %D%/packages/patches/libevent-dns-tests.patch			\
   %D%/packages/patches/libevent-2.0-CVE-2016-10195.patch	\
   %D%/packages/patches/libevent-2.0-CVE-2016-10196.patch	\
diff --git a/gnu/packages/libreoffice.scm b/gnu/packages/libreoffice.scm
index 476571586..6871b4e21 100644
--- a/gnu/packages/libreoffice.scm
+++ b/gnu/packages/libreoffice.scm
@@ -348,22 +348,31 @@ CorelDRAW documents of all versions.")
 (define-public libetonyek
   (package
     (name "libetonyek")
-    (version "0.1.3")
+    (version "0.1.6")
     (source
      (origin
       (method url-fetch)
       (uri (string-append "http://dev-www.libreoffice.org/src/" name "/"
                           name "-" version ".tar.xz"))
       (sha256 (base32
-               "0mghaqzj0qqza8z1gzprw62702adlww4kgdzynj5qpxxc9m2f4py"))))
+               "0y60vi1plyq69fqbcjnc0v8mvcjqjsl1ry6rmb3bq3q7j8a2fm6z"))
+      (patches (search-patches "libetonyek-build-with-mdds-1.2.patch"))))
     (build-system gnu-build-system)
+    (arguments
+     `(#:configure-flags '("--with-mdds=1.2")
+       #:phases (modify-phases %standard-phases
+                  (add-before 'configure 'autoreconf
+                              (lambda _ (system* "autoreconf"))))))
     (native-inputs
      `(("cppunit" ,cppunit)
        ("doxygen" ,doxygen)
        ("glm" ,glm)
        ("gperf" ,gperf)
+       ("liblangtag" ,liblangtag)
        ("mdds" ,mdds)
-       ("pkg-config" ,pkg-config)))
+       ("pkg-config" ,pkg-config)
+       ("autoconf" ,autoconf) ; due to patch
+       ("automake" ,automake)))
     (propagated-inputs ; in Requires or Requires.private field of .pkg
      `(("librevenge" ,librevenge)
        ("libxml2" ,libxml2)))
diff --git a/gnu/packages/patches/libetonyek-build-with-mdds-1.2.patch b/gnu/packages/patches/libetonyek-build-with-mdds-1.2.patch
new file mode 100644
index 000000000..1a70ca99d
--- /dev/null
+++ b/gnu/packages/patches/libetonyek-build-with-mdds-1.2.patch
@@ -0,0 +1,74 @@
+Allow building with mdds 1.2.
+
+Patch taken from upstream commit f6d14b3b510de5c50e45c98fe812a73ba00f3def
+see https://gerrit.libreoffice.org/gitweb?p=libetonyek.git
+
+diff --git a/configure.ac b/configure.ac
+index ca4bb07..bb946eb 100644 (file)
+--- a/configure.ac
++++ b/configure.ac
+@@ -24,7 +24,7 @@ AC_LANG([C++])
+ # Configure options
+ # =================
+ AC_ARG_WITH([mdds],
+-            AS_HELP_STRING([--with-mdds=1.0|0.x], [Specify which version of mdds to use (1.0 is the default)]),
++            AS_HELP_STRING([--with-mdds=1.2|1.0|0.x], [Specify which version of mdds to use (1.0 is the default)]),
+             [], [with_mdds="1.0"])
+ 
+ # ===========================
+@@ -47,7 +47,7 @@ AC_PROG_SED
+ 
+ AM_MISSING_PROG([GPERF], [gperf])
+ 
+-AS_IF([test "$with_mdds" = "1.0"], [AX_CXX_COMPILE_STDCXX_11([noext])])
++AS_IF([test "$with_mdds" = "1.0" -o "$with_mdds" = "1.2" ], [AX_CXX_COMPILE_STDCXX_11([noext])])
+ 
+ # ===============
+ # Find librevenge
+@@ -138,25 +138,27 @@ AC_SUBST([GLM_CFLAGS])
+ # =========
+ # Find mdds
+ # =========
+-AS_IF([test "$with_mdds" = "1.0"], [
+-    PKG_CHECK_MODULES([MDDS], [mdds-1.0])
+-], [
+-    PKG_CHECK_MODULES([MDDS], [mdds])
+-    AC_MSG_CHECKING([checking if mdds::flat_segment_tree can store values of any type])
+-    old_CPPFLAGS="$CPPFLAGS"
+-    CPPFLAGS="$MDDS_CFLAGS $CPPFLAGS"
+-    AC_COMPILE_IFELSE([AC_LANG_SOURCE([
+-    #include <mdds/flat_segment_tree.hpp>
+-    struct Value {};
+-    mdds::flat_segment_tree<int, Value> tree(0, 4, Value());
+-    ])], [
+-        AC_MSG_RESULT([yes])
+-    ], [
+-        AC_MSG_RESULT([no])
+-        AC_MSG_ERROR([please install mdds >= 0.12.1])
+-    ])
+-    CPPFLAGS="$old_CPPFLAGS"
+-])
++AS_CASE(["$with_mdds"],
++    ["1.2"], [PKG_CHECK_MODULES([MDDS], [mdds-1.2])],
++    ["1.0"], [PKG_CHECK_MODULES([MDDS], [mdds-1.0])],
++    [
++        PKG_CHECK_MODULES([MDDS], [mdds])
++        AC_MSG_CHECKING([checking if mdds::flat_segment_tree can store values of any type])
++        old_CPPFLAGS="$CPPFLAGS"
++        CPPFLAGS="$MDDS_CFLAGS $CPPFLAGS"
++        AC_COMPILE_IFELSE([AC_LANG_SOURCE([
++            #include <mdds/flat_segment_tree.hpp>
++            struct Value {};
++            mdds::flat_segment_tree<int, Value> tree(0, 4, Value());
++        ])], [
++            AC_MSG_RESULT([yes])
++        ], [
++            AC_MSG_RESULT([no])
++            AC_MSG_ERROR([please install mdds >= 0.12.1])
++        ])
++        CPPFLAGS="$old_CPPFLAGS"
++    ]
++)
+ 
+ # =================================
+ # Libtool/Version Makefile settings
-- 
2.12.0

Message #23 received at 26235 <at> debbugs.gnu.org (full text, mbox):

From: Thomas Danckaert <thomas.danckaert <at> gmail.com>
To: 26235 <at> debbugs.gnu.org
Cc: Thomas Danckaert <thomas.danckaert <at> gmail.com>
Subject: [PATCH 6/7] gnu: orcus: Update to 0.12.1.
Date: Fri, 24 Mar 2017 16:44:19 +0100

* gnu/packages/libreoffice.scm (orcus): Update to 0.12.1.
[inputs]: Add python.
---
 gnu/packages/libreoffice.scm | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/gnu/packages/libreoffice.scm b/gnu/packages/libreoffice.scm
index 6871b4e21..7184c3dd7 100644
--- a/gnu/packages/libreoffice.scm
+++ b/gnu/packages/libreoffice.scm
@@ -95,21 +95,22 @@ their dependencies automatically upon calculation.")
 (define-public orcus
   (package
     (name "orcus")
-    (version "0.9.2")
+    (version "0.12.1")
     (source
      (origin
       (method url-fetch)
       (uri (string-append "http://kohei.us/files/" name "/src/lib"
                           name "-" version ".tar.xz"))
       (sha256 (base32
-               "170racjz7s7yxza722hxsqc12788w57qnp6x6j2692pzp3qzjjfx"))))
+               "171bmqa9hkk4xygz20qda5900rs4kq9fgl424ldkxlj4d733dffi"))))
     (build-system gnu-build-system)
     (native-inputs
      `(("pkg-config" ,pkg-config)))
      (inputs
       `(("ixion" ,ixion)
         ("mdds" ,mdds)
-        ("zlib" ,zlib)))
+        ("zlib" ,zlib)
+        ("python" ,python)))
     (home-page "https://gitlab.com/orcus/orcus")
     (synopsis "File import filter library for spreadsheet documents")
     (description "Orcus is a library that provides a collection of standalone
-- 
2.12.0

Message #26 received at 26235 <at> debbugs.gnu.org (full text, mbox):

From: Thomas Danckaert <thomas.danckaert <at> gmail.com>
To: 26235 <at> debbugs.gnu.org
Cc: Thomas Danckaert <thomas.danckaert <at> gmail.com>
Subject: [PATCH 7/7] gnu: libreoffice: Update to 5.3.1.2.
Date: Fri, 24 Mar 2017 16:44:20 +0100

* gnu/packages/libreoffice.scm (libreoffice): Update to 5.3.1.2.
[inputs]: Add libstaroffice and libzmf.
[arguments]: Remove reference to removed patch; unpack xmlsec 1.2.23 tarball.
(xmlsec-src-libreoffice): Update to version 1.2.23 tarball.
---
 gnu/packages/libreoffice.scm | 19 ++++++++++---------
 1 file changed, 10 insertions(+), 9 deletions(-)

diff --git a/gnu/packages/libreoffice.scm b/gnu/packages/libreoffice.scm
index 7184c3dd7..bbc213d63 100644
--- a/gnu/packages/libreoffice.scm
+++ b/gnu/packages/libreoffice.scm
@@ -768,15 +768,15 @@ and to return information on pronunciations, meanings and synonyms.")
     (method url-fetch)
     (uri
       (string-append
-        "http://dev-www.libreoffice.org/src/"
-        "1f24ab1d39f4a51faf22244c94a6203f-xmlsec1-1.2.14.tar.gz"))
+       "http://dev-www.libreoffice.org/src/"
+       "86b1daaa438f5a7bea9a52d7b9799ac0-xmlsec1-1.2.23.tar.gz"))
     (sha256 (base32
-              "0jnxxygg6z5zi6za94dvxmg1bfar1wh8p5xa2bzbha0qcn2m02ir"))))
+             "17qfw5crkqn4v6xbkjxrjvcccfc00dy053892wrwv54qdk8n7m21"))))
 
 (define-public libreoffice
   (package
     (name "libreoffice")
-    (version "5.1.6.2")
+    (version "5.3.1.2")
     (source
      (origin
       (method url-fetch)
@@ -785,7 +785,7 @@ and to return information on pronunciations, meanings and synonyms.")
           "http://download.documentfoundation.org/libreoffice/src/"
           (version-prefix version 3) "/libreoffice-" version ".tar.xz"))
       (sha256 (base32
-               "150xb76pc3889gfy4jrnq8sidymm1aihkm5pzy8b1fdy51zip804"))))
+               "1zsl0z0i8pw532x2lmwd64ms6igibkkjhwf01zmm2kpnr9ycsijp"))))
     (build-system gnu-build-system)
     (native-inputs
      `(;; autoreconf is run by the LibreOffice build system, since after
@@ -828,6 +828,7 @@ and to return information on pronunciations, meanings and synonyms.")
        ("libmwaw" ,libmwaw)
        ("libodfgen" ,libodfgen)
        ("libpagemaker" ,libpagemaker)
+       ("libstaroffice" ,libstaroffice)
        ("libvisio" ,libvisio)
        ("libwpg" ,libwpg)
        ("libwps" ,libwps)
@@ -835,6 +836,7 @@ and to return information on pronunciations, meanings and synonyms.")
        ("libxrender" ,libxrender)
        ("libxslt" ,libxslt)
        ("libxt" ,libxt)
+       ("libzmf" ,libzmf)
        ("lpsolve" ,lpsolve)
        ("mdds" ,mdds)
        ("mythes" ,mythes)
@@ -867,15 +869,14 @@ and to return information on pronunciations, meanings and synonyms.")
                  (substitute*
                    (list "sysui/CustomTarget_share.mk"
                          "solenv/gbuild/gbuild.mk"
-                         "solenv/gbuild/platform/unxgcc.mk"
-                         "external/libxmlsec/xmlsec1-oldlibtool.patch")
+                         "solenv/gbuild/platform/unxgcc.mk")
                    (("/bin/sh") (which "bash")))
                  (mkdir "external/tarballs")
                  (symlink
                    xmlsec
                    (string-append "external/tarballs/"
-                     "1f24ab1d39f4a51faf22244c94a6203f-"
-                     "xmlsec1-1.2.14.tar.gz"))
+                                  "86b1daaa438f5a7bea9a52d7b9799ac0-"
+                                  "xmlsec1-1.2.23.tar.gz"))
                  ;; The following is required for building xmlsec from the
                  ;; unpatched external tarball; since "configure" starts with
                  ;; "/bin/sh", it needs to be executed by a command invoking
-- 
2.12.0

Message #29 received at 26235 <at> debbugs.gnu.org (full text, mbox):

From: Marius Bakke <mbakke <at> fastmail.com>
To: Thomas Danckaert <thomas.danckaert <at> gmail.com>, 26235 <at> debbugs.gnu.org
Cc: Thomas Danckaert <thomas.danckaert <at> gmail.com>
Subject: Re: bug#26235: [PATCH 5/7] gnu: libetonyek: Update to 0.1.6.
Date: Fri, 24 Mar 2017 17:59:45 +0100

[Message part 1 (text/plain, inline)]

Thomas Danckaert <thomas.danckaert <at> gmail.com> writes:

> * gnu/packages/libreoffice.scm (libetonyek): Update to 0.1.6.
> [arguments]: Add phase 'autoreconf, because configure.ac is patched.  Add
> configure flag "--with-mdds=1.2".
> [inputs]: Add liblangtag.
> [native-inputs]: Add autoconf and automake.
> * gnu/packages/patches/libetonyek-build-with-mdds-1.2.patch: New file.
> * gnu/local.mk (dist_patch_DATA): Add it.
> ---
>  gnu/local.mk                                       |  1 +
>  gnu/packages/libreoffice.scm                       | 15 ++++-
>  .../patches/libetonyek-build-with-mdds-1.2.patch   | 74 ++++++++++++++++++++++
>  3 files changed, 87 insertions(+), 3 deletions(-)
>  create mode 100644 gnu/packages/patches/libetonyek-build-with-mdds-1.2.patch
>
> diff --git a/gnu/local.mk b/gnu/local.mk
> index c9e3131c0..c17135e2d 100644
> --- a/gnu/local.mk
> +++ b/gnu/local.mk
> @@ -677,6 +677,7 @@ dist_patch_DATA =						\
>    %D%/packages/patches/libbonobo-activation-test-race.patch	\
>    %D%/packages/patches/libcanberra-sound-theme-freedesktop.patch \
>    %D%/packages/patches/libdrm-symbol-check.patch		\
> +  %D%/packages/patches/libetonyek-build-with-mdds-1.2.patch     \
>    %D%/packages/patches/libevent-dns-tests.patch			\
>    %D%/packages/patches/libevent-2.0-CVE-2016-10195.patch	\
>    %D%/packages/patches/libevent-2.0-CVE-2016-10196.patch	\
> diff --git a/gnu/packages/libreoffice.scm b/gnu/packages/libreoffice.scm
> index 476571586..6871b4e21 100644
> --- a/gnu/packages/libreoffice.scm
> +++ b/gnu/packages/libreoffice.scm
> @@ -348,22 +348,31 @@ CorelDRAW documents of all versions.")
>  (define-public libetonyek
>    (package
>      (name "libetonyek")
> -    (version "0.1.3")
> +    (version "0.1.6")
>      (source
>       (origin
>        (method url-fetch)
>        (uri (string-append "http://dev-www.libreoffice.org/src/" name "/"
>                            name "-" version ".tar.xz"))
>        (sha256 (base32
> -               "0mghaqzj0qqza8z1gzprw62702adlww4kgdzynj5qpxxc9m2f4py"))))
> +               "0y60vi1plyq69fqbcjnc0v8mvcjqjsl1ry6rmb3bq3q7j8a2fm6z"))
> +      (patches (search-patches "libetonyek-build-with-mdds-1.2.patch"))))
>      (build-system gnu-build-system)
> +    (arguments
> +     `(#:configure-flags '("--with-mdds=1.2")
> +       #:phases (modify-phases %standard-phases
> +                  (add-before 'configure 'autoreconf
> +                              (lambda _ (system* "autoreconf"))))))
>      (native-inputs
>       `(("cppunit" ,cppunit)
>         ("doxygen" ,doxygen)
>         ("glm" ,glm)
>         ("gperf" ,gperf)
> +       ("liblangtag" ,liblangtag)
>         ("mdds" ,mdds)
> -       ("pkg-config" ,pkg-config)))
> +       ("pkg-config" ,pkg-config)
> +       ("autoconf" ,autoconf) ; due to patch
> +       ("automake" ,automake)))
>      (propagated-inputs ; in Requires or Requires.private field of .pkg
>       `(("librevenge" ,librevenge)
>         ("libxml2" ,libxml2)))
> diff --git a/gnu/packages/patches/libetonyek-build-with-mdds-1.2.patch b/gnu/packages/patches/libetonyek-build-with-mdds-1.2.patch
> new file mode 100644
> index 000000000..1a70ca99d
> --- /dev/null
> +++ b/gnu/packages/patches/libetonyek-build-with-mdds-1.2.patch
> @@ -0,0 +1,74 @@
> +Allow building with mdds 1.2.
> +
> +Patch taken from upstream commit f6d14b3b510de5c50e45c98fe812a73ba00f3def
> +see https://gerrit.libreoffice.org/gitweb?p=libetonyek.git

Please add a direct link here:

https://gerrit.libreoffice.org/gitweb?p=libetonyek.git;a=commitdiff;h=f6d14b3b510de5c50e45c98fe812a73ba00f3def

(otherwise LGTM)

> +
> +diff --git a/configure.ac b/configure.ac
> +index ca4bb07..bb946eb 100644 (file)
> +--- a/configure.ac
> ++++ b/configure.ac
> +@@ -24,7 +24,7 @@ AC_LANG([C++])
> + # Configure options
> + # =================
> + AC_ARG_WITH([mdds],
> +-            AS_HELP_STRING([--with-mdds=1.0|0.x], [Specify which version of mdds to use (1.0 is the default)]),
> ++            AS_HELP_STRING([--with-mdds=1.2|1.0|0.x], [Specify which version of mdds to use (1.0 is the default)]),
> +             [], [with_mdds="1.0"])
> + 
> + # ===========================
> +@@ -47,7 +47,7 @@ AC_PROG_SED
> + 
> + AM_MISSING_PROG([GPERF], [gperf])
> + 
> +-AS_IF([test "$with_mdds" = "1.0"], [AX_CXX_COMPILE_STDCXX_11([noext])])
> ++AS_IF([test "$with_mdds" = "1.0" -o "$with_mdds" = "1.2" ], [AX_CXX_COMPILE_STDCXX_11([noext])])
> + 
> + # ===============
> + # Find librevenge
> +@@ -138,25 +138,27 @@ AC_SUBST([GLM_CFLAGS])
> + # =========
> + # Find mdds
> + # =========
> +-AS_IF([test "$with_mdds" = "1.0"], [
> +-    PKG_CHECK_MODULES([MDDS], [mdds-1.0])
> +-], [
> +-    PKG_CHECK_MODULES([MDDS], [mdds])
> +-    AC_MSG_CHECKING([checking if mdds::flat_segment_tree can store values of any type])
> +-    old_CPPFLAGS="$CPPFLAGS"
> +-    CPPFLAGS="$MDDS_CFLAGS $CPPFLAGS"
> +-    AC_COMPILE_IFELSE([AC_LANG_SOURCE([
> +-    #include <mdds/flat_segment_tree.hpp>
> +-    struct Value {};
> +-    mdds::flat_segment_tree<int, Value> tree(0, 4, Value());
> +-    ])], [
> +-        AC_MSG_RESULT([yes])
> +-    ], [
> +-        AC_MSG_RESULT([no])
> +-        AC_MSG_ERROR([please install mdds >= 0.12.1])
> +-    ])
> +-    CPPFLAGS="$old_CPPFLAGS"
> +-])
> ++AS_CASE(["$with_mdds"],
> ++    ["1.2"], [PKG_CHECK_MODULES([MDDS], [mdds-1.2])],
> ++    ["1.0"], [PKG_CHECK_MODULES([MDDS], [mdds-1.0])],
> ++    [
> ++        PKG_CHECK_MODULES([MDDS], [mdds])
> ++        AC_MSG_CHECKING([checking if mdds::flat_segment_tree can store values of any type])
> ++        old_CPPFLAGS="$CPPFLAGS"
> ++        CPPFLAGS="$MDDS_CFLAGS $CPPFLAGS"
> ++        AC_COMPILE_IFELSE([AC_LANG_SOURCE([
> ++            #include <mdds/flat_segment_tree.hpp>
> ++            struct Value {};
> ++            mdds::flat_segment_tree<int, Value> tree(0, 4, Value());
> ++        ])], [
> ++            AC_MSG_RESULT([yes])
> ++        ], [
> ++            AC_MSG_RESULT([no])
> ++            AC_MSG_ERROR([please install mdds >= 0.12.1])
> ++        ])
> ++        CPPFLAGS="$old_CPPFLAGS"
> ++    ]
> ++)
> + 
> + # =================================
> + # Libtool/Version Makefile settings
> -- 
> 2.12.0

[signature.asc (application/pgp-signature, inline)]

Message #32 received at 26235 <at> debbugs.gnu.org (full text, mbox):

From: Marius Bakke <mbakke <at> fastmail.com>
To: Thomas Danckaert <thomas.danckaert <at> gmail.com>, 26235 <at> debbugs.gnu.org
Cc: Thomas Danckaert <thomas.danckaert <at> gmail.com>
Subject: Re: bug#26235: [PATCH 4/7] gnu: Add libstaroffice.
Date: Fri, 24 Mar 2017 18:00:46 +0100

[Message part 1 (text/plain, inline)]

Thomas Danckaert <thomas.danckaert <at> gmail.com> writes:

> * gnu/packages/libreoffice.scm (libstaroffice): New variable.
> ---
>  gnu/packages/libreoffice.scm | 23 +++++++++++++++++++++++
>  1 file changed, 23 insertions(+)
>
> diff --git a/gnu/packages/libreoffice.scm b/gnu/packages/libreoffice.scm
> index ac5908c31..476571586 100644
> --- a/gnu/packages/libreoffice.scm
> +++ b/gnu/packages/libreoffice.scm
> @@ -600,6 +600,29 @@ text documents (MacWrite, ClarisWorks, ... ) and for some graphics and
>  spreadsheet documents.")
>      (license (list mpl2.0 lgpl2.1+)))) ; dual license
>  
> +(define-public libstaroffice
> +  (package
> +    (name "libstaroffice")
> +    (version "0.0.3")
> +    (source
> +     (origin
> +       (method url-fetch)
> +       (uri (string-append "https://github.com/fosnola/libstaroffice/releases/download/"
> +                           version "/libstaroffice-" version ".tar.xz"))
> +       (sha256 (base32
> +                "1ii2wi3wr5npyz9gby1bjk8r4wyflpfpc6gx7mmqkhsc9c8frpmy"))))
> +    (build-system gnu-build-system)
> +    (inputs
> +     `(("librevenge" ,librevenge)
> +       ("zlib" ,zlib)))
> +    (native-inputs
> +     `(("pkg-config" ,pkg-config)))
> +    (home-page "https://github.com/fosnola/libstaroffice")
> +    (synopsis "Provides LibreOffice support for old StarOffice documents")
> +    (description "libstaroffice is an import filter for the document formats
                     @code{libstaroffice}

> +from the old StarOffice (.sdc, .sdw, ...).")
> +    (license (list mpl2.0 lgpl2.1+)))) ; dual license
> +
>  (define-public libwps
>    (package
>      (name "libwps")
> -- 
> 2.12.0

[signature.asc (application/pgp-signature, inline)]

Message #35 received at 26235 <at> debbugs.gnu.org (full text, mbox):

From: Marius Bakke <mbakke <at> fastmail.com>
To: Thomas Danckaert <thomas.danckaert <at> gmail.com>, 26235 <at> debbugs.gnu.org
Cc: Thomas Danckaert <thomas.danckaert <at> gmail.com>
Subject: Re: bug#26235: [PATCH 6/7] gnu: orcus: Update to 0.12.1.
Date: Fri, 24 Mar 2017 18:02:52 +0100

[Message part 1 (text/plain, inline)]

Thomas Danckaert <thomas.danckaert <at> gmail.com> writes:

> * gnu/packages/libreoffice.scm (orcus): Update to 0.12.1.
> [inputs]: Add python.
> ---
>  gnu/packages/libreoffice.scm | 7 ++++---
>  1 file changed, 4 insertions(+), 3 deletions(-)
>
> diff --git a/gnu/packages/libreoffice.scm b/gnu/packages/libreoffice.scm
> index 6871b4e21..7184c3dd7 100644
> --- a/gnu/packages/libreoffice.scm
> +++ b/gnu/packages/libreoffice.scm
> @@ -95,21 +95,22 @@ their dependencies automatically upon calculation.")
>  (define-public orcus
>    (package
>      (name "orcus")
> -    (version "0.9.2")
> +    (version "0.12.1")
>      (source
>       (origin
>        (method url-fetch)
>        (uri (string-append "http://kohei.us/files/" name "/src/lib"
>                            name "-" version ".tar.xz"))
>        (sha256 (base32
> -               "170racjz7s7yxza722hxsqc12788w57qnp6x6j2692pzp3qzjjfx"))))
> +               "171bmqa9hkk4xygz20qda5900rs4kq9fgl424ldkxlj4d733dffi"))))
>      (build-system gnu-build-system)
>      (native-inputs
>       `(("pkg-config" ,pkg-config)))
>       (inputs
>        `(("ixion" ,ixion)
>          ("mdds" ,mdds)
> -        ("zlib" ,zlib)))
> +        ("zlib" ,zlib)
> +        ("python" ,python)))

Do you know how this new version uses python? Is it referenced by the
output, or only needed for building?

Also, it would be nicer to place it above zlib ;-)

>      (home-page "https://gitlab.com/orcus/orcus")
>      (synopsis "File import filter library for spreadsheet documents")
>      (description "Orcus is a library that provides a collection of standalone
> -- 
> 2.12.0

[signature.asc (application/pgp-signature, inline)]

Message #38 received at 26235 <at> debbugs.gnu.org (full text, mbox):

From: Marius Bakke <mbakke <at> fastmail.com>
To: Thomas Danckaert <post <at> thomasdanckaert.be>, 26235 <at> debbugs.gnu.org
Subject: Re: bug#26235: core-updates: update libreoffice to 5.3.1.2
Date: Fri, 24 Mar 2017 18:07:18 +0100

[Message part 1 (text/plain, inline)]

Thomas Danckaert <post <at> thomasdanckaert.be> writes:

> libreoffice 5.1.6.2 fails to build on core-updates, because of an API 
> change in icu4c version 58. The following patch series updates 
> libreoffice and some of its dependencies.

Wow, thanks a lot for this! I've sent some comments, the rest of the
series LGTM. Have you tried building this on 'master'? It could be
pushed there if it works with the current ICU as well.

[signature.asc (application/pgp-signature, inline)]

Message #41 received at 26235 <at> debbugs.gnu.org (full text, mbox):

From: Thomas Danckaert <post <at> thomasdanckaert.be>
To: Marius Bakke <mbakke <at> fastmail.com>
Cc: 26235 <at> debbugs.gnu.org
Subject: Re: bug#26235: core-updates: update libreoffice to 5.3.1.2
Date: Sat, 25 Mar 2017 15:40:36 +0100

Marius Bakke <mbakke <at> fastmail.com> writes:

> Have you tried building this on 'master'? It could be pushed there if
> it works with the current ICU as well.

I just tried, and it works (with just some basic testing, though) if I
add a

  (setenv "CXXFLAGS" "-Wno-error=shadow")

in the libzmf package.  Otherwise I get a compilation error.  This is
not required in core-updates, so my guess is that it's a spurious
warning in gcc-4.9 which was fixed since?

Is it worth doing this?  core-updates will be merged any day now, rite?
:0) If we do apply this on master, we should try to remember to remove
this flag when it's merged with core-updates.

Does anyone else want to try?  Building took roughly 1 hour 30 mins
(single core, 2.2GHz), so it's actually quite doable.

Thomas

Message #44 received at 26235 <at> debbugs.gnu.org (full text, mbox):

From: Thomas Danckaert <post <at> thomasdanckaert.be>
To: bug#26235 <26235 <at> debbugs.gnu.org>
Subject: Re: bug#26235: [PATCH 6/7] gnu: orcus: Update to 0.12.1.
Date: Sat, 25 Mar 2017 17:49:41 +0100

Marius Bakke <mbakke <at> fastmail.com> writes:

> Do you know how this new version uses python? Is it referenced by the
> output, or only needed for building?

Yes, it's referenced.  The library has a Python API now.

> Also, it would be nicer to place it above zlib ;-)

You're right :-)

Thomas

Message #47 received at 26235 <at> debbugs.gnu.org (full text, mbox):

From: Marius Bakke <mbakke <at> fastmail.com>
To: Thomas Danckaert <post <at> thomasdanckaert.be>
Cc: 26235 <at> debbugs.gnu.org
Subject: Re: bug#26235: core-updates: update libreoffice to 5.3.1.2
Date: Sun, 26 Mar 2017 08:11:53 +0200

[Message part 1 (text/plain, inline)]

Thomas Danckaert <post <at> thomasdanckaert.be> writes:

> Marius Bakke <mbakke <at> fastmail.com> writes:
>
>> Have you tried building this on 'master'? It could be pushed there if
>> it works with the current ICU as well.
>
> I just tried, and it works (with just some basic testing, though) if I
> add a
>
>   (setenv "CXXFLAGS" "-Wno-error=shadow")
>
> in the libzmf package.  Otherwise I get a compilation error.  This is
> not required in core-updates, so my guess is that it's a spurious
> warning in gcc-4.9 which was fixed since?
>
> Is it worth doing this?  core-updates will be merged any day now, rite?
> :0) If we do apply this on master, we should try to remember to remove
> this flag when it's merged with core-updates.

Thanks for checking. I don't think it's worth the hassle in that case.
Let's get this in 'core-updates' and fix the remaining red dots :-)

https://hydra.gnu.org/eval/109561?full=1&compare=master#tabs-now-fail

(You can close this bug by CCing 26235-done@ after pushing. Thanks!)

[signature.asc (application/pgp-signature, inline)]

Message #50 received at 26235 <at> debbugs.gnu.org (full text, mbox):

From: Thomas Danckaert <post <at> thomasdanckaert.be>
To: mbakke <at> fastmail.com
Cc: 26235 <at> debbugs.gnu.org, 26235-done <at> debbugs.gnu.org
Subject: Re: bug#26235: core-updates: update libreoffice to 5.3.1.2
Date: Mon, 27 Mar 2017 20:20:01 +0200 (CEST)

From: Marius Bakke <mbakke <at> fastmail.com>
Subject: Re: bug#26235: core-updates: update libreoffice to 5.3.1.2
Date: Sun, 26 Mar 2017 08:11:53 +0200

> Let's get this in 'core-updates' and fix the remaining red dots :-)
> 
> https://hydra.gnu.org/eval/109561?full=1&compare=master#tabs-now-fail
> 
> (You can close this bug by CCing 26235-done@ after pushing. Thanks!)

pushed as b1a8fd2d2cf6bf1b20ba8d26ca6f9a7caef60cbc, closing!

Previous Next

GNU bug tracking system
Copyright (C) 1999 Darren O. Benham, 1997,2003 nCipher Corporation Ltd, 1994-97 Ian Jackson.