distro-configs/CODAWindows.conf | 70 +++++++++++++++++------------ distro-configs/CPLinuxQtFlatpak.conf | 10 ++-- distro-configs/CPMacOS-LOKit.conf | 84 +++++++++++++++++++++-------------- 3 files changed, 102 insertions(+), 62 deletions(-)
New commits: commit a91b81b2bc5c9aeec0deccc0aa9cb2666f8a9a29 Author: Andras Timar <[email protected]> AuthorDate: Mon Dec 15 16:29:15 2025 +0100 Commit: Miklos Vajna <[email protected]> CommitDate: Tue Dec 16 09:42:15 2025 +0100 [cp] unification of Collabora Office app configs Change-Id: I9576a5d64588d983598e99bf276400bcacb175b2 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/195676 Reviewed-by: Miklos Vajna <[email protected]> Tested-by: Jenkins CollaboraOffice <[email protected]> diff --git a/distro-configs/CODAWindows.conf b/distro-configs/CODAWindows.conf index 83ccaf9524f0..82f864365b6e 100644 --- a/distro-configs/CODAWindows.conf +++ b/distro-configs/CODAWindows.conf @@ -1,48 +1,64 @@ -# Collabora Online Desktop app for Windows +# Config for Collabora Office app for Windows # Build environment ---with-visual-studio=2022 --enable-python=fully-internal ---without-lxml ---without-export-validation --disable-ccache --disable-pch ---without-doxygen ---without-java +--enable-mergelibs +--enable-release-build --enable-symbols +--with-visual-studio=2022 +--with-buildconfig-recorded +--without-lxml -# Branding (unused, but...) +# Branding --disable-community-flavor --with-branding=icon-themes/galaxy/brand_cp +--with-vendor=Collabora -# Features ---disable-breakpad ---disable-firebird-sdbc ---disable-online-update ---without-helppack-integration +# MPLv2 subset +--disable-gpgmepp +--disable-lotuswordpro +--disable-lpsolve +--disable-mariadb-sdbc +--disable-poppler +--disable-postgresql-sdbc +--with-theme=colibre colibre_svg + +# No Java +--without-java +--without-junit +--disable-ext-nlpsolver +--disable-ext-wiki-publisher +--disable-report-builder +--disable-scripting-beanshell +--disable-scripting-javascript + +# LOKit – tiled rendering --disable-avmedia ---disable-odk +--disable-opengl --disable-skia ---disable-cli ---with-myspell-dicts +--enable-cairo-rgba --enable-headless ---enable-mergelibs + +# Misc features +--disable-breakpad +--disable-cli +--disable-firebird-sdbc +--disable-librelogo +--disable-odk +--disable-online-update --disable-opencl ---disable-opengl +--disable-sal-log +--disable-sdremote +--disable-sdremote-bluetooth +--with-lang=ar ca cs cy da de el en-US en-GB es eu fi fr ga gl he hr hu hy id is it ja kk ko nl pl pt pt-BR ro ru sk sl sq sv tr uk zh-CN zh-TW +--with-myspell-dicts --without-galleries ---disable-librelogo +--without-help --without-templates # Sensible font bundling settings for desktop --with-fonts --with-docrepair-fonts --disable-noto-font - -# MPLv2 subset ---with-theme=colibre ---disable-mariadb-sdbc ---disable-postgresql-sdbc ---disable-lotuswordpro ---disable-lpsolve ---disable-poppler ---disable-gpgmepp diff --git a/distro-configs/CPLinuxQtFlatpak.conf b/distro-configs/CPLinuxQtFlatpak.conf index 44edd889e5f2..1bc1d11ee3c7 100644 --- a/distro-configs/CPLinuxQtFlatpak.conf +++ b/distro-configs/CPLinuxQtFlatpak.conf @@ -6,7 +6,7 @@ --enable-release-build --enable-symbols --with-linker-hash-style=both ---without-buildconfig-recorded +--with-buildconfig-recorded --without-lxml # Branding @@ -34,6 +34,7 @@ --disable-scripting-javascript # LOKit – tiled rendering +--disable-avmedia --disable-dbus --disable-dconf --disable-gio @@ -41,10 +42,14 @@ --disable-gtk3 --disable-gui --disable-kf5 +--disable-opengl --disable-qt5 --disable-randr +--disable-skia +--enable-cairo-rgba # Misc features +--disable-breakpad --disable-epm --disable-evolution2 --disable-firebird-sdbc @@ -55,8 +60,8 @@ --disable-sdremote --disable-sdremote-bluetooth --enable-extension-integration ---with-galleries=no --with-lang=ar ca cs cy da de el en-US en-GB es eu fi fr ga gl he hr hu hy id is it ja kk ko nl pl pt pt-BR ro ru sk sl sq sv tr uk zh-CN zh-TW +--without-galleries --without-help --without-templates @@ -88,7 +93,6 @@ --with-system-zlib # org.kde.Platform has cairo, but we use a patched one ---enable-cairo-rgba --without-system-cairo # 3rd party libs that org.kde.Platform does not have diff --git a/distro-configs/CPMacOS-LOKit.conf b/distro-configs/CPMacOS-LOKit.conf index 36845ebf565d..66e3c709abc0 100644 --- a/distro-configs/CPMacOS-LOKit.conf +++ b/distro-configs/CPMacOS-LOKit.conf @@ -1,44 +1,64 @@ -INCLUDE:CPLinux-LOKit +# Config for Collabora Office app for macOS -# LOKit needs to be able to run in the sandbox ---enable-macosx-sandbox - -# disable Linux stuff that we don't need ---disable-epm +# Build environment --disable-python ---without-package-format ---enable-gui ---without-system-dicts +--enable-macosx-sandbox +--enable-mergelibs +--enable-release-build +--with-buildconfig-recorded +--without-lxml -# Sensible font bundling settings for desktop ---with-fonts ---with-docrepair-fonts ---disable-noto-font +# Branding +--disable-community-flavor +--with-branding=icon-themes/galaxy/brand_cp +--with-vendor=Collabora -# from LibreOfficeiOS (copied only, to avoid the --host setting) ---disable-breakpad ---disable-firebird-sdbc ---disable-online-update +# MPLv2 subset +--enable-mpl-subset +--disable-gpgmepp +--disable-lotuswordpro +--disable-lpsolve +--disable-mariadb-sdbc +--disable-poppler +--disable-postgresql-sdbc +--with-theme=colibre colibre_svg ---without-export-validation ---without-helppack-integration +# No Java --without-java --without-junit +--disable-ext-nlpsolver +--disable-ext-wiki-publisher +--disable-report-builder +--disable-scripting-beanshell +--disable-scripting-javascript ---with-theme=colibre - ---with-build-platform-configure-options=--with-system-jpeg=no - ---disable-avahi +# LOKit – tiled rendering --disable-avmedia ---disable-compiler-plugins ---disable-cups ---disable-dconf ---disable-kf5 +--disable-opengl +--disable-skia +--enable-cairo-rgba +--enable-headless +--without-system-fontconfig +--without-system-freetype + +# Misc features +--disable-breakpad +--disable-cli +--disable-firebird-sdbc +--disable-librelogo --disable-odk +--disable-online-update --disable-openssl ---disable-poppler ---disable-python ---disable-skia +--disable-sal-log +--disable-sdremote +--disable-sdremote-bluetooth +--with-lang=ar ca cs cy da de el en-US en-GB es eu fi fr ga gl he hr hu hy id is it ja kk ko nl pl pt pt-BR ro ru sk sl sq sv tr uk zh-CN zh-TW +--with-myspell-dicts +--without-galleries +--without-help +--without-templates ---enable-headless +# Sensible font bundling settings for desktop +--with-fonts +--with-docrepair-fonts +--disable-noto-font
