Adding upstream version 1:7.0.4.upstream/1%7.0.4upstream

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>

40 files changed, 562 insertions, 0 deletions

diff --git a/distro-configs/CPAndroid.conf b/distro-configs/CPAndroid.conf
new file mode 100644
index 000000000..5aaeabedc
--- /dev/null
+++ b/distro-configs/CPAndroid.conf
@@ -0,0 +1,4 @@
+# Use LibreOfficeAndroid.conf as the base
+INCLUDE:LibreOfficeAndroid
+# Add the CP stuff
+INCLUDE:CPAndroidBranding
diff --git a/distro-configs/CPAndroidAarch64.conf b/distro-configs/CPAndroidAarch64.conf
new file mode 100644
index 000000000..5cef2d518
--- /dev/null
+++ b/distro-configs/CPAndroidAarch64.conf
@@ -0,0 +1,4 @@
+# Use LibreOfficeAndroidAarch64.conf as the base
+INCLUDE:LibreOfficeAndroidAarch64
+# Add the CP stuff
+INCLUDE:CPAndroidBranding
diff --git a/distro-configs/CPAndroidBranding.conf b/distro-configs/CPAndroidBranding.conf
new file mode 100644
index 000000000..7c2f898b4
--- /dev/null
+++ b/distro-configs/CPAndroidBranding.conf
@@ -0,0 +1,12 @@
+# CP specific stuff
+--build=x86_64-unknown-linux-gnu
+--disable-odk
+--enable-android-lok
+--with-android-api-level=21
+--with-android-package-name=com.collabora.libreoffice
+--with-vendor=Collabora
+--disable-scripting-beanshell
+--disable-scripting-javascript
+--with-lang=de en-US es pt-BR
+--with-myspell-dicts
+--enable-release-build
diff --git a/distro-configs/Jenkins/LibreOfficeLinuxUpdater.conf b/distro-configs/Jenkins/LibreOfficeLinuxUpdater.conf
new file mode 100644
index 000000000..1f6ac3674
--- /dev/null
+++ b/distro-configs/Jenkins/LibreOfficeLinuxUpdater.conf
@@ -0,0 +1,36 @@
+# disable werror for now due to Werror=format-truncation
+--disable-werror
+--with-system-dicts
+--with-myspell-dicts
+--with-system-zlib
+--without-system-poppler
+--without-system-openssl
+--without-system-libpng
+--without-system-libxml
+--without-system-jpeg
+--without-system-jars
+--without-system-postgresql
+--without-junit
+--with-linker-hash-style=both
+--with-fonts
+--with-external-thes-dir=/usr/share/mythes
+--with-external-hyph-dir=/usr/share/hyphen
+--with-external-dict-dir=/usr/share/hunspell
+--enable-dbus
+--enable-extension-integration
+# --enable-kf5
+--enable-gstreamer-1-0
+--enable-evolution2
+--enable-gio
+--enable-scripting-beanshell
+--enable-scripting-javascript
+--enable-ext-wiki-publisher
+--enable-ext-nlpsolver
+--enable-epm
+--enable-python=internal
+--enable-online-update=mar
+--disable-dconf
+--with-lang=de es fr ar zh-CN
+--with-package-format=archive
+--with-update-config=~/updater.ini
+--with-jdk-home=/etc/alternatives/java_sdk_11
diff --git a/distro-configs/Jenkins/Linux_dev_master.conf b/distro-configs/Jenkins/Linux_dev_master.conf
new file mode 100644
index 000000000..f8919a080
--- /dev/null
+++ b/distro-configs/Jenkins/Linux_dev_master.conf
@@ -0,0 +1,5 @@
+--enable-dbgutil
+--enable-kf5
+--with-jdk-home=/etc/alternatives/java_sdk_11
+CC=/opt/rh/devtoolset-7/root/usr/bin/gcc
+CXX=/opt/rh/devtoolset-7/root/usr/bin/g++
diff --git a/distro-configs/Jenkins/Linux_rel_master.conf b/distro-configs/Jenkins/Linux_rel_master.conf
new file mode 100644
index 000000000..988dff770
--- /dev/null
+++ b/distro-configs/Jenkins/Linux_rel_master.conf
@@ -0,0 +1,4 @@
+--enable-kf5
+--with-jdk-home=/etc/alternatives/java_sdk_11
+CC=/opt/rh/devtoolset-7/root/usr/bin/gcc
+CXX=/opt/rh/devtoolset-7/root/usr/bin/g++
diff --git a/distro-configs/Jenkins/Linux_ubsan_master.conf b/distro-configs/Jenkins/Linux_ubsan_master.conf
new file mode 100644
index 000000000..8e7f80550
--- /dev/null
+++ b/distro-configs/Jenkins/Linux_ubsan_master.conf
@@ -0,0 +1,29 @@
+--disable-ld
+--disable-ooenv
+--enable-avahi
+--enable-dbgutil
+--enable-dbus
+--enable-eot
+--enable-epm
+--enable-evolution2
+--enable-ext-ct2n
+--enable-ext-languagetool
+--with-system-mariadb
+--enable-ext-nlpsolver
+--enable-ext-numbertext
+--enable-ext-wiki-publisher
+--enable-gstreamer-1-0
+--enable-python=fully-internal
+--enable-release-build
+--enable-vlc
+--enable-werror
+--with-help
+--with-lang=de en-US fi hu
+--with-myspell-dicts
+--without-system-libpng
+--without-system-libxml
+--without-system-zlib
+--with-system-cairo
+--disable-compiler-plugins
+--disable-gtk3
+--with-jdk-home=/etc/alternatives/java_sdk_11
diff --git a/distro-configs/Jenkins/MacOSX_dev_master.conf b/distro-configs/Jenkins/MacOSX_dev_master.conf
new file mode 100644
index 000000000..dfc858b7c
--- /dev/null
+++ b/distro-configs/Jenkins/MacOSX_dev_master.conf
@@ -0,0 +1 @@
+--enable-debug
diff --git a/distro-configs/Jenkins/MacOSX_rel_master.conf b/distro-configs/Jenkins/MacOSX_rel_master.conf
new file mode 100644
index 000000000..e69de29bb
--- /dev/null
+++ b/distro-configs/Jenkins/MacOSX_rel_master.conf
diff --git a/distro-configs/Jenkins/PerfSuite_Linux.conf b/distro-configs/Jenkins/PerfSuite_Linux.conf
new file mode 100644
index 000000000..fcb6009be
--- /dev/null
+++ b/distro-configs/Jenkins/PerfSuite_Linux.conf
@@ -0,0 +1,8 @@
+--with-distro=LibreOfficeLinux
+--without-help
+--disable-epm
+--disable-online-update
+--without-junit
+--disable-ccache
+--enable-symbols
+--enable-mergelibs
diff --git a/distro-configs/Jenkins/Win32_dev_master.conf b/distro-configs/Jenkins/Win32_dev_master.conf
new file mode 100644
index 000000000..dfc858b7c
--- /dev/null
+++ b/distro-configs/Jenkins/Win32_dev_master.conf
@@ -0,0 +1 @@
+--enable-debug
diff --git a/distro-configs/Jenkins/Win32_rel_master.conf b/distro-configs/Jenkins/Win32_rel_master.conf
new file mode 100644
index 000000000..e69de29bb
--- /dev/null
+++ b/distro-configs/Jenkins/Win32_rel_master.conf
diff --git a/distro-configs/Jenkins/Win64_dev_master.conf b/distro-configs/Jenkins/Win64_dev_master.conf
new file mode 100644
index 000000000..dfc858b7c
--- /dev/null
+++ b/distro-configs/Jenkins/Win64_dev_master.conf
@@ -0,0 +1 @@
+--enable-debug
diff --git a/distro-configs/Jenkins/Win64_rel_master.conf b/distro-configs/Jenkins/Win64_rel_master.conf
new file mode 100644
index 000000000..e69de29bb
--- /dev/null
+++ b/distro-configs/Jenkins/Win64_rel_master.conf
diff --git a/distro-configs/Jenkins/linux_clang_dbgutil_64 b/distro-configs/Jenkins/linux_clang_dbgutil_64
new file mode 100644
index 000000000..b67352ced
--- /dev/null
+++ b/distro-configs/Jenkins/linux_clang_dbgutil_64
@@ -0,0 +1,8 @@
+--enable-dbgutil
+--enable-compiler-plugins
+COMPILER_PLUGINS_CXX=ccache g++ -std=c++11
+--enable-kf5
+--disable-compiler-plugins-analyzer-pch
+--disable-dependency-tracking
+--disable-split-debug
+--with-jdk-home=/etc/alternatives/java_sdk_11
diff --git a/distro-configs/Jenkins/linux_gcc_release_64 b/distro-configs/Jenkins/linux_gcc_release_64
new file mode 100644
index 000000000..547b97a0d
--- /dev/null
+++ b/distro-configs/Jenkins/linux_gcc_release_64
@@ -0,0 +1,5 @@
+CC=/opt/rh/devtoolset-7/root/usr/bin/gcc
+CXX=/opt/rh/devtoolset-7/root/usr/bin/g++
+--enable-kf5
+--disable-dependency-tracking
+--with-jdk-home=/etc/alternatives/java_sdk_11
diff --git a/distro-configs/Jenkins/linux_random.conf b/distro-configs/Jenkins/linux_random.conf
new file mode 100644
index 000000000..c4f546e02
--- /dev/null
+++ b/distro-configs/Jenkins/linux_random.conf
@@ -0,0 +1,2 @@
+--enable-fuzz-options
+--with-jdk-home=/etc/alternatives/java_sdk_11
diff --git a/distro-configs/Jenkins/macosx_clang_dbgutil b/distro-configs/Jenkins/macosx_clang_dbgutil
new file mode 100644
index 000000000..1e822c84b
--- /dev/null
+++ b/distro-configs/Jenkins/macosx_clang_dbgutil
@@ -0,0 +1,4 @@
+--enable-dbgutil
+--disable-symbols
+--disable-dependency-tracking
+--enable-optimized
diff --git a/distro-configs/Jenkins/screenshot_linux.conf b/distro-configs/Jenkins/screenshot_linux.conf
new file mode 100644
index 000000000..aedde6c74
--- /dev/null
+++ b/distro-configs/Jenkins/screenshot_linux.conf
@@ -0,0 +1,2 @@
+--with-lang=ALL
+--with-jdk-home=/etc/alternatives/java_sdk_11
diff --git a/distro-configs/Jenkins/screenshot_mac.conf b/distro-configs/Jenkins/screenshot_mac.conf
new file mode 100644
index 000000000..f93c7a7d1
--- /dev/null
+++ b/distro-configs/Jenkins/screenshot_mac.conf
@@ -0,0 +1 @@
+--with-lang=ALL
diff --git a/distro-configs/Jenkins/screenshot_win.conf b/distro-configs/Jenkins/screenshot_win.conf
new file mode 100644
index 000000000..f93c7a7d1
--- /dev/null
+++ b/distro-configs/Jenkins/screenshot_win.conf
@@ -0,0 +1 @@
+--with-lang=ALL
diff --git a/distro-configs/Jenkins/windows_msc_dbgutil_32 b/distro-configs/Jenkins/windows_msc_dbgutil_32
new file mode 100644
index 000000000..59e083ee9
--- /dev/null
+++ b/distro-configs/Jenkins/windows_msc_dbgutil_32
@@ -0,0 +1,4 @@
+--enable-dbgutil
+--disable-symbols
+--disable-64-bit
+--disable-dependency-tracking
diff --git a/distro-configs/LibreOfficeAndroid.conf b/distro-configs/LibreOfficeAndroid.conf
new file mode 100644
index 000000000..3ff76a8d6
--- /dev/null
+++ b/distro-configs/LibreOfficeAndroid.conf
@@ -0,0 +1,10 @@
+--host=arm-linux-androideabi
+--disable-cairo-canvas
+--disable-cups
+--disable-gstreamer-1-0
+--disable-randr
+--without-export-validation
+--without-helppack-integration
+--without-junit
+--disable-largefile
+--with-theme=colibre
diff --git a/distro-configs/LibreOfficeAndroidAarch64.conf b/distro-configs/LibreOfficeAndroidAarch64.conf
new file mode 100644
index 000000000..bfc948c02
--- /dev/null
+++ b/distro-configs/LibreOfficeAndroidAarch64.conf
@@ -0,0 +1,9 @@
+--host=aarch64-linux-android
+--disable-cairo-canvas
+--disable-cups
+--disable-gstreamer-1-0
+--disable-randr
+--without-export-validation
+--without-helppack-integration
+--without-junit
+--with-theme=colibre
diff --git a/distro-configs/LibreOfficeAndroidX86.conf b/distro-configs/LibreOfficeAndroidX86.conf
new file mode 100644
index 000000000..8fc92786c
--- /dev/null
+++ b/distro-configs/LibreOfficeAndroidX86.conf
@@ -0,0 +1,10 @@
+--host=i686-linux-android
+--disable-cairo-canvas
+--disable-cups
+--disable-gstreamer-1-0
+--disable-randr
+--without-export-validation
+--without-helppack-integration
+--without-junit
+--disable-largefile
+--with-theme=colibre
diff --git a/distro-configs/LibreOfficeAndroidX86_64.conf b/distro-configs/LibreOfficeAndroidX86_64.conf
new file mode 100644
index 000000000..efbbdbb1e
--- /dev/null
+++ b/distro-configs/LibreOfficeAndroidX86_64.conf
@@ -0,0 +1,10 @@
+--host=x86_64-linux-android
+--disable-cairo-canvas
+--disable-cups
+--disable-gstreamer-1-0
+--disable-randr
+--without-export-validation
+--without-helppack-integration
+--without-junit
+--disable-largefile
+--with-theme=colibre
diff --git a/distro-configs/LibreOfficeCoverity.conf b/distro-configs/LibreOfficeCoverity.conf
new file mode 100644
index 000000000..5b39bfd8b
--- /dev/null
+++ b/distro-configs/LibreOfficeCoverity.conf
@@ -0,0 +1,28 @@
+--enable-assert-always-abort
+--without-latest-c++
+--without-help
+--enable-gio
+--without-myspell-dicts
+--disable-ccache
+--disable-pdfium
+--disable-skia
+--enable-gstreamer-1-0
+--enable-option-checking=fatal
+--with-system-libs
+--with-system-headers
+--with-system-ucpp
+--without-system-cppunit
+--enable-dbus
+--enable-extension-integration
+--enable-gtk3
+--enable-kf5
+--enable-evolution2
+--enable-scripting-beanshell
+--enable-scripting-javascript
+--enable-ext-wiki-publisher
+--enable-ext-nlpsolver
+--enable-online-update
+--with-system-hsqldb
+--with-hsqldb-jar=/home/coverity/hsqldb.jar
+--with-system-rhino
+--with-rhino-jar=/home/coverity/js.jar
diff --git a/distro-configs/LibreOfficeFlatpak.conf b/distro-configs/LibreOfficeFlatpak.conf
new file mode 100644
index 000000000..0d0f9ce5c
--- /dev/null
+++ b/distro-configs/LibreOfficeFlatpak.conf
@@ -0,0 +1,60 @@
+--disable-odk
+--enable-release-build
+--with-ant-home=/run/build/libreoffice/ant
+--with-extra-buildid=Flatpak
+--with-help=html
+--with-jdk-home=/usr/lib/sdk/openjdk11/jvm/openjdk-11
+--with-lang=ALL
+--with-system-libs
+--with-vendor=The Document Foundation
+--without-export-validation
+--without-junit
+--without-lxml
+--without-system-apache-commons
+--without-system-beanshell
+--without-system-bluez
+--without-system-boost
+--without-system-clucene
+--without-system-coinmp
+--without-system-cppunit
+--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-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-neon
+--without-system-odbc
+--without-system-openldap
+--without-system-orcus
+--without-system-poppler
+--without-system-postgresql
+--without-system-qrcodegen
+--without-system-redland
+--without-system-sane
+--without-system-xmlsec
diff --git a/distro-configs/LibreOfficeHaiku.conf b/distro-configs/LibreOfficeHaiku.conf
new file mode 100644
index 000000000..46f497f7e
--- /dev/null
+++ b/distro-configs/LibreOfficeHaiku.conf
@@ -0,0 +1,6 @@
+--with-vendor=The Document Foundation
+--with-system-libs
+--with-boost-libdir=/system/develop/lib
+--enable-readonly-installset
+--without-java
+--without-system-jars
\ No newline at end of file
diff --git a/distro-configs/LibreOfficeLinux.conf b/distro-configs/LibreOfficeLinux.conf
new file mode 100644
index 000000000..00a70c750
--- /dev/null
+++ b/distro-configs/LibreOfficeLinux.conf
@@ -0,0 +1,37 @@
+--with-system-dicts
+--with-myspell-dicts
+--with-system-zlib
+--without-system-poppler
+--without-system-openssl
+--without-system-libpng
+--without-system-libxml
+--without-system-jpeg
+--without-system-jars
+--without-system-postgresql
+--without-junit
+--with-help=html
+--without-helppack-integration
+--with-linker-hash-style=both
+--with-fonts
+--with-external-thes-dir=/usr/share/mythes
+--with-external-hyph-dir=/usr/share/hyphen
+--with-external-dict-dir=/usr/share/hunspell
+--enable-avahi
+--enable-dbus
+--enable-extension-integration
+--enable-odk
+--enable-gtk3-kde5
+--enable-kf5
+--enable-gstreamer-1-0
+--enable-evolution2
+--enable-gio
+--enable-scripting-beanshell
+--enable-scripting-javascript
+--enable-ext-wiki-publisher
+--enable-ext-nlpsolver
+--enable-epm
+--enable-python=internal
+--enable-online-update
+--enable-breakpad
+--disable-dconf
+--enable-mergelibs
diff --git a/distro-configs/LibreOfficeMacOSX.conf b/distro-configs/LibreOfficeMacOSX.conf
new file mode 100644
index 000000000..fc7291ca7
--- /dev/null
+++ b/distro-configs/LibreOfficeMacOSX.conf
@@ -0,0 +1,10 @@
+--enable-epm
+--enable-scripting-beanshell
+--enable-scripting-javascript
+--enable-ext-nlpsolver
+--enable-extension-integration
+--enable-online-update
+--without-system-postgresql
+--with-help=html
+--with-myspell-dicts
+--with-package-format=dmg
diff --git a/distro-configs/LibreOfficeOnline.conf b/distro-configs/LibreOfficeOnline.conf
new file mode 100644
index 000000000..3f90da000
--- /dev/null
+++ b/distro-configs/LibreOfficeOnline.conf
@@ -0,0 +1,52 @@
+--disable-cups
+--disable-dbus
+--disable-dconf
+--disable-epm
+--disable-evolution2
+--disable-ext-nlpsolver
+--disable-ext-wiki-publisher
+--disable-firebird-sdbc
+--disable-gio
+--disable-gstreamer-1-0
+--disable-gtk3
+--disable-gui
+--disable-qt5
+--disable-kf5
+--disable-odk
+--disable-online-update
+--disable-skia
+--enable-pdfimport
+--disable-postgresql-sdbc
+--disable-report-builder
+--disable-scripting-beanshell
+--disable-scripting-javascript
+--disable-sdremote
+--disable-sdremote-bluetooth
+--enable-extension-integration
+--enable-mergelibs
+--enable-python=internal
+--enable-release-build
+--with-external-dict-dir=/usr/share/hunspell
+--with-external-hyph-dir=/usr/share/hyphen
+--with-external-thes-dir=/usr/share/mythes
+--with-fonts
+--with-galleries=no
+--with-lang=ALL
+--with-linker-hash-style=both
+--with-system-dicts
+--with-system-zlib
+--with-theme=colibre
+--without-branding
+--without-help
+--without-java
+--without-junit
+--with-myspell-dicts
+--without-package-format
+--without-system-cairo
+--without-system-jars
+--without-system-jpeg
+--without-system-libpng
+--without-system-libxml
+--without-system-openssl
+--disable-poppler
+--without-system-postgresql
diff --git a/distro-configs/LibreOfficeOpenBSD.conf b/distro-configs/LibreOfficeOpenBSD.conf
new file mode 100644
index 000000000..241b0153b
--- /dev/null
+++ b/distro-configs/LibreOfficeOpenBSD.conf
@@ -0,0 +1,33 @@
+--disable-dbus
+--disable-epm
+--disable-kf5
+--disable-nss-module
+--disable-odk
+--enable-ext-wiki-publisher
+--enable-python=system
+--with-alloc=system
+--with-ant-home=/usr/local/ant
+--enable-extension-integration
+--with-fonts
+--with-java
+--with-jdk-home=/usr/local/jdk-1.5.0
+--with-myspell-dicts
+--with-system-boost
+--with-system-cairo
+--with-system-cppunit
+--with-system-curl
+--with-system-expat
+--with-system-hunspell
+--with-system-icu
+--with-system-jars
+--with-system-jpeg
+--with-system-libxml
+--with-system-neon
+--with-system-openssl
+--with-system-poppler
+--with-system-redland
+--with-system-zlib
+--with-vendor=The OpenBSD project
+--without-junit
+--without-system-libwpd
+--with-help
diff --git a/distro-configs/LibreOfficeOssFuzz.conf b/distro-configs/LibreOfficeOssFuzz.conf
new file mode 100644
index 000000000..99b62453a
--- /dev/null
+++ b/distro-configs/LibreOfficeOssFuzz.conf
@@ -0,0 +1,21 @@
+--enable-fuzzers
+--disable-dynamic-loading
+--with-locales=en
+--disable-runtime-optimizations
+--disable-database-connectivity
+--disable-gui
+--disable-gtk3
+--disable-pdfium
+--disable-skia
+--disable-postgresql-sdbc
+--disable-firebird-sdbc
+--disable-coinmp
+--disable-lpsolve
+--disable-gio
+--disable-dconf
+--disable-dbus
+--disable-cups
+--disable-odk
+--disable-qrcodegen
+--without-java
+--enable-ld=gold
diff --git a/distro-configs/LibreOfficeVanillaMacAppStore.conf b/distro-configs/LibreOfficeVanillaMacAppStore.conf
new file mode 100644
index 000000000..634e014c0
--- /dev/null
+++ b/distro-configs/LibreOfficeVanillaMacAppStore.conf
@@ -0,0 +1,22 @@
+--disable-ext-ct2n
+--disable-ext-numbertext
+--disable-firebird-sdbc
+--disable-lotuswordpro
+--disable-lpsolve
+--disable-neon
+--disable-odk
+--disable-online-update
+--disable-pdfimport
+--disable-postgresql-sdbc
+--enable-extension-integration
+--enable-macosx-sandbox
+--enable-mpl-subset
+--enable-readonly-installset
+--enable-release-build
+--enable-symbols
+--with-help
+--with-myspell-dicts
+--with-theme=sukapura
+--with-vendor=Collabora
+--without-java
+--without-package-format
diff --git a/distro-configs/LibreOfficeWin32.conf b/distro-configs/LibreOfficeWin32.conf
new file mode 100644
index 000000000..0ab2f1da2
--- /dev/null
+++ b/distro-configs/LibreOfficeWin32.conf
@@ -0,0 +1,13 @@
+--without-junit
+--without-helppack-integration
+--enable-extension-integration
+--enable-scripting-beanshell
+--enable-scripting-javascript
+--enable-ext-wiki-publisher
+--enable-ext-nlpsolver
+--enable-online-update
+--enable-breakpad
+--with-help=html
+--with-myspell-dicts
+--with-package-format=msi
+--enable-mergelibs
diff --git a/distro-configs/LibreOfficeWin64.conf b/distro-configs/LibreOfficeWin64.conf
new file mode 100644
index 000000000..8e1a73ffb
--- /dev/null
+++ b/distro-configs/LibreOfficeWin64.conf
@@ -0,0 +1,14 @@
+--enable-64-bit
+--without-junit
+--without-helppack-integration
+--enable-extension-integration
+--enable-scripting-beanshell
+--enable-scripting-javascript
+--enable-ext-wiki-publisher
+--enable-ext-nlpsolver
+--enable-online-update
+--enable-breakpad
+--with-help=html
+--with-myspell-dicts
+--with-package-format=msi
+--enable-mergelibs
diff --git a/distro-configs/LibreOfficeiOS.conf b/distro-configs/LibreOfficeiOS.conf
new file mode 100644
index 000000000..2fc9b2ddf
--- /dev/null
+++ b/distro-configs/LibreOfficeiOS.conf
@@ -0,0 +1,31 @@
+--disable-breakpad
+--disable-firebird-sdbc
+--disable-online-update
+
+--without-export-validation
+--without-helppack-integration
+--without-java
+--without-junit
+
+--with-theme=colibre
+
+--with-build-platform-configure-options=--with-system-jpeg=no
+--with-macosx-version-min-required=10.11
+
+--disable-avahi
+--disable-avmedia
+--disable-compiler-plugins
+--disable-cups
+--disable-database-connectivity
+--disable-dconf
+--disable-extensions
+--disable-kf5
+--disable-odk
+--disable-openssl
+--disable-pdfium
+--disable-python
+
+--without-tls
+
+# iOS device
+--host=arm64-apple-ios
diff --git a/distro-configs/LibreOfficeiOS_Sim.conf b/distro-configs/LibreOfficeiOS_Sim.conf
new file mode 100644
index 000000000..af532d2c3
--- /dev/null
+++ b/distro-configs/LibreOfficeiOS_Sim.conf
@@ -0,0 +1,32 @@
+--disable-breakpad
+--disable-firebird-sdbc
+--disable-online-update
+
+--without-export-validation
+--without-helppack-integration
+--without-java
+--without-junit
+
+--with-theme=colibre sukapura
+
+--with-build-platform-configure-options=--with-system-jpeg=no
+--with-macosx-version-min-required=10.11
+
+--disable-avahi
+--disable-avmedia
+--disable-compiler-plugins
+--disable-cups
+--disable-database-connectivity
+--disable-dconf
+--disable-extensions
+--disable-kf5
+--disable-odk
+--disable-openssl
+--disable-pdfium
+--disable-python
+
+--without-tls
+
+# iOS simulator (debug)
+--enable-ios-simulator
+--enable-debug
diff --git a/distro-configs/README b/distro-configs/README
new file mode 100644
index 000000000..66a6e324d
--- /dev/null
+++ b/distro-configs/README
@@ -0,0 +1,32 @@
+Pre-canned distribution configurations
+
+These files are supposed to correspond to the options used when
+creating the Document Foundation (or other "canonical") builds of
+LibreOffice for various platforms. They are *not* supposed to
+represent the "most useful" options for developers in general. On the
+contrary, the intent is that just running ./autogen.sh without any
+options at all should produce a buildable configuration for developers
+with interest in working on the most commonly used parts of the code.
+
+See [[https://wiki.documentfoundation.org/Development/ReleaseBuilds]] for how
+TDF builds make use of these switches.  (Especially, since --with-package-format
+now triggers whether or not installation sets are built, all the relevant *.conf
+files specify it, except for LibreOfficeLinux.conf, where the TDF build
+instructions pass an explicit --with-package-format="rpm deb" in addition to
+--with-distro=LibreOfficeLinux.)
+
+(Possibly the above is a misunderstanding, or maybe there never even
+has been any clear consensus what situations these files actually are
+intended for.)
+
+The files contain sets of configuration parameters, and can be passed
+on the autogen.sh command line thus:
+
+./autogen.sh --with-distro=LibreOfficeFoo
+
+Contrary to the above, in the Android case the amount of parameters
+you just must use is so large, that for convenience it is always
+easiest to use the corresponding distro-configs file. This is a bug
+and needs to be fixed; also configuring for Android should ideally use
+sane (or the only possible) defaults and work fine without any
+parameters at all.