bin/distro-install-desktop-integration | 18 ++++++------- solenv/bin/assemble-flatpak-appdata.sh | 40 ++++++------------------------- solenv/bin/assemble-flatpak-desktop.sh | 14 +++++----- solenv/bin/assemble-flatpak.sh | 14 +++++----- solenv/flatpak-external-tarballs.json.in | 2 - 5 files changed, 33 insertions(+), 55 deletions(-)
New commits: commit d4c5c084d8ec7ce3786fac09676f619b59c4a95e Author: Andras Timar <[email protected]> AuthorDate: Sat Jan 10 23:09:13 2026 +0100 Commit: Andras Timar <[email protected]> CommitDate: Sat Jan 10 23:09:13 2026 +0100 [cp] Branding-related fixes for flatpak build Change-Id: Id47f5a9b64b27a2ecd44f386c7777d58f13aea05 diff --git a/bin/distro-install-desktop-integration b/bin/distro-install-desktop-integration index 7e1428ffba69..1018663b6e81 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/collaboraoffice/* "$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" "collaboraoffice-base.desktop" "gid_Module_Brand_Prg_Base" +add_wrapper localc soffice "--calc" "libreoffice" "collaboraoffice-calc.desktop" "gid_Module_Brand_Prg_Calc" +add_wrapper lodraw soffice "--draw" "libreoffice" "collaboraoffice-draw.desktop" "gid_Module_Brand_Prg_Draw" +add_wrapper lomath soffice "--math" "libreoffice" "collaboraoffice-math.desktop" "gid_Module_Brand_Prg_Math" +add_wrapper loimpress soffice "--impress" "libreoffice" "collaboraoffice-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" "collaboraoffice-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 collaboraoffice soffice "" "libreoffice" "collaboraoffice-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/collaboraoffice-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 4f73d1565e66..67580eddb4b4 100755 --- a/solenv/bin/assemble-flatpak-appdata.sh +++ b/solenv/bin/assemble-flatpak-appdata.sh @@ -29,54 +29,32 @@ cat <<EOF >"${1?}${3?}".appdata.xml <id>${3?}</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>Collabora Office Desktop</name> + <summary>The Collabora Office productivity suite</summary> <description> - <p>LibreOffice 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 - 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 - you can easily share documents with users of other popular office suites - without worrying about compatibility.</p> + <p>Collabora Office Desktop is a powerful office suite.</p> </description> <launchable type="desktop-id">${3?}.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> - <url type="faq">https://wiki.documentfoundation.org/Faq</url> - <url type="help">http://www.libreoffice.org/get-help/documentation/</url> - <url type="translate">https://wiki.documentfoundation.org/Translating_LibreOffice</url> + <url type="homepage">https://collaboraoffice.com</url> <screenshots> <screenshot type="default"> - <image>https://hub.libreoffice.org/screenshots/writer-01.png</image> + <image>writer.png</image> <caption>Sample Writer document</caption> </screenshot> <screenshot> - <image>https://hub.libreoffice.org/screenshots/calc-01.png</image> + <image>calc.png</image> <caption>Sample Calc document</caption> </screenshot> <screenshot> - <image>https://hub.libreoffice.org/screenshots/impress-01.png</image> + <image>impress.png</image> <caption>Sample Impress document</caption> </screenshot> <screenshot> - <image>https://hub.libreoffice.org/screenshots/draw-01.png</image> + <image>draw.png</image> <caption>Sample Draw document</caption> </screenshot> - <screenshot> - <image>https://hub.libreoffice.org/screenshots/base-01.png</image> - <caption>Sample Base document</caption> - </screenshot> - <screenshot> - <image>https://hub.libreoffice.org/screenshots/math-01.png</image> - <caption>Sample Math document</caption> - </screenshot> </screenshots> - <developer_name>The Document Foundation</developer_name> - <update_contact>libreoffice_at_lists.freedesktop.org</update_contact> + <developer_name>Collabora Productivity Limited</developer_name> <kudos> <kudo>HiDpiIcon</kudo> <kudo>HighContrast</kudo> diff --git a/solenv/bin/assemble-flatpak-desktop.sh b/solenv/bin/assemble-flatpak-desktop.sh index 411a7feb469a..4bd138571122 100755 --- a/solenv/bin/assemble-flatpak-desktop.sh +++ b/solenv/bin/assemble-flatpak-desktop.sh @@ -20,10 +20,10 @@ set -e ## libreoffice-*.desktop -> $3.*.desktop: -for i in "${1?}"libreoffice-*.desktop +for i in "${1?}"collaboraoffice-*.desktop do - sed -e "s/^Icon=libreoffice-/Icon=${3?}./" "$i" \ - >"${2?}${3?}"."${i#"${1?}"libreoffice-}" + sed -e "s/^Icon=collaboraoffice-/Icon=${3?}./" "$i" \ + >"${2?}${3?}"."${i#"${1?}"collaboraoffice-}" done mv "${2?}${3?}".startcenter.desktop "${2?}${3?}".desktop @@ -31,13 +31,13 @@ mv "${2?}${3?}".startcenter.desktop "${2?}${3?}".desktop # the order of XDG_DATA_DIRS - re-associating text/plain seems a bit much sed -i "s/text\/plain;//" "${2?}${3?}".writer.desktop -desktop-file-edit --set-key=X-Endless-Alias --set-value=libreoffice-startcenter \ - --set-key=X-Flatpak-RenamedFrom --set-value='libreoffice-startcenter.desktop;' \ +desktop-file-edit --set-key=X-Endless-Alias --set-value=collaboraoffice-startcenter \ + --set-key=X-Flatpak-RenamedFrom --set-value='collaboraoffice-startcenter.desktop;' \ "${2?}${3?}".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=collaboraoffice-"$i" \ --set-key=X-Flatpak-RenamedFrom \ - --set-value="libreoffice-$i.desktop;${3?}-$i.desktop;" \ + --set-value="collaboraoffice-$i.desktop;${3?}-$i.desktop;" \ "${2?}${3?}"."$i".desktop done diff --git a/solenv/bin/assemble-flatpak.sh b/solenv/bin/assemble-flatpak.sh index 96cf6edb745b..5d2e8c23a534 100755 --- a/solenv/bin/assemble-flatpak.sh +++ b/solenv/bin/assemble-flatpak.sh @@ -16,8 +16,8 @@ set -e -cp -r "${PREFIXDIR?}"/lib/libreoffice /app/ -ln -s /app/libreoffice/program/soffice /app/bin/libreoffice +cp -r "${PREFIXDIR?}"/lib/collaboraoffice /app/ +ln -s /app/collaboraoffice/program/soffice /app/bin/collaboraoffice mkdir -p /app/share/applications "${SRCDIR?}"/solenv/bin/assemble-flatpak-desktop.sh "${PREFIXDIR?}"/share/applications/ \ @@ -26,7 +26,7 @@ mkdir -p /app/share/applications ## icons/hicolor/*/apps/libreoffice-* -> ## icons/hicolor/*/apps/$1-*: mkdir -p /app/share/icons -for i in "${PREFIXDIR?}"/share/icons/hicolor/*/apps/libreoffice-* +for i in "${PREFIXDIR?}"/share/icons/hicolor/*/apps/collaboraoffice-* do mkdir -p \ "$(dirname /app/share/icons/hicolor/"${i#"${PREFIXDIR?}"/share/icons/hicolor/}")" @@ -37,12 +37,12 @@ do done mkdir -p /app/share/runtime/locale -for i in $(ls /app/libreoffice/program/resource) +for i in $(ls /app/collaboraoffice/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/collaboraoffice/program/resource/"${i}" /app/share/runtime/locale/"${lang}"/resource + ln -s ../../../share/runtime/locale/"${lang}"/resource/"${i}" /app/collaboraoffice/program/resource done # The .../share/registry/res/registry_*.xcd glob may match nothing (the @@ -50,7 +50,7 @@ done # match at least .../share/registry/Langpack-en-US.xcd and # .../share/registry/res/fcfg_langpack-en-US.xcd, respectively): shopt -s nullglob -for i in /app/libreoffice/share/registry/Langpack-*.xcd /app/libreoffice/share/registry/res/{fcfg_langpack,registry}_*.xcd +for i in /app/collaboraoffice/share/registry/Langpack-*.xcd /app/collaboraoffice/share/registry/res/{fcfg_langpack,registry}_*.xcd do basename="$(basename "${i}" .xcd)" lang="${basename#Langpack-}" diff --git a/solenv/flatpak-external-tarballs.json.in b/solenv/flatpak-external-tarballs.json.in index 975791f17b76..d2130ff19967 100644 --- a/solenv/flatpak-external-tarballs.json.in +++ b/solenv/flatpak-external-tarballs.json.in @@ -791,7 +791,7 @@ "dest-filename": "@OPENSYMBOL_TTF@" }, { - "url": "https://github.com/antijingoist/opendyslexic/releases/download/v0.9.10/@FONT_OPENDYSLEXIC_TARBALL@";, + "url": "https://github.com/antijingoist/opendyslexic/releases/download/v0.91.12/@FONT_OPENDYSLEXIC_TARBALL@";, "sha256": "@FONT_OPENDYSLEXIC_SHA256SUM@", "type": "file", "dest": "external/tarballs",
