distro-configs/LibreOfficeFlatpak.conf | 1 +
solenv/flatpak-manifest.in | 4 ++--
2 files changed, 3 insertions(+), 2 deletions(-)
New commits:
commit 2b18ebbdd961eca068cbc639cf09ab7990bf71d4
Author: Stephan Bergmann <stephan.bergm...@allotropia.de>
AuthorDate: Tue Jul 9 08:04:57 2024 +0200
Commit: Michael Stahl <michael.st...@allotropia.de>
CommitDate: Wed Jul 10 11:10:51 2024 +0200
Adapt flatpak build to upstream changes
<https://github.com/flathub/org.libreoffice.LibreOffice/commit/4bed50e14d9d106093b027bc8bb780023fb42b55>
"gvfs: Update gvfs-1.54.1.tar.xz to 1.54.2 (#295)"
<https://github.com/flathub/org.libreoffice.LibreOffice/commit/88a0d0718a9ddcd75a0842b5173e6d6ecd4d3bde>
"--enable-ext-nlpsolver (#297)"
Change-Id: Ie39c22c2611a31a8e2a82ae200b7a3836393dff3
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/170177
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann <stephan.bergm...@allotropia.de>
(cherry picked from commit 6b80e0554e4b11f9c1eb955c2d26445bc6855371)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/170122
Reviewed-by: Xisco Fauli <xiscofa...@libreoffice.org>
(cherry picked from commit 2d8b7797d5e99531ebfbbe99c0095782c3b03558)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/170231
Tested-by: Michael Stahl <michael.st...@allotropia.de>
Reviewed-by: Ilmari Lauhakangas <ilmari.lauhakan...@libreoffice.org>
Reviewed-by: Michael Stahl <michael.st...@allotropia.de>
diff --git a/distro-configs/LibreOfficeFlatpak.conf
b/distro-configs/LibreOfficeFlatpak.conf
index ab72dd7ceca1..04df403a9327 100644
--- a/distro-configs/LibreOfficeFlatpak.conf
+++ b/distro-configs/LibreOfficeFlatpak.conf
@@ -1,4 +1,5 @@
--disable-odk
+--enable-ext-nlpsolver
--enable-release-build
--with-ant-home=/run/build/libreoffice/ant
--with-extra-buildid=Flatpak
diff --git a/solenv/flatpak-manifest.in b/solenv/flatpak-manifest.in
index 8099a9271b06..ad004c1868bb 100644
--- a/solenv/flatpak-manifest.in
+++ b/solenv/flatpak-manifest.in
@@ -51,8 +51,8 @@
"sources": [
{
"type": "archive",
- "url":
"https://download.gnome.org/sources/gvfs/1.54/gvfs-1.54.1.tar.xz";,
- "sha256":
"ac4a3bccb7fe1502158ef0fde5c979ab44712557d028a8e4f30a29f0fbd9d19f",
+ "url":
"https://download.gnome.org/sources/gvfs/1.54/gvfs-1.54.2.tar.xz";,
+ "sha256":
"54908f4e10b5f1c231e90330c8c15b7f21f2bb610f194c034b338e379c508e3c",
"x-checker-data": {
"type": "gnome",
"name": "gvfs",
