From: ludo@gnu.org (Ludovic Courtès)
To: guix-devel@gnu.org
Subject: Fixing LibreOffice on ‘core-updates’
Date: Sun, 18 Nov 2018 23:23:48 +0100 [thread overview]
Message-ID: <87sgzym3d7.fsf@gnu.org> (raw)
[-- Attachment #1: Type: text/plain, Size: 1081 bytes --]
Hello Guix,
As briefly discussed with Marius on IRC, we both tried to fix
LibreOffice on ‘core-updates’. The initial problem is that some of the
libraries it depends on fail to build with the new Boost.
I started upgrading the whole shebang but eventually got stuck with
LibreOffice itself, which fails to build like this:
--8<---------------cut here---------------start------------->8---
[build PAG] writer
[build MOD] embedserv
[build CUS] extras/glade
[build XSL] Classy_Red/styles.xml
make[1]: *** No rule to make target '/tmp/guix-build-libreoffice-6.2.0.0.alpha1.drv-0/libreoffice-6.2.0.0.alpha1/external/tarballs/49a64f3bcf20a7909ba2751349231d6652ded9cd2840e961b5164d09de3ffa63-opens___.ttf', needed by '/tmp/guix-build-libreoffice-6.2.0.0.alpha1.drv-0/libreoffice-6.2.0.0.alpha1/workdir/CustomTarget/extras/fonts/opens___.ttf'. Stop.
make[1]: *** Waiting for unfinished jobs....
make: *** [Makefile:286: build] Error 2
--8<---------------cut here---------------end--------------->8---
Below is what I have so far. Help welcome!
Ludo’.
[-- Attachment #2: Type: text/x-patch, Size: 8031 bytes --]
diff --git a/gnu/packages/boost.scm b/gnu/packages/boost.scm
index 897987f71c..de3fcd13ef 100644
--- a/gnu/packages/boost.scm
+++ b/gnu/packages/boost.scm
@@ -3,7 +3,7 @@
;;; Copyright © 2014, 2015, 2018 Mark H Weaver <mhw@netris.org>
;;; Copyright © 2015 Andreas Enge <andreas@enge.fr>
;;; Copyright © 2016 Eric Bavier <bavier@member.fsf.org>
-;;; Copyright © 2015 Ludovic Courtès <ludo@gnu.org>
+;;; Copyright © 2015, 2018 Ludovic Courtès <ludo@gnu.org>
;;; Copyright © 2017 Thomas Danckaert <post@thomasdanckaert.be>
;;; Copyright © 2018 Tobias Geerinckx-Rice <me@tobias.gr>
;;; Copyright © 2018 Arun Isaac <arunisaac@systemreboot.net>
@@ -36,6 +36,7 @@
#:use-module (guix build-system gnu)
#:use-module (guix build-system trivial)
#:use-module (gnu packages)
+ #:use-module (gnu packages autotools)
#:use-module (gnu packages compression)
#:use-module (gnu packages icu4c)
#:use-module (gnu packages perl)
@@ -182,18 +183,34 @@ Boost.Thread.")
(define-public mdds
(package
(name "mdds")
- (version "1.3.1")
+ (version "1.4.3")
+ (home-page "https://gitlab.com/mdds/mdds")
(source (origin
- (method url-fetch)
- (uri (string-append
- "http://kohei.us/files/mdds/src/mdds-" version ".tar.bz2"))
+ (method git-fetch)
+ (uri (git-reference (url home-page) (commit version)))
(sha256
(base32
- "18g511z1lgfxrga2ld9yr95phmyfbd3ymbv4q5g5lyjn4ljcvf6w"))))
+ "173m3x9g7bf6s86xpjcm7lpqb5231qchlk4smz7nfj9hrlzfzv7w"))
+ (file-name (git-file-name name version))
+ (modules '((guix build utils)))
+ (snippet
+ '(begin
+ (use-modules (guix build utils))
+ ;; Simply use 'autoreconf'.
+ (delete-file "autogen.sh")
+
+ ;; Install the .pc file to lib/pkgconfig, not
+ ;; share/pkgconfig.
+ (substitute* "Makefile.am"
+ (("^pkgconfdir =.*")
+ "pkgconfdir = $(libdir)/pkgconfig\n"))
+ #t))))
(build-system gnu-build-system)
+ (native-inputs
+ `(("autoconf" ,autoconf)
+ ("automake" ,automake)))
(propagated-inputs
`(("boost" ,boost))) ; inclusion of header files
- (home-page "https://gitlab.com/mdds/mdds")
(synopsis "Multi-dimensional C++ data structures and indexing algorithms")
(description "Mdds (multi-dimensional data structure) provides a
collection of multi-dimensional data structures and indexing algorithms
diff --git a/gnu/packages/libreoffice.scm b/gnu/packages/libreoffice.scm
index 2e05820f72..2ae09481d7 100644
--- a/gnu/packages/libreoffice.scm
+++ b/gnu/packages/libreoffice.scm
@@ -32,6 +32,7 @@
#:use-module (guix build-system gnu)
#:use-module (guix build-system trivial)
#:use-module (guix download)
+ #:use-module (guix git-download)
#:use-module ((guix licenses)
#:select (gpl2+ lgpl2.1+ lgpl3+ mpl1.1 mpl2.0
non-copyleft x11-style bsd-3))
@@ -81,22 +82,27 @@
(define-public ixion
(package
(name "ixion")
- (version "0.13.0")
- (source
- (origin
- (method url-fetch)
- (uri (string-append "http://kohei.us/files/ixion/src/libixion-"
- version ".tar.xz"))
- (sha256
- (base32
- "1rf76drzg593jzswwnh8kr2jangp8ylizqjspx57rld25g2n1qss"))))
+ (version "0.14.1")
+ (home-page "https://gitlab.com/ixion/ixion")
+ (source (origin
+ (method git-fetch)
+ (uri (git-reference (url home-page) (commit version)))
+ (sha256
+ (base32
+ "1kzdbcyda7p3np0ar073p7kcwdkvj7zh1hb1q939sq5gxd2cnmj4"))
+ (file-name (git-file-name name version))
+
+ ;; Use 'autoreconf'.
+ (snippet '(begin (delete-file "autogen.sh") #t))))
(build-system gnu-build-system)
(native-inputs
- `(("pkg-config" ,pkg-config)))
+ `(("pkg-config" ,pkg-config)
+ ("autoconf" ,autoconf)
+ ("automake" ,automake)
+ ("libtool" ,libtool)))
(inputs
`(("mdds" ,mdds)
("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
expressions stored in multiple named targets, or \"cells\". The cells can
@@ -107,24 +113,27 @@ their dependencies automatically upon calculation.")
(define-public orcus
(package
(name "orcus")
- (version "0.13.4")
- (source
- (origin
- (method url-fetch)
- (uri (string-append "http://kohei.us/files/" name "/src/lib"
- name "-" version ".tar.xz"))
- (sha256
- (base32
- "1r42waglxwmvvwl20fy49vzgfp1sis4j703f81iswzdyzqalq75p"))))
- (build-system gnu-build-system)
- (native-inputs
- `(("pkg-config" ,pkg-config)))
- (inputs
- `(("ixion" ,ixion)
- ("mdds" ,mdds)
- ("python" ,python)
- ("zlib" ,zlib)))
+ (version "0.14.1")
(home-page "https://gitlab.com/orcus/orcus")
+ (source
+ (origin (method git-fetch)
+ (uri (git-reference (url home-page) (commit version)))
+ (sha256
+ (base32
+ "0zk7ydp7b2xl9vfiyhrdzq3g86vrb706vjwa59qmin7xb1xgq9cm"))
+ (file-name (git-file-name name version))
+ (snippet '(begin (delete-file "autogen.sh") #t))))
+ (build-system gnu-build-system)
+ (native-inputs
+ `(("pkg-config" ,pkg-config)
+ ("autoconf" ,autoconf)
+ ("automake" ,automake)
+ ("libtool" ,libtool)))
+ (inputs
+ `(("ixion" ,ixion)
+ ("mdds" ,mdds)
+ ("python" ,python)
+ ("zlib" ,zlib)))
(synopsis "File import filter library for spreadsheet documents")
(description "Orcus is a library that provides a collection of standalone
file processing filters. It is currently focused on providing filters for
@@ -411,7 +420,7 @@ CorelDRAW documents of all versions.")
"0bfq9rwm040xhh7b3v0gsdavwvnrz4hkwnhpggarxk70mr3j7jcx"))))
(build-system gnu-build-system)
(arguments
- `(#:configure-flags '("--with-mdds=1.2")))
+ `(#:configure-flags '("--with-mdds=1.4")))
(native-inputs
`(("cppunit" ,cppunit)
("doxygen" ,doxygen)
@@ -939,7 +948,7 @@ converting QuarkXPress file format. It supports versions 3.1 to 4.1.")
(define-public libreoffice
(package
(name "libreoffice")
- (version "6.1.3.2")
+ (version "6.2.0.0.alpha1")
(source
(origin
(method url-fetch)
@@ -949,7 +958,15 @@ converting QuarkXPress file format. It supports versions 3.1 to 4.1.")
(version-prefix version 3) "/libreoffice-" version ".tar.xz"))
(sha256
(base32
- "0i4gf3qi16fg7dxq2l4vhkwh4f5lx7xd1ilpzcw26vccqkv3hvyl"))
+ "0hxfni3hq2lig5s283053sqv317w7j9djp3mgjman86nxk2h227s"))
+ ;; (modules '((guix build utils)))
+ ;; (snippet
+ ;; '(begin
+ ;; (use-modules (guix build utils))
+ ;; (substitute* "configure"
+ ;; (("mdds-1\\.2") "mdds-1.4")
+ ;; (("liborcus-0\\.13") "liborcus-0.14"))
+ ;; #t))
(patches (search-patches "libreoffice-icu.patch"
"libreoffice-glm.patch"))))
(build-system glib-or-gtk-build-system)
@@ -1006,6 +1023,7 @@ converting QuarkXPress file format. It supports versions 3.1 to 4.1.")
("libxt" ,libxt)
("libzmf" ,libzmf)
("lpsolve" ,lpsolve)
+ ("mariadb" ,mariadb)
("mdds" ,mdds)
("mythes" ,mythes)
("neon" ,neon)
next reply other threads:[~2018-11-18 22:23 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-11-18 22:23 Ludovic Courtès [this message]
2018-11-23 21:16 ` Fixing LibreOffice on ‘core-updates’ Marius Bakke
2018-11-25 14:26 ` Ludovic Courtès
2018-11-25 16:11 ` Julien Lepiller
2018-11-25 16:31 ` Marius Bakke
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: https://guix.gnu.org/
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=87sgzym3d7.fsf@gnu.org \
--to=ludo@gnu.org \
--cc=guix-devel@gnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://git.savannah.gnu.org/cgit/guix.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).