From unknown Fri Jun 13 11:51:24 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#32692] Update LibreOffice to 6.1.0.3 Resent-From: Jonathan Brielmaier Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Tue, 11 Sep 2018 06:03:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 32692 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: To: 32692@debbugs.gnu.org X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.15366457712416 (code B ref -1); Tue, 11 Sep 2018 06:03:01 +0000 Received: (at submit) by debbugs.gnu.org; 11 Sep 2018 06:02:51 +0000 Received: from localhost ([127.0.0.1]:36046 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1fzbl7-0000cn-V8 for submit@debbugs.gnu.org; Tue, 11 Sep 2018 02:02:51 -0400 Received: from eggs.gnu.org ([208.118.235.92]:38548) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1fzbl6-0000ca-MV for submit@debbugs.gnu.org; Tue, 11 Sep 2018 02:02:45 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1fzbkv-0006jV-Ky for submit@debbugs.gnu.org; Tue, 11 Sep 2018 02:02:39 -0400 X-Spam-Checker-Version: SpamAssassin 3.3.2 (2011-06-06) on eggs.gnu.org X-Spam-Level: X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00,FREEMAIL_FROM autolearn=disabled version=3.3.2 Received: from lists.gnu.org ([2001:4830:134:3::11]:41235) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1fzbkv-0006io-GN for submit@debbugs.gnu.org; Tue, 11 Sep 2018 02:02:33 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:59526) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fzbku-0003Zh-8c for guix-patches@gnu.org; Tue, 11 Sep 2018 02:02:33 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1fzbkp-0006aI-UI for guix-patches@gnu.org; Tue, 11 Sep 2018 02:02:32 -0400 Received: from mout.web.de ([212.227.15.14]:59725) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1fzbkp-0006Wa-Iz for guix-patches@gnu.org; Tue, 11 Sep 2018 02:02:27 -0400 Received: from [192.168.178.109] ([89.247.127.112]) by smtp.web.de (mrweb004 [213.165.67.108]) with ESMTPSA (Nemesis) id 0MHJEh-1g3CNP3p23-00E7Tw for ; Tue, 11 Sep 2018 08:02:24 +0200 From: Jonathan Brielmaier Openpgp: preference=signencrypt Autocrypt: addr=jonathan.brielmaier@web.de; prefer-encrypt=mutual; keydata= xsBNBFLri3sBCAC70cM07IJUQ2ZJaIsJy3gIDyNhtbRCFuu5zpuzhbqQ/+CsNX7zFGRn47xx O/QnByEA5FIUspgXFaSX72tMGD1MnydJ6PO+i1OuspEcpneqtaIn74TWq/tJxwll0A8qwJXD HZ9r4lQrTsJkUkaWgIeWJfwy2bi/Eu2RwcgApa3fKCBXbNCIif1/LkM6Y9xH7vedYiSE6yDs Tuy5xQmZqkoRnpr/Gfc0JrNFRWZr99VNIHDvIkqczfuYHqfCTxndFbc9WjBj7XgumAi/4Il5 RaUHlBpG19IV0kO8OfJxyfLvOa1vjX0vTXt5WxpnCXk/r7Fux0BwImFbysCEjL+picGPABEB AAHNJGpvbnNnZXIgPGpvbmF0aGFuLmJyaWVsbWFpZXJAd2ViLmRlPsLAfgQTAQIAKAUCUuuL ewIbIwUJCWYBgAYLCQgHAwIGFQgCCQoLBBYCAwECHgECF4AACgkQ7PyDmItOS5/85Af+P+sR 77QOP7eJFJ8s0GPGWPTrf/Elewba3XQaRIi9WDrUs8UlM+cdk6et4//NCJkgF3I/YJL6mT4K yKqi8Q6kgbdjg4mIzQyTcZwQT4xxprEyBJjnCQmpeefT41eD11Dy24USKhWtdl+a2rUeSXzs z+bxTKegTHI5OZ4xVmB7xV9BQ4CiyYKq/t+gsmupvAXkJqVoQOO7YH3il+MI9dW7hvOlr5l7 8oRi8INfdBBkZaBK+Z8WLu7UjHTwl0C4ZG89Nz4L9qj2tPP99IVxeNxrX9xWUW9rgnaVVHBy xt1WRjSBfE5odDhwZmmABq0bNeiIuYERooSRqedsnmahV8vw/87ATQRS64t7AQgAsGeviVjk 7WAilEQrbjW5scL8U5nj2JictUTl9xVAJKebKfd1wYeEMditJI59qVbzF0QgvEmBdyH/8YVS fwZe1XWQfAGZQV3cS32IhXJqqg6YT2XEblW9rkTV5SWxs15FiMzVC+bkWY/xnqao+vjoq4rJ Funm49G4HN1yemibP2NmOjuwHE3QOhQPCjYuYkX6u26ARlwakmsj/qQ8fSHgAciVTH9VKPam 1ZzO47x3JM36bB7GmLaW+qij9k36Q+I6Wn6EuyYP56YBsLa0lTxumzu6VANdGnALdjJZRIDY p4jkgpXwUx+5szs85uSScDutmeSgnSAxptCn8ZR5AlFjfQARAQABwsBlBBgBAgAPBQJS64t7 AhsMBQkJZgGAAAoJEOz8g5iLTkufjZkIAINZXpGGMi4H1/9VagiRtY8A1fv55aYXnNROJ3w9 78bHEOAY0TwVm9gnSIXPzpBjRamBPOgiwXGhhb06V9qeowBzbGa/3Z1gUzWkbkQj8qpa9JaV SB3oBphKpZ0Sx/SF/5FHXiSucxE0lx/8PwDAbHTMsXFkzEMxJabxmNrN4/WJ+udCr7Yfd+q7 BjGzY/jKyj5irVyqcF8gn7pfvi9XUKi+fQr7e9dgCWBWp+yJyDC5VZYO3P38qjszph9lLFYP CpUQp+QO2WlHryydPmhE2AJxDOgCtpI3yCltWJ2ZG5q0LEilQLJ1ZAbZ5PAZK5bT8GSUdoKt 1AhLnzyFQXpb0ac= Message-ID: Date: Tue, 11 Sep 2018 08:02:24 +0200 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:60.0) Gecko/20100101 Thunderbird/60.0 MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="------------9FC8234D2A01FFDD13C36C72" Content-Language: en-US X-Provags-ID: V03:K1:lg8AuUtOyrz6jC624us1NtuEUYUmhQ4BC8Vlub0p9kIYMNWKgfa JlDKe2iczMZxOIEqeebGs9wzsBL7Qr/irHAOrztwcVRHGBK6sjGjV97CWmfOvHoUiqx+kO3 3Wv/BBfXJYMcAWUJOkUyjHeklQj4IMuKF2vtJZx8pm0d+Ndi2VZpZSFx/kJJhB9Cbi2jzSg vIoGYR1N4xtvgtXqcCvzA== X-UI-Out-Filterresults: notjunk:1;V01:K0:d+llXy12Lq4=:46TnyT+422psWvRWCURJow HlMD2OW6YvBL1ME9yqGiyFk396uTUpC0x0sAU9j3dBemrmm+LYpUSP4DO2GwCPve4fnKI6wnv eCJwiITQixUBd0ZprhvjJMrRX4TTMuSKIiZbYQZ7pPKxUwRM7r4Zowi+GfD6g8jq1qzSbS1oJ b3qAGkHEfOjGvDROTkRSxr3/JFZs2o/EZhyuVmTPP16i04u+YUSqvlF+9dfZ73h3IQKw45Pq8 ELE3o3uPbjbKU55Sd4QpAIKbqx/Sj8OJszc6s1fAjK8WC+HN2uRMLgcdrhKMXJjeKaoLyqaNU 6rV3N5XJt3O+5L66D7iecwMDZOzWbrmsvvHog/F7Pm3gSr1zLYy+nfIuf7Z7FgC3chnSBQu+I 9pijIzWkLApNWtgtjfptmuSNb19P8EVgbTyiNhe62sD5Yl9iYQP+uCmRPRubxUSwbt3KFMxy9 DFCyWZg+ioMXcnazU/XiIZlQzB/T9ngYsaRcFTDuqzD1HFA4oVBgVWXwsLlb6smg1/NBGeX4t 7swXj9SbjDOtS0thRC3Ix6kG/03PTspJ2BbfUGcNhj/SQIXMyipQAI6sfPiXRaBrah5tNhYAh pIdnWTq2bwhe7R02pA3Ef+eQm9M05wnnOmGMLALY7IG10S+MEXmd4tvkNUiMTi+zz50NRSncq CzrZJoef5y7i4jtnIaLad6Wh/vsbA+WB7yFt/TxuMRrPytFRR4O2RAfsjes/PxuRUStL54VCR RAjJeHcLpAGgqDJ+BcH357Tfh3OjaEG3Zo0kT9dcqN/S4XgV8m5HA/78U0Q= X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6.x X-Received-From: 2001:4830:134:3::11 X-Spam-Score: -4.1 (----) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -0.1 (/) This is a multi-part message in MIME format. --------------9FC8234D2A01FFDD13C36C72 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit Hi, the attached patches updates LibreOffice to 6.1.0.3. I packaged "libnumbertext" and verified that the functions "NUMBERTEXT" and "MONEYTEXT" working correct after you installed the required extension. I'm a little unsure if I have choosen the correct license for libnumbertext https://github.com/numbertext/libnumbertext/ Kind Regards Jonathan --------------9FC8234D2A01FFDD13C36C72 Content-Type: text/x-patch; name="0001-gnu-Add-libnumbertext.patch" Content-Transfer-Encoding: quoted-printable Content-Disposition: attachment; filename="0001-gnu-Add-libnumbertext.patch" =46rom 2fb37ecc93ae0dfa42f99a5a6f73a71113bc0f42 Mon Sep 17 00:00:00 2001 From: Jonathan Brielmaier Date: Tue, 11 Sep 2018 07:58:36 +0200 Subject: [PATCH 1/2] gnu: Add libnumbertext. * gnu/packages/libreoffice.scm (libnumbertext): New public variable. --- gnu/packages/libreoffice.scm | 28 +++++++++++++++++++++++++++- 1 file changed, 27 insertions(+), 1 deletion(-) diff --git a/gnu/packages/libreoffice.scm b/gnu/packages/libreoffice.scm index 3dc7a4bbf..2d1f9262d 100644 --- a/gnu/packages/libreoffice.scm +++ b/gnu/packages/libreoffice.scm @@ -10,6 +10,7 @@ ;;; Copyright =C2=A9 2017, 2018 Marius Bakke ;;; Copyright =C2=A9 2017 Rutger Helling ;;; Copyright =C2=A9 2018 Ricardo Wurmus +;;; Copyright =C2=A9 2018 Jonathan Brielmaier ;;; ;;; This file is part of GNU Guix. ;;; @@ -32,7 +33,7 @@ #: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-2)) #:use-module (guix packages) #:use-module (guix utils) #:use-module (ice-9 match) @@ -524,6 +525,31 @@ Aldus/Macromedia/Adobe FreeHand documents.") Microsoft Publisher documents of all versions.") (license mpl2.0))) =20 +(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"))= )) + (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 NUMBERTEXT and MONEYTEXT functions") + (description "Language-neutral NUMBERTEXT and MONEYTEXT functions fo= r +LibreOffice Calc, available for C++ and Java.") + (license (list lgpl3+ bsd-2)))) + (define-public libpagemaker (package (name "libpagemaker") --=20 2.16.4 --------------9FC8234D2A01FFDD13C36C72 Content-Type: text/x-patch; name="0002-gnu-libreoffice-Update-to-6.1.0.3.patch" Content-Transfer-Encoding: quoted-printable Content-Disposition: attachment; filename="0002-gnu-libreoffice-Update-to-6.1.0.3.patch" =46rom d00a06c9edb50759eb7228a1581c4ef9bc313e5d Mon Sep 17 00:00:00 2001 From: Jonathan Brielmaier Date: Tue, 11 Sep 2018 07:59:11 +0200 Subject: [PATCH 2/2] gnu: libreoffice: Update to 6.1.0.3. * gnu/packages/libreoffice.scm (libreoffice): Update to 6.1.0.3. [source]: Correct indenting. [inputs]: Add libnumbertext and python-lxml. --- gnu/packages/libreoffice.scm | 22 ++++++++++++---------- 1 file changed, 12 insertions(+), 10 deletions(-) diff --git a/gnu/packages/libreoffice.scm b/gnu/packages/libreoffice.scm index 2d1f9262d..fb49d18d5 100644 --- a/gnu/packages/libreoffice.scm +++ b/gnu/packages/libreoffice.scm @@ -922,19 +922,19 @@ converting QuarkXPress file format. It supports ve= rsions 3.1 to 4.1.") (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) @@ -975,6 +975,7 @@ converting QuarkXPress file format. It supports vers= ions 3.1 to 4.1.") ("libltdl" ,libltdl) ("libmspub" ,libmspub) ("libmwaw" ,libmwaw) + ("libnumbertext" ,libnumbertext) ("libodfgen" ,libodfgen) ("libpagemaker" ,libpagemaker) ("libqxp" ,libqxp) @@ -1001,6 +1002,7 @@ converting QuarkXPress file format. It supports ve= rsions 3.1 to 4.1.") ("poppler" ,poppler) ("postgresql" ,postgresql) ("python" ,python) + ("python-lxml" ,python-lxml) ("redland" ,redland) ("sane-backends" ,sane-backends) ("unixodbc" ,unixodbc) --=20 2.16.4 --------------9FC8234D2A01FFDD13C36C72-- From unknown Fri Jun 13 11:51:24 2025 MIME-Version: 1.0 X-Mailer: MIME-tools 5.505 (Entity 5.505) X-Loop: help-debbugs@gnu.org From: help-debbugs@gnu.org (GNU bug Tracking System) To: Jonathan Brielmaier Subject: bug#32692: closed (Re: [bug#32692] Update LibreOffice to 6.1.0.3) Message-ID: References: <87pnxk828o.fsf@gnu.org> X-Gnu-PR-Message: they-closed 32692 X-Gnu-PR-Package: guix-patches Reply-To: 32692@debbugs.gnu.org Date: Tue, 11 Sep 2018 15:49:03 +0000 Content-Type: multipart/mixed; boundary="----------=_1536680943-20585-1" This is a multi-part message in MIME format... ------------=_1536680943-20585-1 Content-Disposition: inline Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Your bug report #32692: Update LibreOffice to 6.1.0.3 which was filed against the guix-patches package, has been closed. The explanation is attached below, along with your original report. If you require more details, please reply to 32692@debbugs.gnu.org. --=20 32692: http://debbugs.gnu.org/cgi/bugreport.cgi?bug=3D32692 GNU Bug Tracking System Contact help-debbugs@gnu.org with problems ------------=_1536680943-20585-1 Content-Type: message/rfc822 Content-Disposition: inline Content-Transfer-Encoding: 7bit Received: (at 32692-done) by debbugs.gnu.org; 11 Sep 2018 15:48:08 +0000 Received: from localhost ([127.0.0.1]:37273 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1fzktb-0005Ks-NM for submit@debbugs.gnu.org; Tue, 11 Sep 2018 11:48:07 -0400 Received: from eggs.gnu.org ([208.118.235.92]:37166) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1fzkta-0005KS-FI for 32692-done@debbugs.gnu.org; Tue, 11 Sep 2018 11:48:06 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1fzktR-0000IL-R8 for 32692-done@debbugs.gnu.org; Tue, 11 Sep 2018 11:48:01 -0400 X-Spam-Checker-Version: SpamAssassin 3.3.2 (2011-06-06) on eggs.gnu.org X-Spam-Level: X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00 autolearn=disabled version=3.3.2 Received: from fencepost.gnu.org ([2001:4830:134:3::e]:42685) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fzktO-0000HM-1t; Tue, 11 Sep 2018 11:47:55 -0400 Received: from [193.50.110.124] (port=58984 helo=ribbon) by fencepost.gnu.org with esmtpsa (TLS1.2:RSA_AES_256_CBC_SHA1:256) (Exim 4.82) (envelope-from ) id 1fzktN-00049m-I0; Tue, 11 Sep 2018 11:47:53 -0400 From: ludo@gnu.org (Ludovic =?utf-8?Q?Court=C3=A8s?=) To: Jonathan Brielmaier Subject: Re: [bug#32692] Update LibreOffice to 6.1.0.3 References: Date: Tue, 11 Sep 2018 17:47:51 +0200 In-Reply-To: (Jonathan Brielmaier's message of "Tue, 11 Sep 2018 08:02:24 +0200") Message-ID: <87pnxk828o.fsf@gnu.org> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/26.1 (gnu/linux) MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="=-=-=" X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 2001:4830:134:3::e X-Spam-Score: -5.0 (-----) X-Debbugs-Envelope-To: 32692-done Cc: 32692-done@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -6.0 (------) --=-=-= Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable Hi, Jonathan Brielmaier skribis: > I'm a little unsure if I have choosen the correct license for libnumberte= xt > https://github.com/numbertext/libnumbertext/ AFAICS it=E2=80=99s BSD-3 + LGPLv3+. > From 2fb37ecc93ae0dfa42f99a5a6f73a71113bc0f42 Mon Sep 17 00:00:00 2001 > From: Jonathan Brielmaier > Date: Tue, 11 Sep 2018 07:58:36 +0200 > Subject: [PATCH 1/2] gnu: Add libnumbertext. > > * gnu/packages/libreoffice.scm (libnumbertext): New public variable. Applied with these changes: --=-=-= Content-Type: text/x-patch Content-Disposition: inline diff --git a/gnu/packages/libreoffice.scm b/gnu/packages/libreoffice.scm index 217e95126..d81f8aa79 100644 --- a/gnu/packages/libreoffice.scm +++ b/gnu/packages/libreoffice.scm @@ -33,7 +33,7 @@ #:use-module (guix download) #:use-module ((guix licenses) #:select (gpl2+ lgpl2.1+ lgpl3+ mpl1.1 mpl2.0 - non-copyleft x11-style bsd-2)) + non-copyleft x11-style bsd-3)) #:use-module (guix packages) #:use-module (guix utils) #:use-module (ice-9 match) @@ -547,10 +547,12 @@ Microsoft Publisher documents of all versions.") ("libtool" ,libtool) ("pkg-config" ,pkg-config))) (home-page "https://github.com/Numbertext/libnumbertext") - (synopsis "Language-neutral NUMBERTEXT and MONEYTEXT functions") - (description "Language-neutral NUMBERTEXT and MONEYTEXT functions for -LibreOffice Calc, available for C++ and Java.") - (license (list lgpl3+ bsd-2)))) + (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 --=-=-= Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable > From d00a06c9edb50759eb7228a1581c4ef9bc313e5d Mon Sep 17 00:00:00 2001 > From: Jonathan Brielmaier > Date: Tue, 11 Sep 2018 07:59:11 +0200 > Subject: [PATCH 2/2] gnu: libreoffice: Update to 6.1.0.3. > > * gnu/packages/libreoffice.scm (libreoffice): Update to 6.1.0.3. > [source]: Correct indenting. > [inputs]: Add libnumbertext and python-lxml. Pushed as 52b0a352c376eaed4ae7cf109f66538d6ac0a859. I speculatively chose to push it without waiting for the build to complete. If it turns out to break, we should revert it and work from there. Thanks! Ludo=E2=80=99. --=-=-=-- ------------=_1536680943-20585-1 Content-Type: message/rfc822 Content-Disposition: inline Content-Transfer-Encoding: 7bit Received: (at submit) by debbugs.gnu.org; 11 Sep 2018 06:02:51 +0000 Received: from localhost ([127.0.0.1]:36046 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1fzbl7-0000cn-V8 for submit@debbugs.gnu.org; Tue, 11 Sep 2018 02:02:51 -0400 Received: from eggs.gnu.org ([208.118.235.92]:38548) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1fzbl6-0000ca-MV for submit@debbugs.gnu.org; Tue, 11 Sep 2018 02:02:45 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1fzbkv-0006jV-Ky for submit@debbugs.gnu.org; Tue, 11 Sep 2018 02:02:39 -0400 X-Spam-Checker-Version: SpamAssassin 3.3.2 (2011-06-06) on eggs.gnu.org X-Spam-Level: X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00,FREEMAIL_FROM autolearn=disabled version=3.3.2 Received: from lists.gnu.org ([2001:4830:134:3::11]:41235) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1fzbkv-0006io-GN for submit@debbugs.gnu.org; Tue, 11 Sep 2018 02:02:33 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:59526) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fzbku-0003Zh-8c for guix-patches@gnu.org; Tue, 11 Sep 2018 02:02:33 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1fzbkp-0006aI-UI for guix-patches@gnu.org; Tue, 11 Sep 2018 02:02:32 -0400 Received: from mout.web.de ([212.227.15.14]:59725) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1fzbkp-0006Wa-Iz for guix-patches@gnu.org; Tue, 11 Sep 2018 02:02:27 -0400 Received: from [192.168.178.109] ([89.247.127.112]) by smtp.web.de (mrweb004 [213.165.67.108]) with ESMTPSA (Nemesis) id 0MHJEh-1g3CNP3p23-00E7Tw for ; Tue, 11 Sep 2018 08:02:24 +0200 To: guix-patches@gnu.org From: Jonathan Brielmaier Subject: Update LibreOffice to 6.1.0.3 Openpgp: preference=signencrypt Autocrypt: addr=jonathan.brielmaier@web.de; prefer-encrypt=mutual; keydata= xsBNBFLri3sBCAC70cM07IJUQ2ZJaIsJy3gIDyNhtbRCFuu5zpuzhbqQ/+CsNX7zFGRn47xx O/QnByEA5FIUspgXFaSX72tMGD1MnydJ6PO+i1OuspEcpneqtaIn74TWq/tJxwll0A8qwJXD HZ9r4lQrTsJkUkaWgIeWJfwy2bi/Eu2RwcgApa3fKCBXbNCIif1/LkM6Y9xH7vedYiSE6yDs Tuy5xQmZqkoRnpr/Gfc0JrNFRWZr99VNIHDvIkqczfuYHqfCTxndFbc9WjBj7XgumAi/4Il5 RaUHlBpG19IV0kO8OfJxyfLvOa1vjX0vTXt5WxpnCXk/r7Fux0BwImFbysCEjL+picGPABEB AAHNJGpvbnNnZXIgPGpvbmF0aGFuLmJyaWVsbWFpZXJAd2ViLmRlPsLAfgQTAQIAKAUCUuuL ewIbIwUJCWYBgAYLCQgHAwIGFQgCCQoLBBYCAwECHgECF4AACgkQ7PyDmItOS5/85Af+P+sR 77QOP7eJFJ8s0GPGWPTrf/Elewba3XQaRIi9WDrUs8UlM+cdk6et4//NCJkgF3I/YJL6mT4K yKqi8Q6kgbdjg4mIzQyTcZwQT4xxprEyBJjnCQmpeefT41eD11Dy24USKhWtdl+a2rUeSXzs z+bxTKegTHI5OZ4xVmB7xV9BQ4CiyYKq/t+gsmupvAXkJqVoQOO7YH3il+MI9dW7hvOlr5l7 8oRi8INfdBBkZaBK+Z8WLu7UjHTwl0C4ZG89Nz4L9qj2tPP99IVxeNxrX9xWUW9rgnaVVHBy xt1WRjSBfE5odDhwZmmABq0bNeiIuYERooSRqedsnmahV8vw/87ATQRS64t7AQgAsGeviVjk 7WAilEQrbjW5scL8U5nj2JictUTl9xVAJKebKfd1wYeEMditJI59qVbzF0QgvEmBdyH/8YVS fwZe1XWQfAGZQV3cS32IhXJqqg6YT2XEblW9rkTV5SWxs15FiMzVC+bkWY/xnqao+vjoq4rJ Funm49G4HN1yemibP2NmOjuwHE3QOhQPCjYuYkX6u26ARlwakmsj/qQ8fSHgAciVTH9VKPam 1ZzO47x3JM36bB7GmLaW+qij9k36Q+I6Wn6EuyYP56YBsLa0lTxumzu6VANdGnALdjJZRIDY p4jkgpXwUx+5szs85uSScDutmeSgnSAxptCn8ZR5AlFjfQARAQABwsBlBBgBAgAPBQJS64t7 AhsMBQkJZgGAAAoJEOz8g5iLTkufjZkIAINZXpGGMi4H1/9VagiRtY8A1fv55aYXnNROJ3w9 78bHEOAY0TwVm9gnSIXPzpBjRamBPOgiwXGhhb06V9qeowBzbGa/3Z1gUzWkbkQj8qpa9JaV SB3oBphKpZ0Sx/SF/5FHXiSucxE0lx/8PwDAbHTMsXFkzEMxJabxmNrN4/WJ+udCr7Yfd+q7 BjGzY/jKyj5irVyqcF8gn7pfvi9XUKi+fQr7e9dgCWBWp+yJyDC5VZYO3P38qjszph9lLFYP CpUQp+QO2WlHryydPmhE2AJxDOgCtpI3yCltWJ2ZG5q0LEilQLJ1ZAbZ5PAZK5bT8GSUdoKt 1AhLnzyFQXpb0ac= Message-ID: Date: Tue, 11 Sep 2018 08:02:24 +0200 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:60.0) Gecko/20100101 Thunderbird/60.0 MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="------------9FC8234D2A01FFDD13C36C72" Content-Language: en-US X-Provags-ID: V03:K1:lg8AuUtOyrz6jC624us1NtuEUYUmhQ4BC8Vlub0p9kIYMNWKgfa JlDKe2iczMZxOIEqeebGs9wzsBL7Qr/irHAOrztwcVRHGBK6sjGjV97CWmfOvHoUiqx+kO3 3Wv/BBfXJYMcAWUJOkUyjHeklQj4IMuKF2vtJZx8pm0d+Ndi2VZpZSFx/kJJhB9Cbi2jzSg vIoGYR1N4xtvgtXqcCvzA== X-UI-Out-Filterresults: notjunk:1;V01:K0:d+llXy12Lq4=:46TnyT+422psWvRWCURJow HlMD2OW6YvBL1ME9yqGiyFk396uTUpC0x0sAU9j3dBemrmm+LYpUSP4DO2GwCPve4fnKI6wnv eCJwiITQixUBd0ZprhvjJMrRX4TTMuSKIiZbYQZ7pPKxUwRM7r4Zowi+GfD6g8jq1qzSbS1oJ b3qAGkHEfOjGvDROTkRSxr3/JFZs2o/EZhyuVmTPP16i04u+YUSqvlF+9dfZ73h3IQKw45Pq8 ELE3o3uPbjbKU55Sd4QpAIKbqx/Sj8OJszc6s1fAjK8WC+HN2uRMLgcdrhKMXJjeKaoLyqaNU 6rV3N5XJt3O+5L66D7iecwMDZOzWbrmsvvHog/F7Pm3gSr1zLYy+nfIuf7Z7FgC3chnSBQu+I 9pijIzWkLApNWtgtjfptmuSNb19P8EVgbTyiNhe62sD5Yl9iYQP+uCmRPRubxUSwbt3KFMxy9 DFCyWZg+ioMXcnazU/XiIZlQzB/T9ngYsaRcFTDuqzD1HFA4oVBgVWXwsLlb6smg1/NBGeX4t 7swXj9SbjDOtS0thRC3Ix6kG/03PTspJ2BbfUGcNhj/SQIXMyipQAI6sfPiXRaBrah5tNhYAh pIdnWTq2bwhe7R02pA3Ef+eQm9M05wnnOmGMLALY7IG10S+MEXmd4tvkNUiMTi+zz50NRSncq CzrZJoef5y7i4jtnIaLad6Wh/vsbA+WB7yFt/TxuMRrPytFRR4O2RAfsjes/PxuRUStL54VCR RAjJeHcLpAGgqDJ+BcH357Tfh3OjaEG3Zo0kT9dcqN/S4XgV8m5HA/78U0Q= X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6.x X-Received-From: 2001:4830:134:3::11 X-Spam-Score: -4.1 (----) X-Debbugs-Envelope-To: submit X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -0.1 (/) This is a multi-part message in MIME format. --------------9FC8234D2A01FFDD13C36C72 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit Hi, the attached patches updates LibreOffice to 6.1.0.3. I packaged "libnumbertext" and verified that the functions "NUMBERTEXT" and "MONEYTEXT" working correct after you installed the required extension. I'm a little unsure if I have choosen the correct license for libnumbertext https://github.com/numbertext/libnumbertext/ Kind Regards Jonathan --------------9FC8234D2A01FFDD13C36C72 Content-Type: text/x-patch; name="0001-gnu-Add-libnumbertext.patch" Content-Transfer-Encoding: quoted-printable Content-Disposition: attachment; filename="0001-gnu-Add-libnumbertext.patch" =46rom 2fb37ecc93ae0dfa42f99a5a6f73a71113bc0f42 Mon Sep 17 00:00:00 2001 From: Jonathan Brielmaier Date: Tue, 11 Sep 2018 07:58:36 +0200 Subject: [PATCH 1/2] gnu: Add libnumbertext. * gnu/packages/libreoffice.scm (libnumbertext): New public variable. --- gnu/packages/libreoffice.scm | 28 +++++++++++++++++++++++++++- 1 file changed, 27 insertions(+), 1 deletion(-) diff --git a/gnu/packages/libreoffice.scm b/gnu/packages/libreoffice.scm index 3dc7a4bbf..2d1f9262d 100644 --- a/gnu/packages/libreoffice.scm +++ b/gnu/packages/libreoffice.scm @@ -10,6 +10,7 @@ ;;; Copyright =C2=A9 2017, 2018 Marius Bakke ;;; Copyright =C2=A9 2017 Rutger Helling ;;; Copyright =C2=A9 2018 Ricardo Wurmus +;;; Copyright =C2=A9 2018 Jonathan Brielmaier ;;; ;;; This file is part of GNU Guix. ;;; @@ -32,7 +33,7 @@ #: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-2)) #:use-module (guix packages) #:use-module (guix utils) #:use-module (ice-9 match) @@ -524,6 +525,31 @@ Aldus/Macromedia/Adobe FreeHand documents.") Microsoft Publisher documents of all versions.") (license mpl2.0))) =20 +(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"))= )) + (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 NUMBERTEXT and MONEYTEXT functions") + (description "Language-neutral NUMBERTEXT and MONEYTEXT functions fo= r +LibreOffice Calc, available for C++ and Java.") + (license (list lgpl3+ bsd-2)))) + (define-public libpagemaker (package (name "libpagemaker") --=20 2.16.4 --------------9FC8234D2A01FFDD13C36C72 Content-Type: text/x-patch; name="0002-gnu-libreoffice-Update-to-6.1.0.3.patch" Content-Transfer-Encoding: quoted-printable Content-Disposition: attachment; filename="0002-gnu-libreoffice-Update-to-6.1.0.3.patch" =46rom d00a06c9edb50759eb7228a1581c4ef9bc313e5d Mon Sep 17 00:00:00 2001 From: Jonathan Brielmaier Date: Tue, 11 Sep 2018 07:59:11 +0200 Subject: [PATCH 2/2] gnu: libreoffice: Update to 6.1.0.3. * gnu/packages/libreoffice.scm (libreoffice): Update to 6.1.0.3. [source]: Correct indenting. [inputs]: Add libnumbertext and python-lxml. --- gnu/packages/libreoffice.scm | 22 ++++++++++++---------- 1 file changed, 12 insertions(+), 10 deletions(-) diff --git a/gnu/packages/libreoffice.scm b/gnu/packages/libreoffice.scm index 2d1f9262d..fb49d18d5 100644 --- a/gnu/packages/libreoffice.scm +++ b/gnu/packages/libreoffice.scm @@ -922,19 +922,19 @@ converting QuarkXPress file format. It supports ve= rsions 3.1 to 4.1.") (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) @@ -975,6 +975,7 @@ converting QuarkXPress file format. It supports vers= ions 3.1 to 4.1.") ("libltdl" ,libltdl) ("libmspub" ,libmspub) ("libmwaw" ,libmwaw) + ("libnumbertext" ,libnumbertext) ("libodfgen" ,libodfgen) ("libpagemaker" ,libpagemaker) ("libqxp" ,libqxp) @@ -1001,6 +1002,7 @@ converting QuarkXPress file format. It supports ve= rsions 3.1 to 4.1.") ("poppler" ,poppler) ("postgresql" ,postgresql) ("python" ,python) + ("python-lxml" ,python-lxml) ("redland" ,redland) ("sane-backends" ,sane-backends) ("unixodbc" ,unixodbc) --=20 2.16.4 --------------9FC8234D2A01FFDD13C36C72-- ------------=_1536680943-20585-1--