From f6f8645cc9337309eeae21e0d036a3167c4a85bc Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Tue, 4 Sep 2018 13:32:54 +0200 Subject: gnu: libcmis: Fix FTBFS with Boost >= 1.68.0. * gnu/packages/libreoffice.scm (libcmis)[arguments]: Add phase to substitute header file name. --- gnu/packages/libreoffice.scm | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) (limited to 'gnu/packages/libreoffice.scm') diff --git a/gnu/packages/libreoffice.scm b/gnu/packages/libreoffice.scm index 3dc7a4bbf2..690fa80512 100644 --- a/gnu/packages/libreoffice.scm +++ b/gnu/packages/libreoffice.scm @@ -316,7 +316,16 @@ (define-public libcmis ;; During configure, the boost headers are found, but linking ;; fails without the following flag. (string-append "--with-boost=" - (assoc-ref %build-inputs "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))))) (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 From aeba7d4650f6d725f4751aa142cd1aae5ee3be97 Mon Sep 17 00:00:00 2001 From: Jonathan Brielmaier Date: Tue, 11 Sep 2018 07:58:36 +0200 Subject: gnu: Add libnumbertext. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/libreoffice.scm (libnumbertext): New public variable. Signed-off-by: Ludovic Courtès --- gnu/packages/libreoffice.scm | 32 +++++++++++++++++++++++++++++++- 1 file changed, 31 insertions(+), 1 deletion(-) (limited to 'gnu/packages/libreoffice.scm') diff --git a/gnu/packages/libreoffice.scm b/gnu/packages/libreoffice.scm index 3dc7a4bbf2..d81f8aa793 100644 --- a/gnu/packages/libreoffice.scm +++ b/gnu/packages/libreoffice.scm @@ -10,6 +10,7 @@ ;;; Copyright © 2017, 2018 Marius Bakke ;;; Copyright © 2017 Rutger Helling ;;; Copyright © 2018 Ricardo Wurmus +;;; Copyright © 2018 Jonathan Brielmaier ;;; ;;; This file is part of GNU Guix. ;;; @@ -32,7 +33,7 @@ (define-module (gnu packages libreoffice) #:use-module (guix download) #:use-module ((guix licenses) #:select (gpl2+ lgpl2.1+ lgpl3+ mpl1.1 mpl2.0 - non-copyleft x11-style)) + non-copyleft x11-style bsd-3)) #:use-module (guix packages) #:use-module (guix utils) #:use-module (ice-9 match) @@ -524,6 +525,35 @@ (define-public libmspub Microsoft Publisher documents of all versions.") (license mpl2.0))) +(define-public libnumbertext + (package + (name "libnumbertext") + (version "1.0") + (source + (origin + (method url-fetch) + (uri (string-append "https://github.com/numbertext/" name + "/archive/" version ".tar.gz")) + (sha256 + (base32 + "0wnsn4911fdd2na8jxkcvmk04a6xw6qlviic9w4qwg9fcym6866v")) + (file-name (string-append name "-" version ".tar.gz")))) + (build-system gnu-build-system) + (arguments + `(#:configure-flags '("--disable-static"))) + (native-inputs + `(("autoconf" ,autoconf) + ("automake" ,automake) + ("libtool" ,libtool) + ("pkg-config" ,pkg-config))) + (home-page "https://github.com/Numbertext/libnumbertext") + (synopsis "Language-neutral @code{NUMBERTEXT} and @code{MONEYTEXT} functions") + (description + "The libnumbertext library provides language-neutral @code{NUMBERTEXT} +and @code{MONEYTEXT} functions for LibreOffice Calc, available for C++ and +Java.") + (license (list lgpl3+ bsd-3)))) + (define-public libpagemaker (package (name "libpagemaker") -- cgit v1.2.3 From 52b0a352c376eaed4ae7cf109f66538d6ac0a859 Mon Sep 17 00:00:00 2001 From: Jonathan Brielmaier Date: Tue, 11 Sep 2018 07:59:11 +0200 Subject: gnu: libreoffice: Update to 6.1.0.3. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/libreoffice.scm (libreoffice): Update to 6.1.0.3. [source]: Correct indenting. [inputs]: Add libnumbertext and python-lxml. Signed-off-by: Ludovic Courtès --- gnu/packages/libreoffice.scm | 22 ++++++++++++---------- 1 file changed, 12 insertions(+), 10 deletions(-) (limited to 'gnu/packages/libreoffice.scm') diff --git a/gnu/packages/libreoffice.scm b/gnu/packages/libreoffice.scm index d81f8aa793..cf8082bcaa 100644 --- a/gnu/packages/libreoffice.scm +++ b/gnu/packages/libreoffice.scm @@ -926,19 +926,19 @@ (define-public libqxp (define-public libreoffice (package (name "libreoffice") - (version "6.0.6.2") + (version "6.1.0.3") (source (origin - (method url-fetch) - (uri + (method url-fetch) + (uri (string-append - "https://download.documentfoundation.org/libreoffice/src/" - (version-prefix version 3) "/libreoffice-" version ".tar.xz")) - (sha256 - (base32 - "13kaikaz65xw9a3hxbh245cnydjpy58np22c7s0s65pnmcq68rpi")) - (patches (search-patches "libreoffice-icu.patch" - "libreoffice-glm.patch")))) + "https://download.documentfoundation.org/libreoffice/src/" + (version-prefix version 3) "/libreoffice-" version ".tar.xz")) + (sha256 + (base32 + "1n7b6abc0bp9x8lddx60w5br444wf62mdlkqmfk2zmkmiwkcvv2l")) + (patches (search-patches "libreoffice-icu.patch" + "libreoffice-glm.patch")))) (build-system gnu-build-system) (native-inputs `(("bison" ,bison) @@ -979,6 +979,7 @@ (define-public libreoffice ("libltdl" ,libltdl) ("libmspub" ,libmspub) ("libmwaw" ,libmwaw) + ("libnumbertext" ,libnumbertext) ("libodfgen" ,libodfgen) ("libpagemaker" ,libpagemaker) ("libqxp" ,libqxp) @@ -1005,6 +1006,7 @@ (define-public libreoffice ("poppler" ,poppler) ("postgresql" ,postgresql) ("python" ,python) + ("python-lxml" ,python-lxml) ("redland" ,redland) ("sane-backends" ,sane-backends) ("unixodbc" ,unixodbc) -- cgit v1.2.3 From 002d73a01fa5c39930471b81bb8938ab22bf7d93 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sat, 15 Sep 2018 02:38:15 +0200 Subject: gnu: libwps: Update to 0.4.10. * gnu/packages/libreoffice.scm (libwps): Update to 0.4.10. --- gnu/packages/libreoffice.scm | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'gnu/packages/libreoffice.scm') diff --git a/gnu/packages/libreoffice.scm b/gnu/packages/libreoffice.scm index cf8082bcaa..90be51cd59 100644 --- a/gnu/packages/libreoffice.scm +++ b/gnu/packages/libreoffice.scm @@ -695,19 +695,19 @@ (define-public libstaroffice (define-public libwps (package (name "libwps") - (version "0.4.9") + (version "0.4.10") (source (origin (method url-fetch) (uri (string-append "mirror://sourceforge/" name "/" name "/" name "-" version "/" name "-" version ".tar.xz")) (sha256 (base32 - "08j9nxnrzxsnq35d9l824ad8w8az42fivaxn8ajl85dv6g3v1ghk")))) + "1ji9zd4wxmas03g8jyx0ih0amrqfazm5874a2v9rd7va50sf088l")))) (build-system gnu-build-system) (native-inputs `(("doxygen" ,doxygen) ("pkg-config" ,pkg-config))) - (propagated-inputs ; in Requires field of .pkg + (propagated-inputs ; in Requires field of .pkg `(("librevenge" ,librevenge))) (inputs `(("boost" ,boost) @@ -716,7 +716,7 @@ (define-public libwps (synopsis "Import library for Microsoft Works text documents") (description "Libwps is a library for importing files in the Microsoft Works word processor file format.") - (license (list mpl2.0 lgpl2.1+)))) ; dual license + (license (list mpl2.0 lgpl2.1+)))) ; dual license (define-public libzmf (package -- cgit v1.2.3 From 49c941b43b64c8d53cd73b0d7200309cffebcdaa Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sat, 15 Sep 2018 02:53:40 +0200 Subject: gnu: libmwaw: Update to 0.3.14. * gnu/packages/libreoffice.scm (libmwaw): Update to 0.3.14. --- gnu/packages/libreoffice.scm | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'gnu/packages/libreoffice.scm') diff --git a/gnu/packages/libreoffice.scm b/gnu/packages/libreoffice.scm index 90be51cd59..35d49b0216 100644 --- a/gnu/packages/libreoffice.scm +++ b/gnu/packages/libreoffice.scm @@ -645,19 +645,19 @@ (define-public libodfgen (define-public libmwaw (package (name "libmwaw") - (version "0.3.12") + (version "0.3.14") (source (origin (method url-fetch) (uri (string-append "mirror://sourceforge/" name "/" name "/" name "-" version "/" name "-" version ".tar.xz")) (sha256 (base32 - "1ryi1v38lgy5kv84fzjqkawidrg30y4hlqrz1v262792wzkad4bn")))) + "1s9wyf8pyh3fbazq2d2b6fgi7s7bid60viw2xbdkmn2ywlfbza5c")))) (build-system gnu-build-system) (native-inputs `(("doxygen" ,doxygen) ("pkg-config" ,pkg-config))) - (propagated-inputs ; in Requires field of .pkg + (propagated-inputs ; in Requires field of .pkg `(("librevenge" ,librevenge))) (inputs `(("boost" ,boost) @@ -667,7 +667,7 @@ (define-public libmwaw (description "Libmwaw contains some import filters for old Macintosh text documents (MacWrite, ClarisWorks, ... ) and for some graphics and spreadsheet documents.") - (license (list mpl2.0 lgpl2.1+)))) ; dual license + (license (list mpl2.0 lgpl2.1+)))) ; dual license (define-public libstaroffice (package -- cgit v1.2.3 From 02817df07e965c3413e6986966b3e607de47709c Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Thu, 27 Sep 2018 20:38:18 +0200 Subject: gnu: libreoffice: Update to 6.1.2.1. * gnu/packages/libreoffice.scm (libreoffice): Update to 6.1.2.1. --- 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 35d49b0216..68b4e265f3 100644 --- a/gnu/packages/libreoffice.scm +++ b/gnu/packages/libreoffice.scm @@ -926,7 +926,7 @@ (define-public libqxp (define-public libreoffice (package (name "libreoffice") - (version "6.1.0.3") + (version "6.1.2.1") (source (origin (method url-fetch) @@ -936,7 +936,7 @@ (define-public libreoffice (version-prefix version 3) "/libreoffice-" version ".tar.xz")) (sha256 (base32 - "1n7b6abc0bp9x8lddx60w5br444wf62mdlkqmfk2zmkmiwkcvv2l")) + "149ziasibplihfxlzafzcm4737ns30hg9175967b43c81yv5f335")) (patches (search-patches "libreoffice-icu.patch" "libreoffice-glm.patch")))) (build-system gnu-build-system) -- cgit v1.2.3 From 994bccd9443032141accede0e403cbfb62f6c63e Mon Sep 17 00:00:00 2001 From: Leo Famulari Date: Fri, 28 Sep 2018 23:30:55 -0400 Subject: gnu: LibreOffice: Fix "File > Open" crash on foreign distros. Fixes . * gnu/packages/libreoffice.scm (libreoffice)[build-system]: Use glib-or-gtk-build-system. [arguments]: Set '#:out-of-source #f'. --- gnu/packages/libreoffice.scm | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'gnu/packages/libreoffice.scm') diff --git a/gnu/packages/libreoffice.scm b/gnu/packages/libreoffice.scm index 68b4e265f3..881cf2008d 100644 --- a/gnu/packages/libreoffice.scm +++ b/gnu/packages/libreoffice.scm @@ -28,6 +28,7 @@ ;;; along with GNU Guix. If not, see . (define-module (gnu packages libreoffice) + #:use-module (guix build-system glib-or-gtk) #:use-module (guix build-system gnu) #:use-module (guix build-system trivial) #:use-module (guix download) @@ -939,7 +940,7 @@ (define-public libreoffice "149ziasibplihfxlzafzcm4737ns30hg9175967b43c81yv5f335")) (patches (search-patches "libreoffice-icu.patch" "libreoffice-glm.patch")))) - (build-system gnu-build-system) + (build-system glib-or-gtk-build-system) (native-inputs `(("bison" ,bison) ("cppunit" ,cppunit-1.14) @@ -1017,6 +1018,9 @@ (define-public libreoffice (arguments `(#:tests? #f ; Building the tests already fails. #:make-flags '("build-nocheck") ; Do not build unit tests, which fails. + ;; XXX Remove this if glib-or-gtk-build-system changes to in-source-tree + ;; builds by default. + #:out-of-source? #f #:phases (modify-phases %standard-phases (add-before 'configure 'prepare-src -- cgit v1.2.3 From 68afb9dccf91cc1a58b6db405befa176b191d809 Mon Sep 17 00:00:00 2001 From: Leo Famulari Date: Thu, 4 Oct 2018 11:30:23 -0400 Subject: build-system/glib-or-gtk: Build 'in-source' by default. * guix/build-system/glib-or-gtk.scm (glib-or-gtk-build): Change to 'out-of-source? #f'. * gnu/packages/audio.scm (audacity)[arguments]: Use the default 'out-of-source?' setting. * gnu/packages/libreoffice.scm (libreoffice): Likewise. --- gnu/packages/audio.scm | 5 ----- gnu/packages/libreoffice.scm | 3 --- guix/build-system/glib-or-gtk.scm | 2 +- 3 files changed, 1 insertion(+), 9 deletions(-) (limited to 'gnu/packages/libreoffice.scm') diff --git a/gnu/packages/audio.scm b/gnu/packages/audio.scm index 434efab953..17b6363f7c 100644 --- a/gnu/packages/audio.scm +++ b/gnu/packages/audio.scm @@ -413,11 +413,6 @@ (define-public audacity (substitute* "src/prefs/MidiIOPrefs.cpp" (("../../lib-src/portmidi/pm_common/portmidi.h") "portmidi.h")) #t))) - ;; The translation Makefile generation is performed improperly for - ;; out-of-tree builds. - ;; XXX This can be removed if the glib-or-gkt-build-system - ;; switches to #:out-of-source? #t. See . - #:out-of-source? #f ;; The test suite is not "well exercised" according to the developers, ;; and fails with various errors. See ;; . diff --git a/gnu/packages/libreoffice.scm b/gnu/packages/libreoffice.scm index 881cf2008d..e5ab5c5071 100644 --- a/gnu/packages/libreoffice.scm +++ b/gnu/packages/libreoffice.scm @@ -1018,9 +1018,6 @@ (define-public libreoffice (arguments `(#:tests? #f ; Building the tests already fails. #:make-flags '("build-nocheck") ; Do not build unit tests, which fails. - ;; XXX Remove this if glib-or-gtk-build-system changes to in-source-tree - ;; builds by default. - #:out-of-source? #f #:phases (modify-phases %standard-phases (add-before 'configure 'prepare-src diff --git a/guix/build-system/glib-or-gtk.scm b/guix/build-system/glib-or-gtk.scm index 621e68e0ab..fcd92f2334 100644 --- a/guix/build-system/glib-or-gtk.scm +++ b/guix/build-system/glib-or-gtk.scm @@ -112,7 +112,7 @@ (define* (glib-or-gtk-build store name inputs (configure-flags ''()) ;; Disable icon theme cache generation. (make-flags ''("gtk_update_icon_cache=true")) - (out-of-source? #t) + (out-of-source? #f) (tests? #t) (test-target "check") (parallel-build? #t) -- cgit v1.2.3 From 244a0d5aade838aebf0b63885a43747518a74ed6 Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Sat, 27 Oct 2018 12:50:19 +0200 Subject: gnu: libzmf: Disable '-Werror'. Fixes builds on i686-linux. * gnu/packages/libreoffice.scm (libzmf)[arguments]: New field. --- gnu/packages/libreoffice.scm | 3 +++ 1 file changed, 3 insertions(+) (limited to 'gnu/packages/libreoffice.scm') diff --git a/gnu/packages/libreoffice.scm b/gnu/packages/libreoffice.scm index e5ab5c5071..b6ff6dc528 100644 --- a/gnu/packages/libreoffice.scm +++ b/gnu/packages/libreoffice.scm @@ -731,6 +731,9 @@ (define-public libzmf (sha256 (base32 "08mg5kmkjrmqrd8j5rkzw9vdqlvibhb1ynp6bmfxnzq5rcq1l197")))) (build-system gnu-build-system) + (arguments + ;; A harmless 'sign-compare' error pops up on i686 so disable '-Werror'. + '(#:configure-flags '("--disable-werror"))) (inputs `(("boost" ,boost) ("icu4c" ,icu4c) -- cgit v1.2.3 From cddc044ce73ec6ec44279fabb629d6910e980e86 Mon Sep 17 00:00:00 2001 From: Eric Bavier Date: Tue, 30 Oct 2018 20:36:08 -0500 Subject: libreoffice: honor '--cores=...' during build. * gnu/packages/libreoffice.scm (libreoffice)[configure-flags]: Add '--with-parallelism' flag. --- gnu/packages/libreoffice.scm | 2 ++ 1 file changed, 2 insertions(+) (limited to 'gnu/packages/libreoffice.scm') diff --git a/gnu/packages/libreoffice.scm b/gnu/packages/libreoffice.scm index b6ff6dc528..bb72f69f40 100644 --- a/gnu/packages/libreoffice.scm +++ b/gnu/packages/libreoffice.scm @@ -1096,6 +1096,8 @@ (define (install-appdata app) (list "--enable-release-build" "--enable-verbose" + ;; Avoid using all cpu cores by default + (format #f "--with-parallelism=~d" (parallel-job-count)) "--disable-fetch-external" ; disable downloads "--with-system-libs" ; enable all --with-system-* flags (string-append "--with-boost-libdir=" -- cgit v1.2.3 From 02e2133bd2bf964125a070be57d172cc6171d4fb Mon Sep 17 00:00:00 2001 From: Leo Famulari Date: Tue, 6 Nov 2018 18:50:07 -0500 Subject: gnu: LibreOffice: Update to 6.1.3.2. * gnu/packages/libreoffice.scm (libreoffice): Update to 6.1.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 bb72f69f40..abf16acb3d 100644 --- a/gnu/packages/libreoffice.scm +++ b/gnu/packages/libreoffice.scm @@ -930,7 +930,7 @@ (define-public libqxp (define-public libreoffice (package (name "libreoffice") - (version "6.1.2.1") + (version "6.1.3.2") (source (origin (method url-fetch) @@ -940,7 +940,7 @@ (define-public libreoffice (version-prefix version 3) "/libreoffice-" version ".tar.xz")) (sha256 (base32 - "149ziasibplihfxlzafzcm4737ns30hg9175967b43c81yv5f335")) + "0i4gf3qi16fg7dxq2l4vhkwh4f5lx7xd1ilpzcw26vccqkv3hvyl")) (patches (search-patches "libreoffice-icu.patch" "libreoffice-glm.patch")))) (build-system glib-or-gtk-build-system) -- cgit v1.2.3 From 5895437c619bb40fd24d680571ae67e5229f01d5 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sat, 1 Sep 2018 11:01:25 +0200 Subject: gnu: ixion: Update to 0.14.1. * gnu/packages/libreoffice.scm (ixion): Update to 0.14.1. --- 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 2e05820f72..53e82e4013 100644 --- a/gnu/packages/libreoffice.scm +++ b/gnu/packages/libreoffice.scm @@ -81,7 +81,7 @@ (define-module (gnu packages libreoffice) (define-public ixion (package (name "ixion") - (version "0.13.0") + (version "0.14.1") (source (origin (method url-fetch) @@ -89,7 +89,7 @@ (define-public ixion version ".tar.xz")) (sha256 (base32 - "1rf76drzg593jzswwnh8kr2jangp8ylizqjspx57rld25g2n1qss")))) + "14gdd6div4l22vnz3jn2qjxgjly98ck6p8c1v7386c41rx7kilba")))) (build-system gnu-build-system) (native-inputs `(("pkg-config" ,pkg-config))) -- cgit v1.2.3 From b64665d1d31d618014f72be6a21a6a6b1825b2d7 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sat, 1 Sep 2018 11:01:47 +0200 Subject: gnu: orcus: Update to 0.14.1. * gnu/packages/libreoffice.scm (orcus): Update to 0.14.1. --- 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 53e82e4013..a26deec946 100644 --- a/gnu/packages/libreoffice.scm +++ b/gnu/packages/libreoffice.scm @@ -107,7 +107,7 @@ (define-public ixion (define-public orcus (package (name "orcus") - (version "0.13.4") + (version "0.14.1") (source (origin (method url-fetch) @@ -115,7 +115,7 @@ (define-public orcus name "-" version ".tar.xz")) (sha256 (base32 - "1r42waglxwmvvwl20fy49vzgfp1sis4j703f81iswzdyzqalq75p")))) + "1ays13a1x15j81dsrq0d3697v1bbqd3bfz3ajn6kb9d61y2drlgj")))) (build-system gnu-build-system) (native-inputs `(("pkg-config" ,pkg-config))) -- cgit v1.2.3 From 06dd29ef4f64109cbdaa611729eabe38ce1a5379 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sat, 1 Sep 2018 13:43:56 +0200 Subject: gnu: libetonyek: Fix build against mdds 1.4. * gnu/packages/libreoffice.scm (libetonyek)[arguments]: Add phase to substitute mdds version. Adjust #:configure-flags accordingly. --- gnu/packages/libreoffice.scm | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) (limited to 'gnu/packages/libreoffice.scm') diff --git a/gnu/packages/libreoffice.scm b/gnu/packages/libreoffice.scm index a26deec946..9d68ca8f0f 100644 --- a/gnu/packages/libreoffice.scm +++ b/gnu/packages/libreoffice.scm @@ -411,7 +411,16 @@ (define-public libetonyek "0bfq9rwm040xhh7b3v0gsdavwvnrz4hkwnhpggarxk70mr3j7jcx")))) (build-system gnu-build-system) (arguments - `(#:configure-flags '("--with-mdds=1.2"))) + `(#: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))))) (native-inputs `(("cppunit" ,cppunit) ("doxygen" ,doxygen) -- cgit v1.2.3 From b01e89593da524f131d3c38a9ac0eb95467455f0 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Fri, 23 Nov 2018 22:00:42 +0100 Subject: gnu: libreoffice: Fix build with MDDS 1.4 and Orcus 0.14. * gnu/packages/libreoffice.scm (libreoffice)[source](patches): Add two patches from Arch Linux. [arguments]: Add substitutions so the libraries are found. --- gnu/packages/libreoffice.scm | 37 +++++++++++++++++++++++++++++++++++-- 1 file changed, 35 insertions(+), 2 deletions(-) (limited to 'gnu/packages/libreoffice.scm') diff --git a/gnu/packages/libreoffice.scm b/gnu/packages/libreoffice.scm index 9d68ca8f0f..45e2f63767 100644 --- a/gnu/packages/libreoffice.scm +++ b/gnu/packages/libreoffice.scm @@ -959,8 +959,34 @@ (define-public libreoffice (sha256 (base32 "0i4gf3qi16fg7dxq2l4vhkwh4f5lx7xd1ilpzcw26vccqkv3hvyl")) - (patches (search-patches "libreoffice-icu.patch" - "libreoffice-glm.patch")))) + (patches + (append (list (origin + ;; Support newer versions of Orcus and MDDS. These patches + ;; are taken from upstream, but we use the patches from Arch + ;; because they are adapted for the release tarball. + ;; Note: remove the related substitutions below when these + ;; are no longer needed. + (method url-fetch) + (uri (string-append "https://git.archlinux.org/svntogit" + "/packages.git/plain/trunk/" + "0001-Update-orcus-to-0.14.0.patch?&id=" + "4002fa927f2a143bd2ec008a0c400b2ce9f2c8a7")) + (file-name "libreoffice-orcus.patch") + (sha256 + (base32 + "0v1knblrmfzkb4g9pm5mdnrmjib59bznvca1ygbwlap2ln1h4mk0"))) + (origin + (method url-fetch) + (uri (string-append "https://git.archlinux.org/svntogit" + "/packages.git/plain/trunk/" + "0001-Update-mdds-to-1.4.1.patch?&id=" + "4002fa927f2a143bd2ec008a0c400b2ce9f2c8a7")) + (file-name "libreoffice-mdds.patch") + (sha256 + (base32 + "0apbmammmp4pk473xiv5vk50r4c5gjvqzf9jkficksvz58q6114f")))) + (search-patches "libreoffice-icu.patch" + "libreoffice-glm.patch"))))) (build-system glib-or-gtk-build-system) (native-inputs `(("bison" ,bison) @@ -1049,6 +1075,13 @@ (define-public libreoffice "solenv/gbuild/platform/unxgcc.mk") (("/bin/sh") (which "sh"))) + ;; XXX: Adjust the checks for MDDS and liborcus to avoid having + ;; to re-bootstrap the whole thing. Remove this with the related + ;; patches above. + (substitute* "configure" + (("mdds-1.2 >= 1.2.3") "mdds-1.4 >= 1.4.1") + (("liborcus-0.13 >= 0.13.3") "liborcus-0.14 >= 0.14.0")) + ;; GPGME++ headers are installed in a gpgme++ subdirectory, but ;; files in "xmlsecurity/source/gpg/" and elsewhere expect to ;; find them on the include path without a prefix. -- cgit v1.2.3