bin/distro-install-desktop-integration | 18 +++++++++---------
solenv/bin/assemble-flatpak-appdata.sh | 30 +++++++++++++++---------------
solenv/bin/assemble-flatpak-desktop.sh | 28 ++++++++++++++--------------
solenv/bin/assemble-flatpak.sh | 20 ++++++++++----------
solenv/flatpak-manifest.in | 14 +++++++-------
5 files changed, 55 insertions(+), 55 deletions(-)
New commits:
commit 4632048166b349f2c755c36613f57c46954d59b5
Author: Stephan Bergmann <stephan.bergm...@allotropia.de>
AuthorDate: Tue Oct 22 13:42:22 2024 +0200
Commit: Stephan Bergmann <stephan.bergm...@allotropia.de>
CommitDate: Wed Oct 23 21:42:46 2024 +0200
Branding-related fixes for flatpak build
Change-Id: I3ba297b38c1234e6b484fd3913ad75dc5116bdae
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/175516
Reviewed-by: Stephan Bergmann <stephan.bergm...@allotropia.de>
Tested-by: Stephan Bergmann <stephan.bergm...@allotropia.de>
diff --git a/bin/distro-install-desktop-integration
b/bin/distro-install-desktop-integration
index 7e1428ffba69..f28c4633e317 100755
--- a/bin/distro-install-desktop-integration
+++ b/bin/distro-install-desktop-integration
@@ -94,7 +94,7 @@ add_wrapper()
# install desktop integration from plain packages
sysui_temp=`mktemp -d -t distro-pack-desktop-integration-XXXXXX`
-cp -a workdir/CustomTarget/sysui/share/libreoffice/* "$sysui_temp"
+cp -a workdir/CustomTarget/sysui/share/zetaoffice/* "$sysui_temp"
cp -a "${SRCDIR?}"/sysui/desktop/share/create_tree.sh "$sysui_temp"
cd $sysui_temp
# we want non-versioned stuff in the distro packages
@@ -145,20 +145,20 @@ fi
# wrappers and man pages
# FIXME: do not have desktop file and MIME icon for unopkg
-add_wrapper lobase soffice "--base" "libreoffice"
"libreoffice-base.desktop" "gid_Module_Brand_Prg_Base"
-add_wrapper localc soffice "--calc" "libreoffice"
"libreoffice-calc.desktop" "gid_Module_Brand_Prg_Calc"
-add_wrapper lodraw soffice "--draw" "libreoffice"
"libreoffice-draw.desktop" "gid_Module_Brand_Prg_Draw"
-add_wrapper lomath soffice "--math" "libreoffice"
"libreoffice-math.desktop" "gid_Module_Brand_Prg_Math"
-add_wrapper loimpress soffice "--impress" "libreoffice"
"libreoffice-impress.desktop" "gid_Module_Brand_Prg_Impress"
+add_wrapper lobase soffice "--base" "libreoffice"
"zetaoffice-base.desktop" "gid_Module_Brand_Prg_Base"
+add_wrapper localc soffice "--calc" "libreoffice"
"zetaoffice-calc.desktop" "gid_Module_Brand_Prg_Calc"
+add_wrapper lodraw soffice "--draw" "libreoffice"
"zetaoffice-draw.desktop" "gid_Module_Brand_Prg_Draw"
+add_wrapper lomath soffice "--math" "libreoffice"
"zetaoffice-math.desktop" "gid_Module_Brand_Prg_Math"
+add_wrapper loimpress soffice "--impress" "libreoffice"
"zetaoffice-impress.desktop" "gid_Module_Brand_Prg_Impress"
add_wrapper loweb soffice "--web" "libreoffice" ""
"gid_Module_Brand_Prg_Wrt"
-add_wrapper lowriter soffice "--writer" "libreoffice"
"libreoffice-writer.desktop" "gid_Module_Brand_Prg_Wrt"
+add_wrapper lowriter soffice "--writer" "libreoffice"
"zetaoffice-writer.desktop" "gid_Module_Brand_Prg_Wrt"
add_wrapper lofromtemplate soffice ".uno:NewDoc" "libreoffice" ""
"gid_Module_Root_Brand"
-add_wrapper libreoffice soffice "" "libreoffice"
"libreoffice-startcenter.desktop" "gid_Module_Root_Brand"
+add_wrapper zetaoffice soffice "" "libreoffice"
"zetaoffice-startcenter.desktop" "gid_Module_Root_Brand"
add_wrapper loffice soffice "" "libreoffice" ""
"gid_Module_Root_Brand"
add_wrapper unopkg unopkg "" "unopkg" ""
"gid_Module_Root_Brand"
# there are two more desktop files for optional filters
-test -f $DESTDIR/gid_Module_Optional_Xsltfiltersamples && echo
"$PREFIXDIR/share/applications/libreoffice-xsltfilter.desktop"
>>"$DESTDIR/gid_Module_Optional_Xsltfiltersamples"
+test -f $DESTDIR/gid_Module_Optional_Xsltfiltersamples && echo
"$PREFIXDIR/share/applications/zetaoffice-xsltfilter.desktop"
>>"$DESTDIR/gid_Module_Optional_Xsltfiltersamples"
# $BINDIR/ooffice symlink is necessary by java UNO components to find
# the UNO installation using $PATH, see
diff --git a/solenv/bin/assemble-flatpak-appdata.sh
b/solenv/bin/assemble-flatpak-appdata.sh
index 84b5f5399299..f6f10404b4c8 100755
--- a/solenv/bin/assemble-flatpak-appdata.sh
+++ b/solenv/bin/assemble-flatpak-appdata.sh
@@ -12,36 +12,36 @@
#
# Arguments:
# $1 pathname, ending in a slash, of the directory into which to put the
target
-# org.libreoffice.LibreOffice.appdata.xml file
+# de.allotropia.ZetaOffice.appdata.xml file
# $2 "1" if a <releases> section shall be included in the target
-# org.libreoffice.LibreOffice.appdata.xml file, "0" if not
+# de.allotropia.ZetaOffice.appdata.xml file, "0" if not
set -e
-## org.libreoffice.LibreOffice.appdata.xml is manually derived from the various
-## inst/share/metainfo/libreoffice-*.appdata.xml (at least recent GNOME
Software
+## de.allotropia.ZetaOffice.appdata.xml is manually derived from the various
+## inst/share/metainfo/zetaoffice-*.appdata.xml (at least recent GNOME Software
## doesn't show more than five screenshots anyway, so restrict to one each from
-## the five libreoffice-*.appdata.xml: Writer, Calc, Impress, Draw, Base):
-cat <<\EOF >"${1?}"org.libreoffice.LibreOffice.appdata.xml
+## the five zetaoffice-*.appdata.xml: Writer, Calc, Impress, Draw, Base):
+cat <<\EOF >"${1?}"de.allotropia.ZetaOffice.appdata.xml
<?xml version="1.0" encoding="UTF-8"?>
<component type="desktop">
- <id>org.libreoffice.LibreOffice.desktop</id>
+ <id>de.allotropia.ZetaOffice.desktop</id>
<metadata_license>CC0-1.0</metadata_license>
<project_license>MPL-2.0</project_license>
- <name>LibreOffice</name>
- <summary>The LibreOffice productivity suite</summary>
+ <name>ZetaOffice</name>
+ <summary>The ZetaOffice productivity suite</summary>
<description>
- <p>LibreOffice is a powerful office suite. Its clean interface and
+ <p>ZetaOffice is a powerful office suite. Its clean interface and
feature-rich tools help you unleash your creativity and enhance your
- productivity. LibreOffice includes several applications that make it the
most
+ productivity. ZetaOffice includes several applications that make it the most
powerful Free and Open Source office suite on the market: Writer (word
processing), Calc (spreadsheets), Impress (presentations), Draw (vector
graphics and flowcharts), Base (databases), and Math (formula editing).</p>
- <p>LibreOffice supports opening and saving into a wide variety of formats, so
+ <p>ZetaOffice supports opening and saving into a wide variety of formats, so
you can easily share documents with users of other popular office suites
without worrying about compatibility.</p>
</description>
- <launchable type="desktop-id">org.libreoffice.LibreOffice.desktop</launchable>
+ <launchable type="desktop-id">de.allotropia.ZetaOffice.desktop</launchable>
<url type="homepage">http://www.libreoffice.org/discover/libreoffice/</url>
<url type="bugtracker">https://bugs.documentfoundation.org/</url>
<url type="donation">https://donate.libreoffice.org/</url>
@@ -83,7 +83,7 @@ EOF
if [ "${2?}" = 1 ]
then
- cat <<EOF >>"${1?}"org.libreoffice.LibreOffice.appdata.xml
+ cat <<EOF >>"${1?}"de.allotropia.ZetaOffice.appdata.xml
<releases>
<release
version="${LIBO_VERSION_MAJOR?}.${LIBO_VERSION_MINOR?}.${LIBO_VERSION_MICRO?}.${LIBO_VERSION_PATCH?}"
@@ -92,6 +92,6 @@ then
EOF
fi
-cat <<\EOF >>"${1?}"org.libreoffice.LibreOffice.appdata.xml
+cat <<\EOF >>"${1?}"de.allotropia.ZetaOffice.appdata.xml
</component>
EOF
diff --git a/solenv/bin/assemble-flatpak-desktop.sh
b/solenv/bin/assemble-flatpak-desktop.sh
index 6d06de4fbbbe..64e6ec3cc982 100755
--- a/solenv/bin/assemble-flatpak-desktop.sh
+++ b/solenv/bin/assemble-flatpak-desktop.sh
@@ -11,32 +11,32 @@
# Flatpak from a Fedora libreoffice.spec file.
#
# Arguments:
-# $1 pathname, ending in a slash, of the directory containing the source
libreoffice-*.desktop
+# $1 pathname, ending in a slash, of the directory containing the source
zetaoffice-*.desktop
# files
# $2 pathname, ending in a slash, of the directory into which to put the
target
-# org.libreoffice.LibreOffice.*.desktop files
+# de.allotropia.ZetaOffice.*.desktop files
set -e
-## libreoffice-*.desktop -> org.libreoffice.LibreOffice.*.desktop:
-for i in "${1?}"libreoffice-*.desktop
+## zetaoffice-*.desktop -> de.allotropia.ZetaOffice.*.desktop:
+for i in "${1?}"zetaoffice-*.desktop
do
- sed -e 's/^Icon=libreoffice-/Icon=org.libreoffice.LibreOffice./' "$i" \
- >"${2?}"org.libreoffice.LibreOffice."${i#"${1?}"libreoffice-}"
+ sed -e 's/^Icon=zetaoffice-/Icon=de.allotropia.ZetaOffice./' "$i" \
+ >"${2?}"de.allotropia.ZetaOffice."${i#"${1?}"zetaoffice-}"
done
-mv "${2?}"org.libreoffice.LibreOffice.startcenter.desktop
"${2?}"org.libreoffice.LibreOffice.desktop
+mv "${2?}"de.allotropia.ZetaOffice.startcenter.desktop
"${2?}"de.allotropia.ZetaOffice.desktop
# Flatpak .desktop exports take precedence over system ones due to
# the order of XDG_DATA_DIRS - re-associating text/plain seems a bit much
-sed -i "s/text\/plain;//" "${2?}"org.libreoffice.LibreOffice.writer.desktop
+sed -i "s/text\/plain;//" "${2?}"de.allotropia.ZetaOffice.writer.desktop
-desktop-file-edit --set-key=X-Endless-Alias
--set-value=libreoffice-startcenter \
- --set-key=X-Flatpak-RenamedFrom
--set-value='libreoffice-startcenter.desktop;' \
- "${2?}"org.libreoffice.LibreOffice.desktop
+desktop-file-edit --set-key=X-Endless-Alias --set-value=zetaoffice-startcenter
\
+ --set-key=X-Flatpak-RenamedFrom --set-value='zetaoffice-startcenter.desktop;'
\
+ "${2?}"de.allotropia.ZetaOffice.desktop
for i in base calc draw impress math writer xsltfilter
do
- desktop-file-edit --set-key=X-Endless-Alias --set-value=libreoffice-"$i" \
+ desktop-file-edit --set-key=X-Endless-Alias --set-value=zetaoffice-"$i" \
--set-key=X-Flatpak-RenamedFrom \
- --set-value="libreoffice-$i.desktop;org.libreoffice.LibreOffice-$i.desktop;"
\
- "${2?}"org.libreoffice.LibreOffice."$i".desktop
+ --set-value="zetaoffice-$i.desktop;de.allotropia.ZetaOffice-$i.desktop;" \
+ "${2?}"de.allotropia.ZetaOffice."$i".desktop
done
diff --git a/solenv/bin/assemble-flatpak.sh b/solenv/bin/assemble-flatpak.sh
index 8d45da6cc1df..67d62af363f5 100755
--- a/solenv/bin/assemble-flatpak.sh
+++ b/solenv/bin/assemble-flatpak.sh
@@ -13,36 +13,36 @@
set -e
-cp -r "${PREFIXDIR?}"/lib/libreoffice /app/
-ln -s /app/libreoffice/program/soffice /app/bin/libreoffice
+cp -r "${PREFIXDIR?}"/lib/zetaoffice /app/
+ln -s /app/zetaoffice/program/soffice /app/bin/zetaoffice
mkdir -p /app/share/applications
"${SRCDIR?}"/solenv/bin/assemble-flatpak-desktop.sh
"${PREFIXDIR?}"/share/applications/ \
/app/share/applications/
-## icons/hicolor/*/apps/libreoffice-* ->
-## icons/hicolor/*/apps/org.libreoffice.LibreOffice-*:
+## icons/hicolor/*/apps/zetaoffice-* ->
+## icons/hicolor/*/apps/de.allotropia.ZetaOffice-*:
mkdir -p /app/share/icons
-for i in "${PREFIXDIR?}"/share/icons/hicolor/*/apps/libreoffice-*
+for i in "${PREFIXDIR?}"/share/icons/hicolor/*/apps/zetaoffice-*
do
mkdir -p \
"$(dirname
/app/share/icons/hicolor/"${i#"${PREFIXDIR?}"/share/icons/hicolor/}")"
cp -a "$i" \
"$(dirname
/app/share/icons/hicolor/"${i#"${PREFIXDIR?}"/share/icons/hicolor/}")"/"$(basename
"$i")"
cp -a "$i" \
- "$(dirname
/app/share/icons/hicolor/"${i#"${PREFIXDIR?}"/share/icons/hicolor/}")"/org.libreoffice.LibreOffice."${i##*/apps/libreoffice-}"
+ "$(dirname
/app/share/icons/hicolor/"${i#"${PREFIXDIR?}"/share/icons/hicolor/}")"/de.allotropia.ZetaOffice."${i##*/apps/zetaoffice-}"
done
mkdir -p /app/share/runtime/locale
-for i in $(ls /app/libreoffice/program/resource)
+for i in $(ls /app/zetaoffice/program/resource)
do
lang="${i%[_@]*}"
mkdir -p /app/share/runtime/locale/"${lang}"/resource
- mv /app/libreoffice/program/resource/"${i}"
/app/share/runtime/locale/"${lang}"/resource
- ln -s ../../../share/runtime/locale/"${lang}"/resource/"${i}"
/app/libreoffice/program/resource
+ mv /app/zetaoffice/program/resource/"${i}"
/app/share/runtime/locale/"${lang}"/resource
+ ln -s ../../../share/runtime/locale/"${lang}"/resource/"${i}"
/app/zetaoffice/program/resource
done
-for i in /app/libreoffice/share/registry/Langpack-*.xcd
/app/libreoffice/share/registry/res/{fcfg_langpack,registry}_*.xcd
+for i in /app/zetaoffice/share/registry/Langpack-*.xcd
/app/zetaoffice/share/registry/res/{fcfg_langpack,registry}_*.xcd
do
basename="$(basename "${i}" .xcd)"
lang="${basename#Langpack-}"
diff --git a/solenv/flatpak-manifest.in b/solenv/flatpak-manifest.in
index c213c62e0238..4effc5367bed 100644
--- a/solenv/flatpak-manifest.in
+++ b/solenv/flatpak-manifest.in
@@ -1,12 +1,12 @@
{
- "id": "org.libreoffice.LibreOffice",
+ "id": "de.allotropia.ZetaOffice",
"runtime": "org.freedesktop.Platform",
"runtime-version": "24.08",
"sdk": "org.freedesktop.Sdk",
"sdk-extensions": [
"org.freedesktop.Sdk.Extension.openjdk21"
],
- "command": "libreoffice",
+ "command": "zetaoffice",
"modules": [
{
"name": "openjdk",
@@ -816,19 +816,19 @@
"make check",
"make distro-pack-install",
"make cmd cmd='$(SRCDIR)/solenv/bin/assemble-flatpak.sh'",
- "printf '<?xml version=\"1.0\"?>\n<oor:data
xmlns:xs=\"http://www.w3.org/2001/XMLSchema\";
xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\";
xmlns:oor=\"http://openoffice.org/2001/registry\";><dependency
file=\"main\"/><oor:component-data oor:name=\"Common\"
oor:package=\"org.openoffice.Office\"><node oor:name=\"Misc\"><prop
oor:name=\"UseOpenCL\"><value>false</value></prop></node></oor:component-data></oor:data>'
>/app/libreoffice/share/registry/flatpak.xcd"
+ "printf '<?xml version=\"1.0\"?>\n<oor:data
xmlns:xs=\"http://www.w3.org/2001/XMLSchema\";
xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\";
xmlns:oor=\"http://openoffice.org/2001/registry\";><dependency
file=\"main\"/><oor:component-data oor:name=\"Common\"
oor:package=\"org.openoffice.Office\"><node oor:name=\"Misc\"><prop
oor:name=\"UseOpenCL\"><value>false</value></prop></node></oor:component-data></oor:data>'
>/app/zetaoffice/share/registry/flatpak.xcd"
]
}
],
"add-extensions": {
- "org.libreoffice.LibreOffice.BundledExtension": {
- "directory": "libreoffice/share/extensions",
+ "de.allotropia.ZetaOffice.BundledExtension": {
+ "directory": "zetaoffice/share/extensions",
"subdirectories": true,
"no-autodownload": true,
"autodelete": true
},
- "org.libreoffice.LibreOffice.Help": {
- "directory": "libreoffice/help",
+ "de.allotropia.ZetaOffice.Help": {
+ "directory": "zetaoffice/help",
"bundle": true,
"autodelete": true,
"no-autodownload": true
