distro-configs/ZetaOfficeFlatpak.conf | 64 ++++++++++++++++++++++++++++++++++
solenv/flatpak-manifest.in | 12 +++---
2 files changed, 70 insertions(+), 6 deletions(-)
New commits:
commit fed3289fcbc9b06ed4bb261f8a30817922cc5ac2
Author: Gabor Kelemen <kelem...@ubuntu.com>
AuthorDate: Mon Sep 4 13:21:14 2023 +0200
Commit: Thorsten Behrens <thorsten.behr...@allotropia.de>
CommitDate: Sat Sep 9 23:49:03 2023 +0200
Add Zeta branding to the Flatpak packaging
Change-Id: I74d8babc88d98d9102f1cf02d7b19e040f8fa9ef
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/156515
Tested-by: Thorsten Behrens <thorsten.behr...@allotropia.de>
Reviewed-by: Thorsten Behrens <thorsten.behr...@allotropia.de>
diff --git a/distro-configs/ZetaOfficeFlatpak.conf
b/distro-configs/ZetaOfficeFlatpak.conf
new file mode 100644
index 000000000000..b133b0a82934
--- /dev/null
+++ b/distro-configs/ZetaOfficeFlatpak.conf
@@ -0,0 +1,64 @@
+--disable-odk
+--disable-skia
+--enable-release-build
+--with-ant-home=ant/
+--with-extra-buildid=Flatpak
+--with-help=html
+--with-jdk-home=/usr/lib/sdk/openjdk11/jvm/openjdk-11
+--with-lang=en-US de fr es it
+--enable-ccache
+--with-system-libs
+--with-vendor=allotropia GmbH
+--without-export-validation
+--without-junit
+--without-lxml
+--without-system-abseil
+--without-system-beanshell
+--without-system-bluez
+--without-system-boost
+--without-system-box2d
+--without-system-clucene
+--without-system-coinmp
+--without-system-cppunit
+--without-system-dragonbox
+--without-system-firebird
+--without-system-glm
+--without-system-gpgmepp
+--without-system-jfreereport
+--without-system-libabw
+--without-system-libatomic_ops
+--without-system-libcdr
+--without-system-libcmis
+--without-system-libebook
+--without-system-libepubgen
+--without-system-libetonyek
+--without-system-libexttextcat
+--without-system-libfixmath
+--without-system-libfreehand
+--without-system-liblangtag
+--without-system-libmspub
+--without-system-libmwaw
+--without-system-libnumbertext
+--without-system-libodfgen
+--without-system-libpagemaker
+--without-system-libqxp
+--without-system-librevenge
+--without-system-libstaroffice
+--without-system-libtommath
+--without-system-libvisio
+--without-system-libwpd
+--without-system-libwpg
+--without-system-libwps
+--without-system-libzmf
+--without-system-lpsolve
+--without-system-mariadb
+--without-system-mdds
+--without-system-odbc
+--without-system-openldap
+--without-system-orcus
+--without-system-poppler
+--without-system-postgresql
+--without-system-redland
+--without-system-sane
+--without-system-xmlsec
+--without-system-zxing
diff --git a/solenv/flatpak-manifest.in b/solenv/flatpak-manifest.in
index 9ed880565c52..824ac011c0c1 100644
--- a/solenv/flatpak-manifest.in
+++ b/solenv/flatpak-manifest.in
@@ -1,12 +1,12 @@
{
- "id": "org.libreoffice.LibreOffice",
+ "id": "com.allotropia.ZetaOffice",
"runtime": "org.freedesktop.Platform",
"runtime-version": "22.08",
"sdk": "org.freedesktop.Sdk",
"sdk-extensions": [
"org.freedesktop.Sdk.Extension.openjdk11"
],
- "command": "libreoffice",
+ "command": "zetaoffice",
"modules": [
{
"name": "openjdk",
@@ -54,7 +54,7 @@
]
},
{
- "name": "libreoffice",
+ "name": "zetaoffice",
"sources": [
{
"type": "git",
@@ -686,7 +686,7 @@
],
"buildsystem": "simple",
"build-commands": [
- "./autogen.sh --prefix=/run/build/libreoffice/inst
--with-distro=LibreOfficeFlatpak",
+ "./autogen.sh --prefix=/run/build/libreoffice/inst
--with-distro=ZetaOfficeFlatpak",
"make check",
"make distro-pack-install",
"make cmd cmd='$(SRCDIR)/solenv/bin/assemble-flatpak.sh'",
@@ -695,13 +695,13 @@
}
],
"add-extensions": {
- "org.libreoffice.LibreOffice.BundledExtension": {
+ "com.allotropia.ZetaOffice.BundledExtension": {
"directory": "libreoffice/share/extensions",
"subdirectories": true,
"no-autodownload": true,
"autodelete": true
},
- "org.libreoffice.LibreOffice.Help": {
+ "com.allotropia.ZetaOffice.Help": {
"directory": "libreoffice/help",
"bundle": true,
"autodelete": true,
