* [bug#73439] [PATCH 00/10] Update libreoffice to its latest version.
@ 2024-09-23 12:15 Nicolas Graves via Guix-patches via
2024-09-23 12:37 ` [bug#73439] [PATCH 01/10] import: Add %libreoffice-updater Nicolas Graves via Guix-patches via
` (3 more replies)
0 siblings, 4 replies; 25+ messages in thread
From: Nicolas Graves via Guix-patches via @ 2024-09-23 12:15 UTC (permalink / raw)
To: 73439; +Cc: Nicolas Graves
This patch series updates libreoffice to its latest version. I used
local builds of derivations with ccache
(https://issues.guix.gnu.org/68315) to test developping and updating a
big package incrementally. Some commits can be squashed, but I think
we should at least keep separate 24.2.0.3, 24.2.6.2, 24.8.1.2. It also
adds an updater for the libreoffice package.
Nicolas Graves (10):
import: Add %libreoffice-updater.
gnu: libreoffice: Update to 24.2.0.3.
gnu: libreoffice: Update to 24.2.1.2.
gnu: libreoffice: Update to 24.2.2.2.
gnu: libreoffice: Update to 24.2.3.2.
gnu: libreoffice: Update to 24.2.4.2.
gnu: libreoffice: Update to 24.2.5.2.
gnu: libreoffice: Update to 24.2.6.2.
gnu: libreoffice: Update to 24.8.1.2.
gnu: hunspell-dictionaries: Update to 24.8.1.2.
Makefile.am | 1 +
gnu/packages/hunspell.scm | 7 ++-
gnu/packages/libreoffice.scm | 29 ++++++++---
guix/import/libreoffice.scm | 98 ++++++++++++++++++++++++++++++++++++
4 files changed, 125 insertions(+), 10 deletions(-)
create mode 100644 guix/import/libreoffice.scm
--
2.46.0
^ permalink raw reply [flat|nested] 25+ messages in thread
* [bug#73439] [PATCH 01/10] import: Add %libreoffice-updater.
2024-09-23 12:15 [bug#73439] [PATCH 00/10] Update libreoffice to its latest version Nicolas Graves via Guix-patches via
@ 2024-09-23 12:37 ` Nicolas Graves via Guix-patches via
2024-09-23 12:37 ` [bug#73439] [PATCH 02/10] gnu: libreoffice: Update to 24.2.0.3 Nicolas Graves via Guix-patches via
` (8 more replies)
2024-09-23 18:35 ` [bug#73439] [PATCH 00/10] Update libreoffice to its latest version Liliana Marie Prikler
` (2 subsequent siblings)
3 siblings, 9 replies; 25+ messages in thread
From: Nicolas Graves via Guix-patches via @ 2024-09-23 12:37 UTC (permalink / raw)
To: 73439; +Cc: Nicolas Graves
Change-Id: I481b1175db531c4fea4a57838fe190f679cd1a85
---
Makefile.am | 1 +
guix/import/libreoffice.scm | 98 +++++++++++++++++++++++++++++++++++++
2 files changed, 99 insertions(+)
create mode 100644 guix/import/libreoffice.scm
diff --git a/Makefile.am b/Makefile.am
index e9801283f8..e4e4fb5a19 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -306,6 +306,7 @@ MODULES = \
guix/import/json.scm \
guix/import/kde.scm \
guix/import/launchpad.scm \
+ guix/import/libreoffice.scm \
guix/import/minetest.scm \
guix/import/npm-binary.scm \
guix/import/opam.scm \
diff --git a/guix/import/libreoffice.scm b/guix/import/libreoffice.scm
new file mode 100644
index 0000000000..65d20f0432
--- /dev/null
+++ b/guix/import/libreoffice.scm
@@ -0,0 +1,98 @@
+;;; GNU Guix --- Functional package management for GNU
+;;; Copyright © 2024 Nicolas Graves <ngraves@ngraves.fr>
+;;;
+;;; This file is part of GNU Guix.
+;;;
+;;; GNU Guix is free software; you can redistribute it and/or modify it
+;;; under the terms of the GNU General Public License as published by
+;;; the Free Software Foundation; either version 3 of the License, or (at
+;;; your option) any later version.
+;;;
+;;; GNU Guix is distributed in the hope that it will be useful, but
+;;; WITHOUT ANY WARRANTY; without even the implied warranty of
+;;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+;;; GNU General Public License for more details.
+;;;
+;;; You should have received a copy of the GNU General Public License
+;;; along with GNU Guix. If not, see <http://www.gnu.org/licenses/>.
+
+(define-module (guix import libreoffice)
+ #:use-module (web client)
+ #:use-module (sxml match)
+ #:use-module (sxml simple)
+ #:use-module (guix i18n)
+ #:use-module (guix diagnostics)
+ #:use-module (guix packages)
+ #:use-module (guix upstream)
+ #:use-module (guix utils)
+ #:use-module (ice-9 textual-ports)
+ #:use-module (srfi srfi-26)
+ #:use-module (srfi srfi-71)
+ #:export (%libreoffice-updater))
+
+(define archive-prefix
+ "https://downloadarchive.documentfoundation.org/libreoffice/old/")
+(define libreoffice-latest-url (string-append archive-prefix "latest/src/"))
+
+(define (libreoffice-latest-version)
+ (let* ((response port (http-get libreoffice-latest-url
+ #:streaming? #t))
+ (content (get-string-all port))
+ ;; xml->sxml is not flexible enough for html.
+ ;; For instance, <img> tags don't have closing </img>.
+ ;; This trick preprocesses html to extract all <a> tags in
+ ;; a <body> wrapper, which sxml-match can handle well.
+ (xml (xml->sxml
+ (string-append
+ "<body><"
+ (string-join
+ (filter (cute string-prefix? "a " <>)
+ (string-split content #\<))
+ "</a><")
+ "></a></body>")
+ #:trim-whitespace? #t)))
+ (sxml-match
+ xml
+ ((*TOP*
+ (body
+ (a (@ (href "?C=N;O=D")) "Name")
+ (a (@ (href "?C=M;O=A")) "Last modified")
+ (a (@ (href "?C=S;O=A")) "Size")
+ (a (@ (href "/libreoffice/old/latest/")) "Parent Directory")
+ (a (@ (href ,link)) ,name)
+ . ,rest))
+ (if (and (string-prefix? "libreoffice-" name)
+ (string-suffix? ".tar.xz" name))
+ (string-drop
+ (string-drop-right name (string-length ".tar.xz"))
+ (string-length "libreoffice-"))
+ (raise
+ (formatted-message (G_ "Could not extract version from '~a'")
+ name)))))))
+
+(define* (latest-release package #:key (version #f))
+ "Return an <upstream-source> for the latest-release of PACKAGE."
+ (let* ((name (package-name package))
+ (version (or version (libreoffice-latest-version))))
+ (upstream-source
+ (package name)
+ (version version)
+ (urls (list
+ (string-append
+ archive-prefix version "/src/libreoffice-" version ".tar.xz")
+ (string-append
+ "https://download.documentfoundation.org/libreoffice/src/"
+ (version-prefix version 3) "/libreoffice-" version ".tar.xz"))))))
+
+(define (libreoffice-package? package)
+ "Return true if PACKAGE is LibreOffice."
+ (string=? (package-name package) "libreoffice"))
+
+(define %libreoffice-updater
+ (upstream-updater
+ (name 'libreoffice)
+ (description "Updater for Libreoffice package")
+ (pred libreoffice-package?)
+ (import latest-release)))
+
+;; libreoffice.scm ends here.
--
2.46.0
^ permalink raw reply related [flat|nested] 25+ messages in thread
* [bug#73439] [PATCH 02/10] gnu: libreoffice: Update to 24.2.0.3.
2024-09-23 12:37 ` [bug#73439] [PATCH 01/10] import: Add %libreoffice-updater Nicolas Graves via Guix-patches via
@ 2024-09-23 12:37 ` Nicolas Graves via Guix-patches via
2024-09-23 12:37 ` [bug#73439] [PATCH 03/10] gnu: libreoffice: Update to 24.2.1.2 Nicolas Graves via Guix-patches via
` (7 subsequent siblings)
8 siblings, 0 replies; 25+ messages in thread
From: Nicolas Graves via Guix-patches via @ 2024-09-23 12:37 UTC (permalink / raw)
To: 73439; +Cc: Nicolas Graves
* gnu/packages/libreoffice.scm (libreoffice): Update to 24.2.0.3.
Change-Id: I72e0ebb4d075c47ea168b181f969a97f9249150a
---
gnu/packages/libreoffice.scm | 29 +++++++++++++++++++++++------
1 file changed, 23 insertions(+), 6 deletions(-)
diff --git a/gnu/packages/libreoffice.scm b/gnu/packages/libreoffice.scm
index ed8dfd432b..70167d11ea 100644
--- a/gnu/packages/libreoffice.scm
+++ b/gnu/packages/libreoffice.scm
@@ -63,6 +63,7 @@ (define-module (gnu packages libreoffice)
#:use-module (gnu packages fontutils)
#:use-module (gnu packages freedesktop)
#:use-module (gnu packages game-development)
+ #:use-module (gnu packages gcc)
#:use-module (gnu packages ghostscript)
#:use-module (gnu packages gl)
#:use-module (gnu packages glib)
@@ -80,6 +81,7 @@ (define-module (gnu packages libreoffice)
#:use-module (gnu packages maths)
#:use-module (gnu packages nss)
#:use-module (gnu packages openldap)
+ #:use-module (gnu packages password-utils)
#:use-module (gnu packages pdf)
#:use-module (gnu packages perl)
#:use-module (gnu packages perl-compression)
@@ -891,16 +893,20 @@ (define dtoa
(define-public libreoffice
(package
(name "libreoffice")
- (version "7.6.7.2") ;keep in sync with hunspell dictionaries
+ (version "24.2.0.3") ;keep in sync with hunspell dictionaries
(source
(origin
(method url-fetch)
(uri
- (string-append
- "https://download.documentfoundation.org/libreoffice/src/"
- (version-prefix version 3) "/libreoffice-" version ".tar.xz"))
+ (list
+ (string-append
+ "https://download.documentfoundation.org/libreoffice/src/"
+ (version-prefix version 3) "/libreoffice-" version ".tar.xz")
+ (string-append
+ "https://downloadarchive.documentfoundation.org/libreoffice/old/"
+ version "/src/libreoffice-" version ".tar.xz")))
(sha256
- (base32 "159vbv4zhibfd4xjdamcqs4h0p3h5y79kcjwrmshvjhs23p55l3m"))))
+ (base32 "0s1m92rmizicd8jgxcjz0xsd79v148wkq0ac9yzz61x2ga8mdx0q"))))
(build-system glib-or-gtk-build-system)
(arguments
(list
@@ -961,6 +967,13 @@ (define-public libreoffice
"shell/source/unix/misc/senddoc.sh")
(("/usr/bin/xdg-open")
(search-input-file inputs "/bin/xdg-open")))
+
+ ;; Probably necessary because we use a custom GCC(>=12)/GLIBC.
+ (substitute* '("sal/rtl/math.cxx"
+ "sc/source/core/tool/math.cxx")
+ (("std::(fe[gs]etround|feclearexcept|fetestexcept)" all suffix)
+ suffix))
+
(setenv "CPPFLAGS" "-std=c++17")))
(add-after 'install 'reset-zip-timestamps
(lambda _
@@ -1083,12 +1096,14 @@ (define (install-python-script name)
cppunit
flex
frozen ;header-only library
+ gcc-12
pkg-config
python-wrapper
which
ziptime))
(inputs
- (list bluez
+ (list argon2
+ bluez
boost
box2d
clucene
@@ -1100,6 +1115,7 @@ (define (install-python-script name)
fontforge
gconf
glew
+ glibc
glm
gnupg
gobject-introspection
@@ -1168,6 +1184,7 @@ (define (install-python-script name)
xdg-utils
xmlsec-nss
zip
+ zxcvbn-c
zxing-cpp))
(home-page "https://www.libreoffice.org/")
(synopsis "Office suite")
--
2.46.0
^ permalink raw reply related [flat|nested] 25+ messages in thread
* [bug#73439] [PATCH 03/10] gnu: libreoffice: Update to 24.2.1.2.
2024-09-23 12:37 ` [bug#73439] [PATCH 01/10] import: Add %libreoffice-updater Nicolas Graves via Guix-patches via
2024-09-23 12:37 ` [bug#73439] [PATCH 02/10] gnu: libreoffice: Update to 24.2.0.3 Nicolas Graves via Guix-patches via
@ 2024-09-23 12:37 ` Nicolas Graves via Guix-patches via
2024-09-23 12:37 ` [bug#73439] [PATCH 04/10] gnu: libreoffice: Update to 24.2.2.2 Nicolas Graves via Guix-patches via
` (6 subsequent siblings)
8 siblings, 0 replies; 25+ messages in thread
From: Nicolas Graves via Guix-patches via @ 2024-09-23 12:37 UTC (permalink / raw)
To: 73439; +Cc: Nicolas Graves
* gnu/packages/libreoffice.scm (libreoffice): Update to 24.2.1.2.
Change-Id: I2ad06be08ae76c3d37d46c816caf90a23a5a21e8
---
gnu/packages/libreoffice.scm | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/gnu/packages/libreoffice.scm b/gnu/packages/libreoffice.scm
index 70167d11ea..61e74e9909 100644
--- a/gnu/packages/libreoffice.scm
+++ b/gnu/packages/libreoffice.scm
@@ -893,7 +893,7 @@ (define dtoa
(define-public libreoffice
(package
(name "libreoffice")
- (version "24.2.0.3") ;keep in sync with hunspell dictionaries
+ (version "24.2.1.2") ;keep in sync with hunspell dictionaries
(source
(origin
(method url-fetch)
@@ -906,7 +906,7 @@ (define-public libreoffice
"https://downloadarchive.documentfoundation.org/libreoffice/old/"
version "/src/libreoffice-" version ".tar.xz")))
(sha256
- (base32 "0s1m92rmizicd8jgxcjz0xsd79v148wkq0ac9yzz61x2ga8mdx0q"))))
+ (base32 "1a4zakrahmr86p9lmk19kyz810176wxpnmq6bbnmjl36ixz5gkrw"))))
(build-system glib-or-gtk-build-system)
(arguments
(list
--
2.46.0
^ permalink raw reply related [flat|nested] 25+ messages in thread
* [bug#73439] [PATCH 04/10] gnu: libreoffice: Update to 24.2.2.2.
2024-09-23 12:37 ` [bug#73439] [PATCH 01/10] import: Add %libreoffice-updater Nicolas Graves via Guix-patches via
2024-09-23 12:37 ` [bug#73439] [PATCH 02/10] gnu: libreoffice: Update to 24.2.0.3 Nicolas Graves via Guix-patches via
2024-09-23 12:37 ` [bug#73439] [PATCH 03/10] gnu: libreoffice: Update to 24.2.1.2 Nicolas Graves via Guix-patches via
@ 2024-09-23 12:37 ` Nicolas Graves via Guix-patches via
2024-09-23 12:37 ` [bug#73439] [PATCH 05/10] gnu: libreoffice: Update to 24.2.3.2 Nicolas Graves via Guix-patches via
` (5 subsequent siblings)
8 siblings, 0 replies; 25+ messages in thread
From: Nicolas Graves via Guix-patches via @ 2024-09-23 12:37 UTC (permalink / raw)
To: 73439; +Cc: Nicolas Graves
* gnu/packages/libreoffice.scm (libreoffice): Update to 24.2.2.2.
Change-Id: I5ba7a472ea3741af96999ef4c7318c39a27b819b
---
gnu/packages/libreoffice.scm | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/gnu/packages/libreoffice.scm b/gnu/packages/libreoffice.scm
index 61e74e9909..f42ed64edc 100644
--- a/gnu/packages/libreoffice.scm
+++ b/gnu/packages/libreoffice.scm
@@ -893,7 +893,7 @@ (define dtoa
(define-public libreoffice
(package
(name "libreoffice")
- (version "24.2.1.2") ;keep in sync with hunspell dictionaries
+ (version "24.2.2.2") ;keep in sync with hunspell dictionaries
(source
(origin
(method url-fetch)
@@ -906,7 +906,7 @@ (define-public libreoffice
"https://downloadarchive.documentfoundation.org/libreoffice/old/"
version "/src/libreoffice-" version ".tar.xz")))
(sha256
- (base32 "1a4zakrahmr86p9lmk19kyz810176wxpnmq6bbnmjl36ixz5gkrw"))))
+ (base32 "0pp4wnm434vxar79y9dm7qy66hqhhm5k84539ssr8p7n898ac1f2"))))
(build-system glib-or-gtk-build-system)
(arguments
(list
--
2.46.0
^ permalink raw reply related [flat|nested] 25+ messages in thread
* [bug#73439] [PATCH 05/10] gnu: libreoffice: Update to 24.2.3.2.
2024-09-23 12:37 ` [bug#73439] [PATCH 01/10] import: Add %libreoffice-updater Nicolas Graves via Guix-patches via
` (2 preceding siblings ...)
2024-09-23 12:37 ` [bug#73439] [PATCH 04/10] gnu: libreoffice: Update to 24.2.2.2 Nicolas Graves via Guix-patches via
@ 2024-09-23 12:37 ` Nicolas Graves via Guix-patches via
2024-09-23 12:37 ` [bug#73439] [PATCH 06/10] gnu: libreoffice: Update to 24.2.4.2 Nicolas Graves via Guix-patches via
` (4 subsequent siblings)
8 siblings, 0 replies; 25+ messages in thread
From: Nicolas Graves via Guix-patches via @ 2024-09-23 12:37 UTC (permalink / raw)
To: 73439; +Cc: Nicolas Graves
* gnu/packages/libreoffice.scm (libreoffice): Update to 24.2.3.2.
Change-Id: I81794408cff93c2770861dd38d9afb7c8d6d8ddf
---
gnu/packages/libreoffice.scm | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/gnu/packages/libreoffice.scm b/gnu/packages/libreoffice.scm
index f42ed64edc..ec3d005c2a 100644
--- a/gnu/packages/libreoffice.scm
+++ b/gnu/packages/libreoffice.scm
@@ -893,7 +893,7 @@ (define dtoa
(define-public libreoffice
(package
(name "libreoffice")
- (version "24.2.2.2") ;keep in sync with hunspell dictionaries
+ (version "24.2.3.2") ;keep in sync with hunspell dictionaries
(source
(origin
(method url-fetch)
@@ -906,7 +906,7 @@ (define-public libreoffice
"https://downloadarchive.documentfoundation.org/libreoffice/old/"
version "/src/libreoffice-" version ".tar.xz")))
(sha256
- (base32 "0pp4wnm434vxar79y9dm7qy66hqhhm5k84539ssr8p7n898ac1f2"))))
+ (base32 "0r0y92c7i42iiimzg9b1pyldnswh28j8p0lmilz7j1sxv2f0bqpn"))))
(build-system glib-or-gtk-build-system)
(arguments
(list
--
2.46.0
^ permalink raw reply related [flat|nested] 25+ messages in thread
* [bug#73439] [PATCH 06/10] gnu: libreoffice: Update to 24.2.4.2.
2024-09-23 12:37 ` [bug#73439] [PATCH 01/10] import: Add %libreoffice-updater Nicolas Graves via Guix-patches via
` (3 preceding siblings ...)
2024-09-23 12:37 ` [bug#73439] [PATCH 05/10] gnu: libreoffice: Update to 24.2.3.2 Nicolas Graves via Guix-patches via
@ 2024-09-23 12:37 ` Nicolas Graves via Guix-patches via
2024-09-23 12:37 ` [bug#73439] [PATCH 07/10] gnu: libreoffice: Update to 24.2.5.2 Nicolas Graves via Guix-patches via
` (3 subsequent siblings)
8 siblings, 0 replies; 25+ messages in thread
From: Nicolas Graves via Guix-patches via @ 2024-09-23 12:37 UTC (permalink / raw)
To: 73439; +Cc: Nicolas Graves
* gnu/packages/libreoffice.scm (libreoffice): Update to 24.2.4.2.
Change-Id: Ia7a891c643885c7c4be5d9154fd3f7002f7c7cfb
---
gnu/packages/libreoffice.scm | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/gnu/packages/libreoffice.scm b/gnu/packages/libreoffice.scm
index ec3d005c2a..a43ce74deb 100644
--- a/gnu/packages/libreoffice.scm
+++ b/gnu/packages/libreoffice.scm
@@ -893,7 +893,7 @@ (define dtoa
(define-public libreoffice
(package
(name "libreoffice")
- (version "24.2.3.2") ;keep in sync with hunspell dictionaries
+ (version "24.2.4.2") ;keep in sync with hunspell dictionaries
(source
(origin
(method url-fetch)
@@ -906,7 +906,7 @@ (define-public libreoffice
"https://downloadarchive.documentfoundation.org/libreoffice/old/"
version "/src/libreoffice-" version ".tar.xz")))
(sha256
- (base32 "0r0y92c7i42iiimzg9b1pyldnswh28j8p0lmilz7j1sxv2f0bqpn"))))
+ (base32 "10zfnmaxnkiwv0ryxbxyfs8199iw13picid6f1f5yb5ga2jq0ccy"))))
(build-system glib-or-gtk-build-system)
(arguments
(list
--
2.46.0
^ permalink raw reply related [flat|nested] 25+ messages in thread
* [bug#73439] [PATCH 07/10] gnu: libreoffice: Update to 24.2.5.2.
2024-09-23 12:37 ` [bug#73439] [PATCH 01/10] import: Add %libreoffice-updater Nicolas Graves via Guix-patches via
` (4 preceding siblings ...)
2024-09-23 12:37 ` [bug#73439] [PATCH 06/10] gnu: libreoffice: Update to 24.2.4.2 Nicolas Graves via Guix-patches via
@ 2024-09-23 12:37 ` Nicolas Graves via Guix-patches via
2024-09-23 12:37 ` [bug#73439] [PATCH 08/10] gnu: libreoffice: Update to 24.2.6.2 Nicolas Graves via Guix-patches via
` (2 subsequent siblings)
8 siblings, 0 replies; 25+ messages in thread
From: Nicolas Graves via Guix-patches via @ 2024-09-23 12:37 UTC (permalink / raw)
To: 73439; +Cc: Nicolas Graves
* gnu/packages/libreoffice.scm (libreoffice): Update to 24.2.5.2.
Change-Id: I30a54911d16b242ba3b8bd8eace77a8bf22ef3d4
---
gnu/packages/libreoffice.scm | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/gnu/packages/libreoffice.scm b/gnu/packages/libreoffice.scm
index a43ce74deb..a5e26e5e55 100644
--- a/gnu/packages/libreoffice.scm
+++ b/gnu/packages/libreoffice.scm
@@ -893,7 +893,7 @@ (define dtoa
(define-public libreoffice
(package
(name "libreoffice")
- (version "24.2.4.2") ;keep in sync with hunspell dictionaries
+ (version "24.2.5.2") ;keep in sync with hunspell dictionaries
(source
(origin
(method url-fetch)
@@ -906,7 +906,7 @@ (define-public libreoffice
"https://downloadarchive.documentfoundation.org/libreoffice/old/"
version "/src/libreoffice-" version ".tar.xz")))
(sha256
- (base32 "10zfnmaxnkiwv0ryxbxyfs8199iw13picid6f1f5yb5ga2jq0ccy"))))
+ (base32 "03halzc9w4z8pfs8krpswp2qzrqq9rhnmms8v8ny88am87vy85lw"))))
(build-system glib-or-gtk-build-system)
(arguments
(list
--
2.46.0
^ permalink raw reply related [flat|nested] 25+ messages in thread
* [bug#73439] [PATCH 08/10] gnu: libreoffice: Update to 24.2.6.2.
2024-09-23 12:37 ` [bug#73439] [PATCH 01/10] import: Add %libreoffice-updater Nicolas Graves via Guix-patches via
` (5 preceding siblings ...)
2024-09-23 12:37 ` [bug#73439] [PATCH 07/10] gnu: libreoffice: Update to 24.2.5.2 Nicolas Graves via Guix-patches via
@ 2024-09-23 12:37 ` Nicolas Graves via Guix-patches via
2024-09-23 12:37 ` [bug#73439] [PATCH 09/10] gnu: libreoffice: Update to 24.8.1.2 Nicolas Graves via Guix-patches via
2024-09-23 12:37 ` [bug#73439] [PATCH 10/10] gnu: hunspell-dictionaries: " Nicolas Graves via Guix-patches via
8 siblings, 0 replies; 25+ messages in thread
From: Nicolas Graves via Guix-patches via @ 2024-09-23 12:37 UTC (permalink / raw)
To: 73439; +Cc: Nicolas Graves
* gnu/packages/libreoffice.scm (libreoffice): Update to 24.2.6.2.
Change-Id: I18046f093118f13d3617e7549f90fb0931c10d85
---
gnu/packages/libreoffice.scm | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/gnu/packages/libreoffice.scm b/gnu/packages/libreoffice.scm
index a5e26e5e55..a288136e06 100644
--- a/gnu/packages/libreoffice.scm
+++ b/gnu/packages/libreoffice.scm
@@ -893,7 +893,7 @@ (define dtoa
(define-public libreoffice
(package
(name "libreoffice")
- (version "24.2.5.2") ;keep in sync with hunspell dictionaries
+ (version "24.2.6.2") ;keep in sync with hunspell dictionaries
(source
(origin
(method url-fetch)
@@ -906,7 +906,7 @@ (define-public libreoffice
"https://downloadarchive.documentfoundation.org/libreoffice/old/"
version "/src/libreoffice-" version ".tar.xz")))
(sha256
- (base32 "03halzc9w4z8pfs8krpswp2qzrqq9rhnmms8v8ny88am87vy85lw"))))
+ (base32 "1cqxw745kzm81b2nvfpl5n2sq1k9y25y596wvjsnaq394bq4vspn"))))
(build-system glib-or-gtk-build-system)
(arguments
(list
--
2.46.0
^ permalink raw reply related [flat|nested] 25+ messages in thread
* [bug#73439] [PATCH 09/10] gnu: libreoffice: Update to 24.8.1.2.
2024-09-23 12:37 ` [bug#73439] [PATCH 01/10] import: Add %libreoffice-updater Nicolas Graves via Guix-patches via
` (6 preceding siblings ...)
2024-09-23 12:37 ` [bug#73439] [PATCH 08/10] gnu: libreoffice: Update to 24.2.6.2 Nicolas Graves via Guix-patches via
@ 2024-09-23 12:37 ` Nicolas Graves via Guix-patches via
2024-09-23 12:37 ` [bug#73439] [PATCH 10/10] gnu: hunspell-dictionaries: " Nicolas Graves via Guix-patches via
8 siblings, 0 replies; 25+ messages in thread
From: Nicolas Graves via Guix-patches via @ 2024-09-23 12:37 UTC (permalink / raw)
To: 73439; +Cc: Nicolas Graves
* gnu/packages/libreoffice.scm (libreoffice): Update to 24.8.1.2.
Change-Id: I95ba7d5a5d1475b9c502051ecb076734a320c059
---
gnu/packages/libreoffice.scm | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/gnu/packages/libreoffice.scm b/gnu/packages/libreoffice.scm
index a288136e06..2d038cdf0d 100644
--- a/gnu/packages/libreoffice.scm
+++ b/gnu/packages/libreoffice.scm
@@ -893,7 +893,7 @@ (define dtoa
(define-public libreoffice
(package
(name "libreoffice")
- (version "24.2.6.2") ;keep in sync with hunspell dictionaries
+ (version "24.8.1.2") ;keep in sync with hunspell dictionaries
(source
(origin
(method url-fetch)
@@ -906,7 +906,7 @@ (define-public libreoffice
"https://downloadarchive.documentfoundation.org/libreoffice/old/"
version "/src/libreoffice-" version ".tar.xz")))
(sha256
- (base32 "1cqxw745kzm81b2nvfpl5n2sq1k9y25y596wvjsnaq394bq4vspn"))))
+ (base32 "1rqii01i0295ch2xc9mddqpvlpjapk3m6nra4mhxfc38da1qci48"))))
(build-system glib-or-gtk-build-system)
(arguments
(list
--
2.46.0
^ permalink raw reply related [flat|nested] 25+ messages in thread
* [bug#73439] [PATCH 10/10] gnu: hunspell-dictionaries: Update to 24.8.1.2.
2024-09-23 12:37 ` [bug#73439] [PATCH 01/10] import: Add %libreoffice-updater Nicolas Graves via Guix-patches via
` (7 preceding siblings ...)
2024-09-23 12:37 ` [bug#73439] [PATCH 09/10] gnu: libreoffice: Update to 24.8.1.2 Nicolas Graves via Guix-patches via
@ 2024-09-23 12:37 ` Nicolas Graves via Guix-patches via
8 siblings, 0 replies; 25+ messages in thread
From: Nicolas Graves via Guix-patches via @ 2024-09-23 12:37 UTC (permalink / raw)
To: 73439; +Cc: Nicolas Graves
* gnu/packages/hunspell.scm (hunspell-dictionaries): Update to 24.8.1.2.
(hunspell-ditionary)[source]<origin>: Change url, anongit returns
gateway http errors 504.
Change-Id: Ie7b548f1e7a2342fdde2aea3740e2634c0ba70e3
---
gnu/packages/hunspell.scm | 7 +++----
1 file changed, 3 insertions(+), 4 deletions(-)
diff --git a/gnu/packages/hunspell.scm b/gnu/packages/hunspell.scm
index 8c076de3c4..09ada5a3d3 100644
--- a/gnu/packages/hunspell.scm
+++ b/gnu/packages/hunspell.scm
@@ -309,18 +309,17 @@ (define* (hunspell-dictionary dict-name full-name #:key synopsis home-page licen
(#\_ #\-)
(chr chr))
(string-downcase dict-name))))
- (version "7.6.7.2")
+ (version "24.8.1.2")
(source
(origin
(method git-fetch)
(uri (git-reference
- (url (string-append "https://anongit.freedesktop.org/git/"
- "libreoffice/dictionaries.git/"))
+ (url "https://github.com/LibreOffice/dictionaries")
(commit
(string-append "libreoffice-" version))))
(file-name (git-file-name "libreoffice-dictionaries" version))
(sha256
- (base32 "1f54z1kmpwv9s5a9jdgf97m43nhwbmsar0i6rri3qkgf3kkgz1f7"))))
+ (base32 "089w9i91wy2hx07vqkg0d65zr1k2mnwyijh4dhl6xbpcv20f6ayw"))))
(build-system trivial-build-system)
(native-inputs
`(("source" ,source)))
--
2.46.0
^ permalink raw reply related [flat|nested] 25+ messages in thread
* [bug#73439] [PATCH 00/10] Update libreoffice to its latest version.
2024-09-23 12:15 [bug#73439] [PATCH 00/10] Update libreoffice to its latest version Nicolas Graves via Guix-patches via
2024-09-23 12:37 ` [bug#73439] [PATCH 01/10] import: Add %libreoffice-updater Nicolas Graves via Guix-patches via
@ 2024-09-23 18:35 ` Liliana Marie Prikler
2024-09-24 14:29 ` Nicolas Graves via Guix-patches via
2024-09-25 7:40 ` [bug#73439] [PATCH v2 1/5] import: Add %libreoffice-updater Nicolas Graves via Guix-patches via
2024-09-26 7:50 ` [bug#73439] [PATCH v3 1/4] import: Add %libreoffice-updater Nicolas Graves via Guix-patches via
3 siblings, 1 reply; 25+ messages in thread
From: Liliana Marie Prikler @ 2024-09-23 18:35 UTC (permalink / raw)
To: Nicolas Graves, 73439
Am Montag, dem 23.09.2024 um 14:15 +0200 schrieb Nicolas Graves:
> This patch series updates libreoffice to its latest version. I used
> local builds of derivations with ccache
> (https://issues.guix.gnu.org/68315) to test developping and updating
> a big package incrementally. Some commits can be squashed, but I
> think we should at least keep separate 24.2.0.3, 24.2.6.2, 24.8.1.2.
> It also adds an updater for the libreoffice package.
Why those steps? Should we perhaps have multiple packages with some
older versions for the time being?
> Nicolas Graves (10):
> import: Add %libreoffice-updater.
LGTM
> gnu: libreoffice: Update to 24.2.0.3.
> gnu: libreoffice: Update to 24.2.1.2.
> gnu: libreoffice: Update to 24.2.2.2.
> gnu: libreoffice: Update to 24.2.3.2.
> gnu: libreoffice: Update to 24.2.4.2.
> gnu: libreoffice: Update to 24.2.5.2.
> gnu: libreoffice: Update to 24.2.6.2.
> gnu: libreoffice: Update to 24.8.1.2.
> gnu: hunspell-dictionaries: Update to 24.8.1.2.
As noted in the comment hunspell and libreoffice ought to be kept in
sync. IIUC, this would mean updating hunspell-dictionaries in lockstep
with libreoffice on those intermediate steps as well, no?
Cheers
^ permalink raw reply [flat|nested] 25+ messages in thread
* [bug#73439] [PATCH 00/10] Update libreoffice to its latest version.
2024-09-23 18:35 ` [bug#73439] [PATCH 00/10] Update libreoffice to its latest version Liliana Marie Prikler
@ 2024-09-24 14:29 ` Nicolas Graves via Guix-patches via
2024-09-24 17:03 ` Liliana Marie Prikler
0 siblings, 1 reply; 25+ messages in thread
From: Nicolas Graves via Guix-patches via @ 2024-09-24 14:29 UTC (permalink / raw)
To: Liliana Marie Prikler, 73439
On 2024-09-23 20:35, Liliana Marie Prikler wrote:
> Am Montag, dem 23.09.2024 um 14:15 +0200 schrieb Nicolas Graves:
>> This patch series updates libreoffice to its latest version. I used
>> local builds of derivations with ccache
>> (https://issues.guix.gnu.org/68315) to test developping and updating
>> a big package incrementally. Some commits can be squashed, but I
>> think we should at least keep separate 24.2.0.3, 24.2.6.2, 24.8.1.2.
>> It also adds an updater for the libreoffice package.
> Why those steps? Should we perhaps have multiple packages with some
> older versions for the time being?
24.2.0.3 is a big update which adds packages and substitutions, I think
it's good to keep those changes in one commit.
On the libreoffice website, they have only two libreoffice downloads:
https://www.libreoffice.org/download/download-libreoffice
24.8.1.2 is the current stable release
24.2.6.2 is the previous stable release (~= LTS)
I don't see libreoffice bringing tremendous changes from version to
version, I'm not sure having two versions is necessary.
That said, it is very doable to have two with a -lts version.
>
>> Nicolas Graves (10):
>> import: Add %libreoffice-updater.
> LGTM
>> gnu: libreoffice: Update to 24.2.0.3.
>> gnu: libreoffice: Update to 24.2.1.2.
>> gnu: libreoffice: Update to 24.2.2.2.
>> gnu: libreoffice: Update to 24.2.3.2.
>> gnu: libreoffice: Update to 24.2.4.2.
>> gnu: libreoffice: Update to 24.2.5.2.
>> gnu: libreoffice: Update to 24.2.6.2.
>> gnu: libreoffice: Update to 24.8.1.2.
>> gnu: hunspell-dictionaries: Update to 24.8.1.2.
> As noted in the comment hunspell and libreoffice ought to be kept in
> sync. IIUC, this would mean updating hunspell-dictionaries in lockstep
> with libreoffice on those intermediate steps as well, no?
I haven't delved that deep in this but I think it's not necessary. The
reason is that they are mostly dictionaries whose updates are
uncorrelated to what's happenning in libreoffice itself but rather edge
cases in languages. They are unlikely to break user experience, plus it
will be for only a few commits. At the end of the series seems fine to me.
--
Best regards,
Nicolas Graves
^ permalink raw reply [flat|nested] 25+ messages in thread
* [bug#73439] [PATCH 00/10] Update libreoffice to its latest version.
2024-09-24 14:29 ` Nicolas Graves via Guix-patches via
@ 2024-09-24 17:03 ` Liliana Marie Prikler
2024-09-25 7:52 ` Nicolas Graves via Guix-patches via
0 siblings, 1 reply; 25+ messages in thread
From: Liliana Marie Prikler @ 2024-09-24 17:03 UTC (permalink / raw)
To: Nicolas Graves, 73439
Am Dienstag, dem 24.09.2024 um 16:29 +0200 schrieb Nicolas Graves:
> On 2024-09-23 20:35, Liliana Marie Prikler wrote:
>
> > Am Montag, dem 23.09.2024 um 14:15 +0200 schrieb Nicolas Graves:
> > > This patch series updates libreoffice to its latest version. I
> > > used
> > > local builds of derivations with ccache
> > > (https://issues.guix.gnu.org/68315) to test developping and
> > > updating
> > > a big package incrementally. Some commits can be squashed, but I
> > > think we should at least keep separate 24.2.0.3, 24.2.6.2,
> > > 24.8.1.2.
> > > It also adds an updater for the libreoffice package.
> > Why those steps? Should we perhaps have multiple packages with
> > some older versions for the time being?
>
> 24.2.0.3 is a big update which adds packages and substitutions, I
> think it's good to keep those changes in one commit.
Fair enough.
> On the libreoffice website, they have only two libreoffice downloads:
> https://www.libreoffice.org/download/download-libreoffice
>
> 24.8.1.2 is the current stable release
> 24.2.6.2 is the previous stable release (~= LTS)
>
> I don't see libreoffice bringing tremendous changes from version to
> version, I'm not sure having two versions is necessary.
>
> That said, it is very doable to have two with a -lts version.
I agree, having an LTS is probably enough. So can we cut this short by
keeping the separate ones you mention and also keep 24.2.6.2 as the
LTS?
> >
> > > Nicolas Graves (10):
> > > import: Add %libreoffice-updater.
> > LGTM
> > > gnu: libreoffice: Update to 24.2.0.3.
> > > gnu: libreoffice: Update to 24.2.1.2.
> > > gnu: libreoffice: Update to 24.2.2.2.
> > > gnu: libreoffice: Update to 24.2.3.2.
> > > gnu: libreoffice: Update to 24.2.4.2.
> > > gnu: libreoffice: Update to 24.2.5.2.
> > > gnu: libreoffice: Update to 24.2.6.2.
> > > gnu: libreoffice: Update to 24.8.1.2.
> > > gnu: hunspell-dictionaries: Update to 24.8.1.2.
> > As noted in the comment hunspell and libreoffice ought to be kept
> > in sync. IIUC, this would mean updating hunspell-dictionaries in
> > lockstep with libreoffice on those intermediate steps as well, no?
>
> I haven't delved that deep in this but I think it's not necessary.
> The reason is that they are mostly dictionaries whose updates are
> uncorrelated to what's happenning in libreoffice itself but rather
> edge cases in languages. They are unlikely to break user experience,
> plus it will be for only a few commits. At the end of the series
> seems fine to me.
Fair enough.
Cheers
^ permalink raw reply [flat|nested] 25+ messages in thread
* [bug#73439] [PATCH v2 1/5] import: Add %libreoffice-updater.
2024-09-23 12:15 [bug#73439] [PATCH 00/10] Update libreoffice to its latest version Nicolas Graves via Guix-patches via
2024-09-23 12:37 ` [bug#73439] [PATCH 01/10] import: Add %libreoffice-updater Nicolas Graves via Guix-patches via
2024-09-23 18:35 ` [bug#73439] [PATCH 00/10] Update libreoffice to its latest version Liliana Marie Prikler
@ 2024-09-25 7:40 ` Nicolas Graves via Guix-patches via
2024-09-25 7:40 ` [bug#73439] [PATCH v2 2/5] gnu: libreoffice: Update to 24.2.0.3 Nicolas Graves via Guix-patches via
` (3 more replies)
2024-09-26 7:50 ` [bug#73439] [PATCH v3 1/4] import: Add %libreoffice-updater Nicolas Graves via Guix-patches via
3 siblings, 4 replies; 25+ messages in thread
From: Nicolas Graves via Guix-patches via @ 2024-09-25 7:40 UTC (permalink / raw)
To: 73439; +Cc: Nicolas Graves, liliana.priker
Change-Id: I481b1175db531c4fea4a57838fe190f679cd1a85
---
Makefile.am | 1 +
guix/import/libreoffice.scm | 98 +++++++++++++++++++++++++++++++++++++
2 files changed, 99 insertions(+)
create mode 100644 guix/import/libreoffice.scm
diff --git a/Makefile.am b/Makefile.am
index e9801283f8..e4e4fb5a19 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -306,6 +306,7 @@ MODULES = \
guix/import/json.scm \
guix/import/kde.scm \
guix/import/launchpad.scm \
+ guix/import/libreoffice.scm \
guix/import/minetest.scm \
guix/import/npm-binary.scm \
guix/import/opam.scm \
diff --git a/guix/import/libreoffice.scm b/guix/import/libreoffice.scm
new file mode 100644
index 0000000000..65d20f0432
--- /dev/null
+++ b/guix/import/libreoffice.scm
@@ -0,0 +1,98 @@
+;;; GNU Guix --- Functional package management for GNU
+;;; Copyright © 2024 Nicolas Graves <ngraves@ngraves.fr>
+;;;
+;;; This file is part of GNU Guix.
+;;;
+;;; GNU Guix is free software; you can redistribute it and/or modify it
+;;; under the terms of the GNU General Public License as published by
+;;; the Free Software Foundation; either version 3 of the License, or (at
+;;; your option) any later version.
+;;;
+;;; GNU Guix is distributed in the hope that it will be useful, but
+;;; WITHOUT ANY WARRANTY; without even the implied warranty of
+;;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+;;; GNU General Public License for more details.
+;;;
+;;; You should have received a copy of the GNU General Public License
+;;; along with GNU Guix. If not, see <http://www.gnu.org/licenses/>.
+
+(define-module (guix import libreoffice)
+ #:use-module (web client)
+ #:use-module (sxml match)
+ #:use-module (sxml simple)
+ #:use-module (guix i18n)
+ #:use-module (guix diagnostics)
+ #:use-module (guix packages)
+ #:use-module (guix upstream)
+ #:use-module (guix utils)
+ #:use-module (ice-9 textual-ports)
+ #:use-module (srfi srfi-26)
+ #:use-module (srfi srfi-71)
+ #:export (%libreoffice-updater))
+
+(define archive-prefix
+ "https://downloadarchive.documentfoundation.org/libreoffice/old/")
+(define libreoffice-latest-url (string-append archive-prefix "latest/src/"))
+
+(define (libreoffice-latest-version)
+ (let* ((response port (http-get libreoffice-latest-url
+ #:streaming? #t))
+ (content (get-string-all port))
+ ;; xml->sxml is not flexible enough for html.
+ ;; For instance, <img> tags don't have closing </img>.
+ ;; This trick preprocesses html to extract all <a> tags in
+ ;; a <body> wrapper, which sxml-match can handle well.
+ (xml (xml->sxml
+ (string-append
+ "<body><"
+ (string-join
+ (filter (cute string-prefix? "a " <>)
+ (string-split content #\<))
+ "</a><")
+ "></a></body>")
+ #:trim-whitespace? #t)))
+ (sxml-match
+ xml
+ ((*TOP*
+ (body
+ (a (@ (href "?C=N;O=D")) "Name")
+ (a (@ (href "?C=M;O=A")) "Last modified")
+ (a (@ (href "?C=S;O=A")) "Size")
+ (a (@ (href "/libreoffice/old/latest/")) "Parent Directory")
+ (a (@ (href ,link)) ,name)
+ . ,rest))
+ (if (and (string-prefix? "libreoffice-" name)
+ (string-suffix? ".tar.xz" name))
+ (string-drop
+ (string-drop-right name (string-length ".tar.xz"))
+ (string-length "libreoffice-"))
+ (raise
+ (formatted-message (G_ "Could not extract version from '~a'")
+ name)))))))
+
+(define* (latest-release package #:key (version #f))
+ "Return an <upstream-source> for the latest-release of PACKAGE."
+ (let* ((name (package-name package))
+ (version (or version (libreoffice-latest-version))))
+ (upstream-source
+ (package name)
+ (version version)
+ (urls (list
+ (string-append
+ archive-prefix version "/src/libreoffice-" version ".tar.xz")
+ (string-append
+ "https://download.documentfoundation.org/libreoffice/src/"
+ (version-prefix version 3) "/libreoffice-" version ".tar.xz"))))))
+
+(define (libreoffice-package? package)
+ "Return true if PACKAGE is LibreOffice."
+ (string=? (package-name package) "libreoffice"))
+
+(define %libreoffice-updater
+ (upstream-updater
+ (name 'libreoffice)
+ (description "Updater for Libreoffice package")
+ (pred libreoffice-package?)
+ (import latest-release)))
+
+;; libreoffice.scm ends here.
--
2.46.0
^ permalink raw reply related [flat|nested] 25+ messages in thread
* [bug#73439] [PATCH v2 2/5] gnu: libreoffice: Update to 24.2.0.3.
2024-09-25 7:40 ` [bug#73439] [PATCH v2 1/5] import: Add %libreoffice-updater Nicolas Graves via Guix-patches via
@ 2024-09-25 7:40 ` Nicolas Graves via Guix-patches via
2024-09-25 7:40 ` [bug#73439] [PATCH v2 3/5] gnu: libreoffice: Update to 24.8.1.2 Nicolas Graves via Guix-patches via
` (2 subsequent siblings)
3 siblings, 0 replies; 25+ messages in thread
From: Nicolas Graves via Guix-patches via @ 2024-09-25 7:40 UTC (permalink / raw)
To: 73439; +Cc: Nicolas Graves, liliana.priker
* gnu/packages/libreoffice.scm (libreoffice): Update to 24.2.0.3.
Change-Id: I72e0ebb4d075c47ea168b181f969a97f9249150a
---
gnu/packages/libreoffice.scm | 29 +++++++++++++++++++++++------
1 file changed, 23 insertions(+), 6 deletions(-)
diff --git a/gnu/packages/libreoffice.scm b/gnu/packages/libreoffice.scm
index ed8dfd432b..70167d11ea 100644
--- a/gnu/packages/libreoffice.scm
+++ b/gnu/packages/libreoffice.scm
@@ -63,6 +63,7 @@ (define-module (gnu packages libreoffice)
#:use-module (gnu packages fontutils)
#:use-module (gnu packages freedesktop)
#:use-module (gnu packages game-development)
+ #:use-module (gnu packages gcc)
#:use-module (gnu packages ghostscript)
#:use-module (gnu packages gl)
#:use-module (gnu packages glib)
@@ -80,6 +81,7 @@ (define-module (gnu packages libreoffice)
#:use-module (gnu packages maths)
#:use-module (gnu packages nss)
#:use-module (gnu packages openldap)
+ #:use-module (gnu packages password-utils)
#:use-module (gnu packages pdf)
#:use-module (gnu packages perl)
#:use-module (gnu packages perl-compression)
@@ -891,16 +893,20 @@ (define dtoa
(define-public libreoffice
(package
(name "libreoffice")
- (version "7.6.7.2") ;keep in sync with hunspell dictionaries
+ (version "24.2.0.3") ;keep in sync with hunspell dictionaries
(source
(origin
(method url-fetch)
(uri
- (string-append
- "https://download.documentfoundation.org/libreoffice/src/"
- (version-prefix version 3) "/libreoffice-" version ".tar.xz"))
+ (list
+ (string-append
+ "https://download.documentfoundation.org/libreoffice/src/"
+ (version-prefix version 3) "/libreoffice-" version ".tar.xz")
+ (string-append
+ "https://downloadarchive.documentfoundation.org/libreoffice/old/"
+ version "/src/libreoffice-" version ".tar.xz")))
(sha256
- (base32 "159vbv4zhibfd4xjdamcqs4h0p3h5y79kcjwrmshvjhs23p55l3m"))))
+ (base32 "0s1m92rmizicd8jgxcjz0xsd79v148wkq0ac9yzz61x2ga8mdx0q"))))
(build-system glib-or-gtk-build-system)
(arguments
(list
@@ -961,6 +967,13 @@ (define-public libreoffice
"shell/source/unix/misc/senddoc.sh")
(("/usr/bin/xdg-open")
(search-input-file inputs "/bin/xdg-open")))
+
+ ;; Probably necessary because we use a custom GCC(>=12)/GLIBC.
+ (substitute* '("sal/rtl/math.cxx"
+ "sc/source/core/tool/math.cxx")
+ (("std::(fe[gs]etround|feclearexcept|fetestexcept)" all suffix)
+ suffix))
+
(setenv "CPPFLAGS" "-std=c++17")))
(add-after 'install 'reset-zip-timestamps
(lambda _
@@ -1083,12 +1096,14 @@ (define (install-python-script name)
cppunit
flex
frozen ;header-only library
+ gcc-12
pkg-config
python-wrapper
which
ziptime))
(inputs
- (list bluez
+ (list argon2
+ bluez
boost
box2d
clucene
@@ -1100,6 +1115,7 @@ (define (install-python-script name)
fontforge
gconf
glew
+ glibc
glm
gnupg
gobject-introspection
@@ -1168,6 +1184,7 @@ (define (install-python-script name)
xdg-utils
xmlsec-nss
zip
+ zxcvbn-c
zxing-cpp))
(home-page "https://www.libreoffice.org/")
(synopsis "Office suite")
--
2.46.0
^ permalink raw reply related [flat|nested] 25+ messages in thread
* [bug#73439] [PATCH v2 3/5] gnu: libreoffice: Update to 24.8.1.2.
2024-09-25 7:40 ` [bug#73439] [PATCH v2 1/5] import: Add %libreoffice-updater Nicolas Graves via Guix-patches via
2024-09-25 7:40 ` [bug#73439] [PATCH v2 2/5] gnu: libreoffice: Update to 24.2.0.3 Nicolas Graves via Guix-patches via
@ 2024-09-25 7:40 ` Nicolas Graves via Guix-patches via
2024-09-25 7:40 ` [bug#73439] [PATCH v2 4/5] gnu: hunspell-dictionaries: " Nicolas Graves via Guix-patches via
2024-09-25 7:40 ` [bug#73439] [PATCH v2 5/5] gnu: Add libreoffice-lts Nicolas Graves via Guix-patches via
3 siblings, 0 replies; 25+ messages in thread
From: Nicolas Graves via Guix-patches via @ 2024-09-25 7:40 UTC (permalink / raw)
To: 73439; +Cc: Nicolas Graves, liliana.priker
* gnu/packages/libreoffice.scm (libreoffice): Update to 24.8.1.2.
Change-Id: I95ba7d5a5d1475b9c502051ecb076734a320c059
---
gnu/packages/libreoffice.scm | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/gnu/packages/libreoffice.scm b/gnu/packages/libreoffice.scm
index 70167d11ea..2d038cdf0d 100644
--- a/gnu/packages/libreoffice.scm
+++ b/gnu/packages/libreoffice.scm
@@ -893,7 +893,7 @@ (define dtoa
(define-public libreoffice
(package
(name "libreoffice")
- (version "24.2.0.3") ;keep in sync with hunspell dictionaries
+ (version "24.8.1.2") ;keep in sync with hunspell dictionaries
(source
(origin
(method url-fetch)
@@ -906,7 +906,7 @@ (define-public libreoffice
"https://downloadarchive.documentfoundation.org/libreoffice/old/"
version "/src/libreoffice-" version ".tar.xz")))
(sha256
- (base32 "0s1m92rmizicd8jgxcjz0xsd79v148wkq0ac9yzz61x2ga8mdx0q"))))
+ (base32 "1rqii01i0295ch2xc9mddqpvlpjapk3m6nra4mhxfc38da1qci48"))))
(build-system glib-or-gtk-build-system)
(arguments
(list
--
2.46.0
^ permalink raw reply related [flat|nested] 25+ messages in thread
* [bug#73439] [PATCH v2 4/5] gnu: hunspell-dictionaries: Update to 24.8.1.2.
2024-09-25 7:40 ` [bug#73439] [PATCH v2 1/5] import: Add %libreoffice-updater Nicolas Graves via Guix-patches via
2024-09-25 7:40 ` [bug#73439] [PATCH v2 2/5] gnu: libreoffice: Update to 24.2.0.3 Nicolas Graves via Guix-patches via
2024-09-25 7:40 ` [bug#73439] [PATCH v2 3/5] gnu: libreoffice: Update to 24.8.1.2 Nicolas Graves via Guix-patches via
@ 2024-09-25 7:40 ` Nicolas Graves via Guix-patches via
2024-09-25 7:40 ` [bug#73439] [PATCH v2 5/5] gnu: Add libreoffice-lts Nicolas Graves via Guix-patches via
3 siblings, 0 replies; 25+ messages in thread
From: Nicolas Graves via Guix-patches via @ 2024-09-25 7:40 UTC (permalink / raw)
To: 73439; +Cc: Nicolas Graves, liliana.priker
* gnu/packages/hunspell.scm (hunspell-dictionaries): Update to 24.8.1.2.
(hunspell-ditionary)[source]<origin>: Change url, anongit returns
gateway http errors 504.
Change-Id: Ie7b548f1e7a2342fdde2aea3740e2634c0ba70e3
---
gnu/packages/hunspell.scm | 7 +++----
1 file changed, 3 insertions(+), 4 deletions(-)
diff --git a/gnu/packages/hunspell.scm b/gnu/packages/hunspell.scm
index 8c076de3c4..09ada5a3d3 100644
--- a/gnu/packages/hunspell.scm
+++ b/gnu/packages/hunspell.scm
@@ -309,18 +309,17 @@ (define* (hunspell-dictionary dict-name full-name #:key synopsis home-page licen
(#\_ #\-)
(chr chr))
(string-downcase dict-name))))
- (version "7.6.7.2")
+ (version "24.8.1.2")
(source
(origin
(method git-fetch)
(uri (git-reference
- (url (string-append "https://anongit.freedesktop.org/git/"
- "libreoffice/dictionaries.git/"))
+ (url "https://github.com/LibreOffice/dictionaries")
(commit
(string-append "libreoffice-" version))))
(file-name (git-file-name "libreoffice-dictionaries" version))
(sha256
- (base32 "1f54z1kmpwv9s5a9jdgf97m43nhwbmsar0i6rri3qkgf3kkgz1f7"))))
+ (base32 "089w9i91wy2hx07vqkg0d65zr1k2mnwyijh4dhl6xbpcv20f6ayw"))))
(build-system trivial-build-system)
(native-inputs
`(("source" ,source)))
--
2.46.0
^ permalink raw reply related [flat|nested] 25+ messages in thread
* [bug#73439] [PATCH v2 5/5] gnu: Add libreoffice-lts.
2024-09-25 7:40 ` [bug#73439] [PATCH v2 1/5] import: Add %libreoffice-updater Nicolas Graves via Guix-patches via
` (2 preceding siblings ...)
2024-09-25 7:40 ` [bug#73439] [PATCH v2 4/5] gnu: hunspell-dictionaries: " Nicolas Graves via Guix-patches via
@ 2024-09-25 7:40 ` Nicolas Graves via Guix-patches via
3 siblings, 0 replies; 25+ messages in thread
From: Nicolas Graves via Guix-patches via @ 2024-09-25 7:40 UTC (permalink / raw)
To: 73439; +Cc: Nicolas Graves, liliana.priker
* gnu/packages/libreoffice.scm (libreoffice-lts): New variable.
Change-Id: Ic4f9fa958f52306d5e431684055f8d37e7b2003c
---
gnu/packages/libreoffice.scm | 30 ++++++++++++++++++++++--------
1 file changed, 22 insertions(+), 8 deletions(-)
diff --git a/gnu/packages/libreoffice.scm b/gnu/packages/libreoffice.scm
index 2d038cdf0d..4f0d9cbad1 100644
--- a/gnu/packages/libreoffice.scm
+++ b/gnu/packages/libreoffice.scm
@@ -890,6 +890,15 @@ (define dtoa
(sha256
(base32 "1d0iwy0q5sjznv23d3nbwmy0r7m1mdzlnv5pc4izddkx9xld10h0"))))
+(define (libreoffice-url version)
+ (list
+ (string-append
+ "https://download.documentfoundation.org/libreoffice/src/"
+ (version-prefix version 3) "/libreoffice-" version ".tar.xz")
+ (string-append
+ "https://downloadarchive.documentfoundation.org/libreoffice/old/"
+ version "/src/libreoffice-" version ".tar.xz")))
+
(define-public libreoffice
(package
(name "libreoffice")
@@ -897,14 +906,7 @@ (define-public libreoffice
(source
(origin
(method url-fetch)
- (uri
- (list
- (string-append
- "https://download.documentfoundation.org/libreoffice/src/"
- (version-prefix version 3) "/libreoffice-" version ".tar.xz")
- (string-append
- "https://downloadarchive.documentfoundation.org/libreoffice/old/"
- version "/src/libreoffice-" version ".tar.xz")))
+ (uri (libreoffice-url version))
(sha256
(base32 "1rqii01i0295ch2xc9mddqpvlpjapk3m6nra4mhxfc38da1qci48"))))
(build-system glib-or-gtk-build-system)
@@ -1197,3 +1199,15 @@ (define (install-python-script name)
'((release-monitoring-url
. "https://www.libreoffice.org/download/download-libreoffice/")))
(license license:mpl2.0)))
+
+(define-public libreoffice-lts
+ (package
+ (inherit libreoffice)
+ (name "libreoffice")
+ (version "24.2.6.2")
+ (source
+ (origin
+ (method url-fetch)
+ (uri (libreoffice-url version))
+ (sha256
+ (base32 "1cqxw745kzm81b2nvfpl5n2sq1k9y25y596wvjsnaq394bq4vspn"))))))
--
2.46.0
^ permalink raw reply related [flat|nested] 25+ messages in thread
* [bug#73439] [PATCH 00/10] Update libreoffice to its latest version.
2024-09-24 17:03 ` Liliana Marie Prikler
@ 2024-09-25 7:52 ` Nicolas Graves via Guix-patches via
2024-09-25 15:43 ` Liliana Marie Prikler
0 siblings, 1 reply; 25+ messages in thread
From: Nicolas Graves via Guix-patches via @ 2024-09-25 7:52 UTC (permalink / raw)
To: Liliana Marie Prikler, 73439
On 2024-09-24 19:03, Liliana Marie Prikler wrote:
>> That said, it is very doable to have two with a -lts version.
> I agree, having an LTS is probably enough. So can we cut this short by
> keeping the separate ones you mention and also keep 24.2.6.2 as the
> LTS?
Done in a v2, but I'm not actually sure it's a great solution. The issue
is that the "LTS" is supported for 8 months (february to november 2024
for 24.2). That means we have an overlap of main and lts versions for
only 2 months, and then libreoffice probably recommends only the 24.8
stable release (from memory, the page had a single release a few months
prior, or we can wait and see until november).
Keeping it in Guix would label -lts something that is not supported by
upstream 2/3rd of a year.
I only see two relevant solutions:
- following the latest stable release (which is stable, it's not a beta,
there is a prerelease version currently at 24.8.2)
- wait with 24.2 until november and then switch to 24.8
--
Best regards,
Nicolas Graves
^ permalink raw reply [flat|nested] 25+ messages in thread
* [bug#73439] [PATCH 00/10] Update libreoffice to its latest version.
2024-09-25 7:52 ` Nicolas Graves via Guix-patches via
@ 2024-09-25 15:43 ` Liliana Marie Prikler
0 siblings, 0 replies; 25+ messages in thread
From: Liliana Marie Prikler @ 2024-09-25 15:43 UTC (permalink / raw)
To: Nicolas Graves, 73439
Am Mittwoch, dem 25.09.2024 um 09:52 +0200 schrieb Nicolas Graves:
> On 2024-09-24 19:03, Liliana Marie Prikler wrote:
>
> > > That said, it is very doable to have two with a -lts version.
> > I agree, having an LTS is probably enough. So can we cut this
> > short by keeping the separate ones you mention and also keep
> > 24.2.6.2 as the LTS?
>
> Done in a v2, but I'm not actually sure it's a great solution. The
> issue is that the "LTS" is supported for 8 months (february to
> november 2024 for 24.2). That means we have an overlap of main and
> lts versions for only 2 months, and then libreoffice probably
> recommends only the 24.8 stable release (from memory, the page had a
> single release a few months prior, or we can wait and see until
> november).
>
> Keeping it in Guix would label -lts something that is not supported
> by upstream 2/3rd of a year.
>
> I only see two relevant solutions:
> - following the latest stable release (which is stable, it's not a
> beta, there is a prerelease version currently at 24.8.2)
> - wait with 24.2 until november and then switch to 24.8
I think we should strive to be as up-to-date as possible, but I see no
harm with keeping a 24.2 version until November. WDYT?
^ permalink raw reply [flat|nested] 25+ messages in thread
* [bug#73439] [PATCH v3 1/4] import: Add %libreoffice-updater.
2024-09-23 12:15 [bug#73439] [PATCH 00/10] Update libreoffice to its latest version Nicolas Graves via Guix-patches via
` (2 preceding siblings ...)
2024-09-25 7:40 ` [bug#73439] [PATCH v2 1/5] import: Add %libreoffice-updater Nicolas Graves via Guix-patches via
@ 2024-09-26 7:50 ` Nicolas Graves via Guix-patches via
2024-09-26 7:50 ` [bug#73439] [PATCH v3 2/4] gnu: libreoffice: Update to 24.2.0.3 Nicolas Graves via Guix-patches via
` (2 more replies)
3 siblings, 3 replies; 25+ messages in thread
From: Nicolas Graves via Guix-patches via @ 2024-09-26 7:50 UTC (permalink / raw)
To: 73439; +Cc: Nicolas Graves
Change-Id: I481b1175db531c4fea4a57838fe190f679cd1a85
---
Makefile.am | 1 +
guix/import/libreoffice.scm | 98 +++++++++++++++++++++++++++++++++++++
2 files changed, 99 insertions(+)
create mode 100644 guix/import/libreoffice.scm
diff --git a/Makefile.am b/Makefile.am
index e9801283f8..e4e4fb5a19 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -306,6 +306,7 @@ MODULES = \
guix/import/json.scm \
guix/import/kde.scm \
guix/import/launchpad.scm \
+ guix/import/libreoffice.scm \
guix/import/minetest.scm \
guix/import/npm-binary.scm \
guix/import/opam.scm \
diff --git a/guix/import/libreoffice.scm b/guix/import/libreoffice.scm
new file mode 100644
index 0000000000..65d20f0432
--- /dev/null
+++ b/guix/import/libreoffice.scm
@@ -0,0 +1,98 @@
+;;; GNU Guix --- Functional package management for GNU
+;;; Copyright © 2024 Nicolas Graves <ngraves@ngraves.fr>
+;;;
+;;; This file is part of GNU Guix.
+;;;
+;;; GNU Guix is free software; you can redistribute it and/or modify it
+;;; under the terms of the GNU General Public License as published by
+;;; the Free Software Foundation; either version 3 of the License, or (at
+;;; your option) any later version.
+;;;
+;;; GNU Guix is distributed in the hope that it will be useful, but
+;;; WITHOUT ANY WARRANTY; without even the implied warranty of
+;;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+;;; GNU General Public License for more details.
+;;;
+;;; You should have received a copy of the GNU General Public License
+;;; along with GNU Guix. If not, see <http://www.gnu.org/licenses/>.
+
+(define-module (guix import libreoffice)
+ #:use-module (web client)
+ #:use-module (sxml match)
+ #:use-module (sxml simple)
+ #:use-module (guix i18n)
+ #:use-module (guix diagnostics)
+ #:use-module (guix packages)
+ #:use-module (guix upstream)
+ #:use-module (guix utils)
+ #:use-module (ice-9 textual-ports)
+ #:use-module (srfi srfi-26)
+ #:use-module (srfi srfi-71)
+ #:export (%libreoffice-updater))
+
+(define archive-prefix
+ "https://downloadarchive.documentfoundation.org/libreoffice/old/")
+(define libreoffice-latest-url (string-append archive-prefix "latest/src/"))
+
+(define (libreoffice-latest-version)
+ (let* ((response port (http-get libreoffice-latest-url
+ #:streaming? #t))
+ (content (get-string-all port))
+ ;; xml->sxml is not flexible enough for html.
+ ;; For instance, <img> tags don't have closing </img>.
+ ;; This trick preprocesses html to extract all <a> tags in
+ ;; a <body> wrapper, which sxml-match can handle well.
+ (xml (xml->sxml
+ (string-append
+ "<body><"
+ (string-join
+ (filter (cute string-prefix? "a " <>)
+ (string-split content #\<))
+ "</a><")
+ "></a></body>")
+ #:trim-whitespace? #t)))
+ (sxml-match
+ xml
+ ((*TOP*
+ (body
+ (a (@ (href "?C=N;O=D")) "Name")
+ (a (@ (href "?C=M;O=A")) "Last modified")
+ (a (@ (href "?C=S;O=A")) "Size")
+ (a (@ (href "/libreoffice/old/latest/")) "Parent Directory")
+ (a (@ (href ,link)) ,name)
+ . ,rest))
+ (if (and (string-prefix? "libreoffice-" name)
+ (string-suffix? ".tar.xz" name))
+ (string-drop
+ (string-drop-right name (string-length ".tar.xz"))
+ (string-length "libreoffice-"))
+ (raise
+ (formatted-message (G_ "Could not extract version from '~a'")
+ name)))))))
+
+(define* (latest-release package #:key (version #f))
+ "Return an <upstream-source> for the latest-release of PACKAGE."
+ (let* ((name (package-name package))
+ (version (or version (libreoffice-latest-version))))
+ (upstream-source
+ (package name)
+ (version version)
+ (urls (list
+ (string-append
+ archive-prefix version "/src/libreoffice-" version ".tar.xz")
+ (string-append
+ "https://download.documentfoundation.org/libreoffice/src/"
+ (version-prefix version 3) "/libreoffice-" version ".tar.xz"))))))
+
+(define (libreoffice-package? package)
+ "Return true if PACKAGE is LibreOffice."
+ (string=? (package-name package) "libreoffice"))
+
+(define %libreoffice-updater
+ (upstream-updater
+ (name 'libreoffice)
+ (description "Updater for Libreoffice package")
+ (pred libreoffice-package?)
+ (import latest-release)))
+
+;; libreoffice.scm ends here.
--
2.46.0
^ permalink raw reply related [flat|nested] 25+ messages in thread
* [bug#73439] [PATCH v3 2/4] gnu: libreoffice: Update to 24.2.0.3.
2024-09-26 7:50 ` [bug#73439] [PATCH v3 1/4] import: Add %libreoffice-updater Nicolas Graves via Guix-patches via
@ 2024-09-26 7:50 ` Nicolas Graves via Guix-patches via
2024-09-26 7:50 ` [bug#73439] [PATCH v3 3/4] gnu: libreoffice: Update to 24.2.6.2 Nicolas Graves via Guix-patches via
2024-09-26 7:50 ` [bug#73439] [PATCH v3 4/4] gnu: hunspell-dictionary: " Nicolas Graves via Guix-patches via
2 siblings, 0 replies; 25+ messages in thread
From: Nicolas Graves via Guix-patches via @ 2024-09-26 7:50 UTC (permalink / raw)
To: 73439; +Cc: Nicolas Graves
* gnu/packages/libreoffice.scm (libreoffice): Update to 24.2.0.3.
Change-Id: I72e0ebb4d075c47ea168b181f969a97f9249150a
---
gnu/packages/libreoffice.scm | 29 +++++++++++++++++++++++------
1 file changed, 23 insertions(+), 6 deletions(-)
diff --git a/gnu/packages/libreoffice.scm b/gnu/packages/libreoffice.scm
index ed8dfd432b..70167d11ea 100644
--- a/gnu/packages/libreoffice.scm
+++ b/gnu/packages/libreoffice.scm
@@ -63,6 +63,7 @@ (define-module (gnu packages libreoffice)
#:use-module (gnu packages fontutils)
#:use-module (gnu packages freedesktop)
#:use-module (gnu packages game-development)
+ #:use-module (gnu packages gcc)
#:use-module (gnu packages ghostscript)
#:use-module (gnu packages gl)
#:use-module (gnu packages glib)
@@ -80,6 +81,7 @@ (define-module (gnu packages libreoffice)
#:use-module (gnu packages maths)
#:use-module (gnu packages nss)
#:use-module (gnu packages openldap)
+ #:use-module (gnu packages password-utils)
#:use-module (gnu packages pdf)
#:use-module (gnu packages perl)
#:use-module (gnu packages perl-compression)
@@ -891,16 +893,20 @@ (define dtoa
(define-public libreoffice
(package
(name "libreoffice")
- (version "7.6.7.2") ;keep in sync with hunspell dictionaries
+ (version "24.2.0.3") ;keep in sync with hunspell dictionaries
(source
(origin
(method url-fetch)
(uri
- (string-append
- "https://download.documentfoundation.org/libreoffice/src/"
- (version-prefix version 3) "/libreoffice-" version ".tar.xz"))
+ (list
+ (string-append
+ "https://download.documentfoundation.org/libreoffice/src/"
+ (version-prefix version 3) "/libreoffice-" version ".tar.xz")
+ (string-append
+ "https://downloadarchive.documentfoundation.org/libreoffice/old/"
+ version "/src/libreoffice-" version ".tar.xz")))
(sha256
- (base32 "159vbv4zhibfd4xjdamcqs4h0p3h5y79kcjwrmshvjhs23p55l3m"))))
+ (base32 "0s1m92rmizicd8jgxcjz0xsd79v148wkq0ac9yzz61x2ga8mdx0q"))))
(build-system glib-or-gtk-build-system)
(arguments
(list
@@ -961,6 +967,13 @@ (define-public libreoffice
"shell/source/unix/misc/senddoc.sh")
(("/usr/bin/xdg-open")
(search-input-file inputs "/bin/xdg-open")))
+
+ ;; Probably necessary because we use a custom GCC(>=12)/GLIBC.
+ (substitute* '("sal/rtl/math.cxx"
+ "sc/source/core/tool/math.cxx")
+ (("std::(fe[gs]etround|feclearexcept|fetestexcept)" all suffix)
+ suffix))
+
(setenv "CPPFLAGS" "-std=c++17")))
(add-after 'install 'reset-zip-timestamps
(lambda _
@@ -1083,12 +1096,14 @@ (define (install-python-script name)
cppunit
flex
frozen ;header-only library
+ gcc-12
pkg-config
python-wrapper
which
ziptime))
(inputs
- (list bluez
+ (list argon2
+ bluez
boost
box2d
clucene
@@ -1100,6 +1115,7 @@ (define (install-python-script name)
fontforge
gconf
glew
+ glibc
glm
gnupg
gobject-introspection
@@ -1168,6 +1184,7 @@ (define (install-python-script name)
xdg-utils
xmlsec-nss
zip
+ zxcvbn-c
zxing-cpp))
(home-page "https://www.libreoffice.org/")
(synopsis "Office suite")
--
2.46.0
^ permalink raw reply related [flat|nested] 25+ messages in thread
* [bug#73439] [PATCH v3 3/4] gnu: libreoffice: Update to 24.2.6.2.
2024-09-26 7:50 ` [bug#73439] [PATCH v3 1/4] import: Add %libreoffice-updater Nicolas Graves via Guix-patches via
2024-09-26 7:50 ` [bug#73439] [PATCH v3 2/4] gnu: libreoffice: Update to 24.2.0.3 Nicolas Graves via Guix-patches via
@ 2024-09-26 7:50 ` Nicolas Graves via Guix-patches via
2024-09-26 7:50 ` [bug#73439] [PATCH v3 4/4] gnu: hunspell-dictionary: " Nicolas Graves via Guix-patches via
2 siblings, 0 replies; 25+ messages in thread
From: Nicolas Graves via Guix-patches via @ 2024-09-26 7:50 UTC (permalink / raw)
To: 73439; +Cc: Nicolas Graves
* gnu/packages/libreoffice.scm (libreoffice): Update to 24.2.6.2.
Change-Id: I95ba7d5a5d1475b9c502051ecb076734a320c059
---
gnu/packages/libreoffice.scm | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/gnu/packages/libreoffice.scm b/gnu/packages/libreoffice.scm
index 70167d11ea..a288136e06 100644
--- a/gnu/packages/libreoffice.scm
+++ b/gnu/packages/libreoffice.scm
@@ -893,7 +893,7 @@ (define dtoa
(define-public libreoffice
(package
(name "libreoffice")
- (version "24.2.0.3") ;keep in sync with hunspell dictionaries
+ (version "24.2.6.2") ;keep in sync with hunspell dictionaries
(source
(origin
(method url-fetch)
@@ -906,7 +906,7 @@ (define-public libreoffice
"https://downloadarchive.documentfoundation.org/libreoffice/old/"
version "/src/libreoffice-" version ".tar.xz")))
(sha256
- (base32 "0s1m92rmizicd8jgxcjz0xsd79v148wkq0ac9yzz61x2ga8mdx0q"))))
+ (base32 "1cqxw745kzm81b2nvfpl5n2sq1k9y25y596wvjsnaq394bq4vspn"))))
(build-system glib-or-gtk-build-system)
(arguments
(list
--
2.46.0
^ permalink raw reply related [flat|nested] 25+ messages in thread
* [bug#73439] [PATCH v3 4/4] gnu: hunspell-dictionary: Update to 24.2.6.2.
2024-09-26 7:50 ` [bug#73439] [PATCH v3 1/4] import: Add %libreoffice-updater Nicolas Graves via Guix-patches via
2024-09-26 7:50 ` [bug#73439] [PATCH v3 2/4] gnu: libreoffice: Update to 24.2.0.3 Nicolas Graves via Guix-patches via
2024-09-26 7:50 ` [bug#73439] [PATCH v3 3/4] gnu: libreoffice: Update to 24.2.6.2 Nicolas Graves via Guix-patches via
@ 2024-09-26 7:50 ` Nicolas Graves via Guix-patches via
2 siblings, 0 replies; 25+ messages in thread
From: Nicolas Graves via Guix-patches via @ 2024-09-26 7:50 UTC (permalink / raw)
To: 73439; +Cc: Nicolas Graves
* gnu/packages/hunspell.scm (hunspell-dictionary): Update to 24.2.6.2.
[source]<origin>: Change url, anongit returns gateway http errors 504.
Change-Id: Ida030cc94a406ace042eccbe75f60d4505e18a11
---
gnu/packages/hunspell.scm | 7 +++----
1 file changed, 3 insertions(+), 4 deletions(-)
diff --git a/gnu/packages/hunspell.scm b/gnu/packages/hunspell.scm
index 8c076de3c4..cf2628162f 100644
--- a/gnu/packages/hunspell.scm
+++ b/gnu/packages/hunspell.scm
@@ -309,18 +309,17 @@ (define* (hunspell-dictionary dict-name full-name #:key synopsis home-page licen
(#\_ #\-)
(chr chr))
(string-downcase dict-name))))
- (version "7.6.7.2")
+ (version "24.2.6.2")
(source
(origin
(method git-fetch)
(uri (git-reference
- (url (string-append "https://anongit.freedesktop.org/git/"
- "libreoffice/dictionaries.git/"))
+ (url "https://github.com/LibreOffice/dictionaries")
(commit
(string-append "libreoffice-" version))))
(file-name (git-file-name "libreoffice-dictionaries" version))
(sha256
- (base32 "1f54z1kmpwv9s5a9jdgf97m43nhwbmsar0i6rri3qkgf3kkgz1f7"))))
+ (base32 "0xllzv1b70i7gndc8sqvvc7a1viv3i6qqdqiv4ffr78zr4krcwx8"))))
(build-system trivial-build-system)
(native-inputs
`(("source" ,source)))
--
2.46.0
^ permalink raw reply related [flat|nested] 25+ messages in thread
end of thread, other threads:[~2024-09-26 8:01 UTC | newest]
Thread overview: 25+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2024-09-23 12:15 [bug#73439] [PATCH 00/10] Update libreoffice to its latest version Nicolas Graves via Guix-patches via
2024-09-23 12:37 ` [bug#73439] [PATCH 01/10] import: Add %libreoffice-updater Nicolas Graves via Guix-patches via
2024-09-23 12:37 ` [bug#73439] [PATCH 02/10] gnu: libreoffice: Update to 24.2.0.3 Nicolas Graves via Guix-patches via
2024-09-23 12:37 ` [bug#73439] [PATCH 03/10] gnu: libreoffice: Update to 24.2.1.2 Nicolas Graves via Guix-patches via
2024-09-23 12:37 ` [bug#73439] [PATCH 04/10] gnu: libreoffice: Update to 24.2.2.2 Nicolas Graves via Guix-patches via
2024-09-23 12:37 ` [bug#73439] [PATCH 05/10] gnu: libreoffice: Update to 24.2.3.2 Nicolas Graves via Guix-patches via
2024-09-23 12:37 ` [bug#73439] [PATCH 06/10] gnu: libreoffice: Update to 24.2.4.2 Nicolas Graves via Guix-patches via
2024-09-23 12:37 ` [bug#73439] [PATCH 07/10] gnu: libreoffice: Update to 24.2.5.2 Nicolas Graves via Guix-patches via
2024-09-23 12:37 ` [bug#73439] [PATCH 08/10] gnu: libreoffice: Update to 24.2.6.2 Nicolas Graves via Guix-patches via
2024-09-23 12:37 ` [bug#73439] [PATCH 09/10] gnu: libreoffice: Update to 24.8.1.2 Nicolas Graves via Guix-patches via
2024-09-23 12:37 ` [bug#73439] [PATCH 10/10] gnu: hunspell-dictionaries: " Nicolas Graves via Guix-patches via
2024-09-23 18:35 ` [bug#73439] [PATCH 00/10] Update libreoffice to its latest version Liliana Marie Prikler
2024-09-24 14:29 ` Nicolas Graves via Guix-patches via
2024-09-24 17:03 ` Liliana Marie Prikler
2024-09-25 7:52 ` Nicolas Graves via Guix-patches via
2024-09-25 15:43 ` Liliana Marie Prikler
2024-09-25 7:40 ` [bug#73439] [PATCH v2 1/5] import: Add %libreoffice-updater Nicolas Graves via Guix-patches via
2024-09-25 7:40 ` [bug#73439] [PATCH v2 2/5] gnu: libreoffice: Update to 24.2.0.3 Nicolas Graves via Guix-patches via
2024-09-25 7:40 ` [bug#73439] [PATCH v2 3/5] gnu: libreoffice: Update to 24.8.1.2 Nicolas Graves via Guix-patches via
2024-09-25 7:40 ` [bug#73439] [PATCH v2 4/5] gnu: hunspell-dictionaries: " Nicolas Graves via Guix-patches via
2024-09-25 7:40 ` [bug#73439] [PATCH v2 5/5] gnu: Add libreoffice-lts Nicolas Graves via Guix-patches via
2024-09-26 7:50 ` [bug#73439] [PATCH v3 1/4] import: Add %libreoffice-updater Nicolas Graves via Guix-patches via
2024-09-26 7:50 ` [bug#73439] [PATCH v3 2/4] gnu: libreoffice: Update to 24.2.0.3 Nicolas Graves via Guix-patches via
2024-09-26 7:50 ` [bug#73439] [PATCH v3 3/4] gnu: libreoffice: Update to 24.2.6.2 Nicolas Graves via Guix-patches via
2024-09-26 7:50 ` [bug#73439] [PATCH v3 4/4] gnu: hunspell-dictionary: " Nicolas Graves via Guix-patches via
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).