From mboxrd@z Thu Jan 1 00:00:00 1970 From: ludo@gnu.org (Ludovic =?utf-8?Q?Court=C3=A8s?=) Subject: Fixing LibreOffice on =?utf-8?Q?=E2=80=98core-updates=E2=80=99?= Date: Sun, 18 Nov 2018 23:23:48 +0100 Message-ID: <87sgzym3d7.fsf@gnu.org> Mime-Version: 1.0 Content-Type: multipart/mixed; boundary="=-=-=" Return-path: Received: from eggs.gnu.org ([2001:4830:134:3::10]:57041) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gOVTv-0004lV-KT for guix-devel@gnu.org; Sun, 18 Nov 2018 17:23:57 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gOVTu-0002El-Al for guix-devel@gnu.org; Sun, 18 Nov 2018 17:23:55 -0500 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: guix-devel@gnu.org --=-=-= Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable 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 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.al= pha1.drv-0/libreoffice-6.2.0.0.alpha1/external/tarballs/49a64f3bcf20a7909ba= 2751349231d6652ded9cd2840e961b5164d09de3ffa63-opens___.ttf', needed by '/tm= p/guix-build-libreoffice-6.2.0.0.alpha1.drv-0/libreoffice-6.2.0.0.alpha1/wo= rkdir/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=E2=80=99. --=-=-= Content-Type: text/x-patch; charset=utf-8 Content-Disposition: inline Content-Transfer-Encoding: quoted-printable 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 =C2=A9 2014, 2015, 2018 Mark H Weaver ;;; Copyright =C2=A9 2015 Andreas Enge ;;; Copyright =C2=A9 2016 Eric Bavier -;;; Copyright =C2=A9 2015 Ludovic Court=C3=A8s +;;; Copyright =C2=A9 2015, 2018 Ludovic Court=C3=A8s ;;; Copyright =C2=A9 2017 Thomas Danckaert ;;; Copyright =C2=A9 2018 Tobias Geerinckx-Rice ;;; Copyright =C2=A9 2018 Arun Isaac @@ -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.bz= 2")) + (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 =3D.*") + "pkgconfdir =3D $(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 algorith= ms") (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 standal= one 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=3D1.2"))) + `(#:configure-flags '("--with-mdds=3D1.4"))) (native-inputs `(("cppunit" ,cppunit) ("doxygen" ,doxygen) @@ -939,7 +948,7 @@ converting QuarkXPress file format. It supports versio= ns 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 versi= ons 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 vers= ions 3.1 to 4.1.") ("libxt" ,libxt) ("libzmf" ,libzmf) ("lpsolve" ,lpsolve) + ("mariadb" ,mariadb) ("mdds" ,mdds) ("mythes" ,mythes) ("neon" ,neon) --=-=-=--