From mboxrd@z Thu Jan 1 00:00:00 1970 From: Marius Bakke Subject: Re: Fixing LibreOffice on =?utf-8?Q?=E2=80=98core-updates?= =?utf-8?Q?=E2=80=99?= Date: Fri, 23 Nov 2018 22:16:32 +0100 Message-ID: <87mupzmr4f.fsf@fastmail.com> References: <87sgzym3d7.fsf@gnu.org> Mime-Version: 1.0 Content-Type: multipart/signed; boundary="==-=-="; micalg=pgp-sha512; protocol="application/pgp-signature" Return-path: Received: from eggs.gnu.org ([2001:4830:134:3::10]:48528) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gQItG-0002Bl-KC for guix-devel@gnu.org; Fri, 23 Nov 2018 16:21:35 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gQIoV-0001ZL-VD for guix-devel@gnu.org; Fri, 23 Nov 2018 16:16:39 -0500 In-Reply-To: <87sgzym3d7.fsf@gnu.org> List-Id: "Development of GNU Guix and the GNU System distribution." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-devel-bounces+gcggd-guix-devel=m.gmane.org@gnu.org Sender: "Guix-devel" To: Ludovic =?utf-8?Q?Court=C3=A8s?= , guix-devel@gnu.org --==-=-= Content-Type: multipart/mixed; boundary="=-=-=" --=-=-= Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable ludo@gnu.org (Ludovic Court=C3=A8s) writes: > Hello Guix, > > As briefly discussed with Marius on IRC, we both tried to fix > LibreOffice on =E2=80=98core-updates=E2=80=99. The initial problem is th= at 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/49a64f3bcf20a7909= ba2751349231d6652ded9cd2840e961b5164d09de3ffa63-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! I am currently building libreoffice with this patch (along with the package updates you mentioned): --=-=-= Content-Type: text/x-patch Content-Disposition: inline; filename=0001-gnu-libreoffice-Fix-build-with-MDDS-1.4-and-Orcus-0..patch Content-Transfer-Encoding: quoted-printable From=20a89c47bf5ea6850d15735d262a2497f7df20896e Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Fri, 23 Nov 2018 22:00:42 +0100 Subject: [PATCH] gnu: libreoffice: Fix build with MDDS 1.4 and Orcus 0.14. * gnu/packages/libreoffice.scm (libreoffice)[source](patches): Add two patc= hes from Arch Linux. [arguments]: Add substitutions so the libraries are found. =2D-- gnu/packages/libreoffice.scm | 37 ++++++++++++++++++++++++++++++++++-- 1 file changed, 35 insertions(+), 2 deletions(-) diff --git a/gnu/packages/libreoffice.scm b/gnu/packages/libreoffice.scm index cf2e0b0e0..1968f57a7 100644 =2D-- a/gnu/packages/libreoffice.scm +++ b/gnu/packages/libreoffice.scm @@ -959,8 +959,34 @@ converting QuarkXPress file format. It supports versi= ons 3.1 to 4.1.") (sha256 (base32 "0i4gf3qi16fg7dxq2l4vhkwh4f5lx7xd1ilpzcw26vccqkv3hvyl")) =2D (patches (search-patches "libreoffice-icu.patch" =2D "libreoffice-glm.patch")))) + (patches + (append (list (origin + ;; Support newer versions of Orcus and MDDS. Thes= e patches + ;; are taken from upstream, but we use the patches= from Arch + ;; because they are adapted for the release tarbal= l. + ;; Note: remove the related substitutions below wh= en these + ;; are no longer needed. + (method url-fetch) + (uri (string-append "https://git.archlinux.org/svn= togit" + "/packages.git/plain/trunk/" + "0001-Update-orcus-to-0.14.0.p= atch?&id=3D" + "4002fa927f2a143bd2ec008a0c400= b2ce9f2c8a7")) + (file-name "libreoffice-orcus.patch") + (sha256 + (base32 + "0v1knblrmfzkb4g9pm5mdnrmjib59bznvca1ygbwlap2ln1= h4mk0"))) + (origin + (method url-fetch) + (uri (string-append "https://git.archlinux.org/svn= togit" + "/packages.git/plain/trunk/" + "0001-Update-mdds-to-1.4.1.pat= ch?&id=3D" + "4002fa927f2a143bd2ec008a0c400= b2ce9f2c8a7")) + (file-name "libreoffice-mdds.patch") + (sha256 + (base32 + "0apbmammmp4pk473xiv5vk50r4c5gjvqzf9jkficksvz58q= 6114f")))) + (search-patches "libreoffice-icu.patch" + "libreoffice-glm.patch"))))) (build-system glib-or-gtk-build-system) (native-inputs `(("bison" ,bison) @@ -1049,6 +1075,13 @@ converting QuarkXPress file format. It supports ver= sions 3.1 to 4.1.") "solenv/gbuild/platform/unxgcc.mk") (("/bin/sh") (which "sh"))) =20 + ;; XXX: Adjust the checks for MDDS and liborcus to avoid ha= ving + ;; to re-bootstrap the whole thing. Remove this with the r= elated + ;; patches above. + (substitute* "configure" + (("mdds-1.2 >=3D 1.2.3") "mdds-1.4 >=3D 1.4.1") + (("liborcus-0.13 >=3D 0.13.3") "liborcus-0.14 >=3D 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. =2D-=20 2.19.2 --=-=-= Content-Type: text/plain So far so good. WDYT? --=-=-=-- --==-=-= Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQEzBAEBCgAdFiEEu7At3yzq9qgNHeZDoqBt8qM6VPoFAlv4bjAACgkQoqBt8qM6 VPrK+Af/dmBhm9KzIWTUfjvu0j6dX0gULqoEIg1POfRW1BwIr3JGcBqe2aLT+u9+ SSCDatuJqczijPoZYrRuRNvIT6POycT4+axVbuQUxUeySh5tOK3rEYwAzdImE9es 1K555EqFmlgHoIkfGSZozy0nM+mQxKCJX0hSJ6kyYpQY/iYiJp2g8oiJjBgx6eT2 9oyNHYyFfJnU4zCOOTAT6gxEwgnw0w1jj53wpvJ7tMYJQGSTsgmK5KrZuY9ryrSk rwGcv+gm10EKyXXwI3sygThP2eTCHOUGBYlFKoJDwZ8Q9MOSVNrjG9HsnzYGep3V MfCmkbx/gnrcFtYma3D8BMAFBVib/w== =VsJq -----END PGP SIGNATURE----- --==-=-=--