>From b8405903a22f62b399ed17c9f39ea1dd22857472 Mon Sep 17 00:00:00 2001
From: Andreas Enge <address@hidden>
Date: Wed, 9 Mar 2016 14:24:20 +0100
Subject: [PATCH 5/5] gnu: libreoffice: Update to 5.1.1.3.

* gnu/packages/libreoffice.scm (libreoffice)[source]: Update to 5.1.1.3.
  [inputs]: Add gtk+. Replace python by python-wrapper.
  [native-inputs]: Add doxygen.
  [arguments]: Patch configure to detect newer versions of mdds and orcus.
---
 gnu/packages/libreoffice.scm | 18 +++++++++++++-----
 1 file changed, 13 insertions(+), 5 deletions(-)

diff --git a/gnu/packages/libreoffice.scm b/gnu/packages/libreoffice.scm
index 1fb46f1..ed28c63 100644
--- a/gnu/packages/libreoffice.scm
+++ b/gnu/packages/libreoffice.scm
@@ -1,6 +1,6 @@
 ;;; GNU Guix --- Functional package management for GNU
 ;;; Copyright © 2014 John Darrington <address@hidden>
-;;; Copyright © 2015 Andreas Enge <address@hidden>
+;;; Copyright © 2015, 2016 Andreas Enge <address@hidden>
 ;;; Copyright © 2016 Efraim Flashner <address@hidden>
 ;;;
 ;;; This file is part of GNU Guix.
@@ -711,7 +711,7 @@ and to return information on pronunciations, meanings and synonyms.")
 (define-public libreoffice
   (package
     (name "libreoffice")
-    (version "5.0.5.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
-               "120vcxpxzs0za76fyfry281ysv6d1ianb37d1yq8py8chkdjkrqy"))))
+               "0f4fpi5agmz5lbs558d75z0czaa5fc1a7w110lmz1ahdw5vznnic"))))
     (build-system gnu-build-system)
     (native-inputs
      `(;; autoreconf is run by the LibreOffice build system, since after
@@ -730,6 +730,7 @@ and to return information on pronunciations, meanings and synonyms.")
        ("automake" ,automake)
        ("bison" ,bison)
        ("cppunit" ,cppunit)
+       ("doxygen" ,doxygen)
        ("flex" ,flex)
        ("pkg-config" ,pkg-config)
        ("python" ,python)
@@ -747,7 +748,8 @@ and to return information on pronunciations, meanings and synonyms.")
        ("gperf" ,gperf)
        ("graphite2" ,graphite2)
        ("gst-plugins-base" ,gst-plugins-base)
-       ("gtk+" ,gtk+-2)
+       ("gtk+-2" ,gtk+-2)
+       ("gtk+" ,gtk+)
        ("harfbuzz" ,harfbuzz)
        ("hunspell" ,hunspell)
        ("hyphen" ,hyphen)
@@ -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)
@@ -819,6 +821,12 @@ and to return information on pronunciations, meanings and synonyms.")
                  (setenv "CONFIG_SHELL" (which "bash"))
                  (substitute* "external/libxmlsec/ExternalProject_xmlsec.mk"
                    (("./configure") "$(CONFIG_SHELL) ./configure" ))
+                 ;; Fix the check for mdds.
+                 (substitute* "configure"
+                   (("mdds >= 0.12.0") "mdds-1.0 >= 0.12.0"))
+                 ;; Fix the check for orcus.
+                 (substitute* "configure"
+                   (("liborcus-0.10 >= 0.9.0") "liborcus-0.11 >= 0.9.0"))
                  #t)))
            (add-after 'install 'bin-install
              ;; Create a symlink bin/soffice to the executable script.
-- 
2.6.3