[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
01/01: gnu: LibreOffice: Fix "File > Open" crash on foreign distros.
From: |
Leo Famulari |
Subject: |
01/01: gnu: LibreOffice: Fix "File > Open" crash on foreign distros. |
Date: |
Tue, 2 Oct 2018 14:46:21 -0400 (EDT) |
lfam pushed a commit to branch master
in repository guix.
commit 994bccd9443032141accede0e403cbfb62f6c63e
Author: Leo Famulari <address@hidden>
Date: Fri Sep 28 23:30:55 2018 -0400
gnu: LibreOffice: Fix "File > Open" crash on foreign distros.
Fixes <https://bugs.gnu.org/30642>.
* 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(-)
diff --git a/gnu/packages/libreoffice.scm b/gnu/packages/libreoffice.scm
index 68b4e26..881cf20 100644
--- a/gnu/packages/libreoffice.scm
+++ b/gnu/packages/libreoffice.scm
@@ -28,6 +28,7 @@
;;; along with GNU Guix. If not, see <http://www.gnu.org/licenses/>.
(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 @@ converting QuarkXPress file format. It supports versions
3.1 to 4.1.")
"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 @@ converting QuarkXPress file format. It supports versions
3.1 to 4.1.")
(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