[PATCH 6/6] gnu: libreoffice: Update to 5.1.1.3. [Fixes CVE-2016-{0794, 0795}].

[Efraim Flashner]

* gnu/packages/libreoffice.scm (libreoffice): Update to 5.1.1.3.
[inputs]: Remove python, add python-wrapper, gtk+, liblangtag, specify
mdds-0.12.1.
[arguments]: Build without doxygen, manually configure CFLAGS for orcus,
enable liblangtag.
---
 gnu/packages/libreoffice.scm | 19 +++++++++++++------
 1 file changed, 13 insertions(+), 6 deletions(-)

diff --git a/gnu/packages/libreoffice.scm b/gnu/packages/libreoffice.scm
index 0195a28..7a6fc39 100644
--- a/gnu/packages/libreoffice.scm
+++ b/gnu/packages/libreoffice.scm
@@ -711,7 +711,7 @@ and to return information on pronunciations, meanings and 
synonyms.")
 (define-public libreoffice
   (package
     (name "libreoffice")
-    (version "5.0.3.2")
+    (version "5.1.1.3")
     (source
      (origin
       (method url-fetch)
@@ -720,7 +720,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
-               "1gflcsnw7bx02jbb2x5darf56x0qgia03ylaycadk68ikibckybp"))))
+               "0f4fpi5agmz5lbs558d75z0czaa5fc1a7w110lmz1ahdw5vznnic"))))
     (build-system gnu-build-system)
     (native-inputs
      `(;; autoreconf is run by the LibreOffice build system, since after
@@ -747,6 +747,7 @@ and to return information on pronunciations, meanings and 
synonyms.")
        ("gperf" ,gperf)
        ("graphite2" ,graphite2)
        ("gst-plugins-base" ,gst-plugins-base)
+       ("gtk+" ,gtk+)
        ("gtk+" ,gtk+-2)
        ("harfbuzz" ,harfbuzz)
        ("hunspell" ,hunspell)
@@ -759,6 +760,7 @@ and to return information on pronunciations, meanings and 
synonyms.")
        ("libetonyek" ,libetonyek)
        ("libexttextcat" ,libexttextcat)
        ("libfreehand" ,libfreehand)
+       ("liblangtag" ,liblangtag)
        ("libmspub" ,libmspub)
        ("libmwaw" ,libmwaw)
        ("libodfgen" ,libodfgen)
@@ -771,7 +773,7 @@ and to return information on pronunciations, meanings and 
synonyms.")
        ("libxslt" ,libxslt)
        ("libxt" ,libxt)
        ("lpsolve" ,lpsolve)
-       ("mdds" ,mdds)
+       ("mdds" ,mdds-0.12.1)
        ("mythes" ,mythes)
        ("neon" ,neon)
        ("nspr" ,nspr)
@@ -783,7 +785,7 @@ and to return information on pronunciations, meanings and 
synonyms.")
        ("perl-zip" ,perl-zip)
        ("poppler" ,poppler)
        ("postgresql" ,postgresql)
-       ("python" ,python)
+       ("python" ,python-wrapper)
        ("redland" ,redland)
        ("sane-backends" ,sane-backends)
        ("unixodbc" ,unixodbc)
@@ -799,7 +801,8 @@ and to return information on pronunciations, meanings and 
synonyms.")
          (modify-phases %standard-phases
            (add-before 'configure 'prepare-src
              (lambda* (#:key inputs #:allow-other-keys)
-               (let ((xmlsec (assoc-ref inputs "xmlsec-src")))
+               (let ((xmlsec (assoc-ref inputs "xmlsec-src"))
+                     (orcus  (assoc-ref inputs "orcus")))
                  (substitute*
                    (list "sysui/CustomTarget_share.mk"
                          "solenv/gbuild/gbuild.mk"
@@ -820,6 +823,10 @@ and to return information on pronunciations, meanings and 
synonyms.")
                  (setenv "CONFIG_SHELL" (which "bash"))
                  (substitute* "external/libxmlsec/ExternalProject_xmlsec.mk"
                    (("./configure") "$(CONFIG_SHELL) ./configure" ))
+                 ;; pkg-config doesn't pick up orcus, so we need to set the
+                 ;; environmental variables so libreoffice can pick it up.
+                 (setenv "ORCUS_CFLAGS" (string-append orcus "/include"))
+                 (setenv "ORCUS_LIBS" (string-append orcus "/lib -lorcus"))
                  #t)))
            (add-after 'install 'bin-install
              ;; Create a symlink bin/soffice to the executable script.
@@ -854,7 +861,7 @@ and to return information on pronunciations, meanings and 
synonyms.")
           "--disable-coinmp"
           "--disable-firebird-sdbc" ; embedded firebird
           "--disable-gltf"
-          "--disable-liblangtag")))
+          "--without-doxygen")))
     (home-page "https://www.libreoffice.org/";)
     (synopsis "Office suite")
     (description "LibreOffice is a comprehensive office suite.  It contains
-- 
2.7.0