[Libreoffice-commits] core.git: Branch 'distro/collabora/co-2021' - distro-configs/CPWin32.conf distro-configs/CPWin32-MPL.conf distro-configs/CPWin64.conf

[Andras Timar (via logerrit)]

 distro-configs/CPWin32.conf |    1 +
 distro-configs/CPWin64.conf |   27 ++++++++++++---------------
 2 files changed, 13 insertions(+), 15 deletions(-)

New commits:
commit 261a2308e2b80904d1cff050a24cee6b4bf0c509
Author:     Andras Timar <andras.timar at collabora.com>
AuthorDate: Wed May 5 17:05:09 2021 +0200
Commit:     Andras Timar <andras.timar at collabora.com>
CommitDate: Wed May 5 17:05:09 2021 +0200

    [cp] Update Windows build configs
    
    Change-Id: I5cdad8146639817092c02911a0a6cf6413688ff7

diff --git a/distro-configs/CPWin32.conf b/distro-configs/CPWin32.conf
index 02f94f92b5e7..3250815ed4bb 100644
--- a/distro-configs/CPWin32.conf
+++ b/distro-configs/CPWin32.conf
@@ -1,3 +1,4 @@
+--host=i686-pc-cygwin
 --with-vendor=Collabora
 --disable-community-flavor
 --with-branding=icon-themes/galaxy/brand_cp
diff --git a/distro-configs/CPWin32-MPL.conf b/distro-configs/CPWin64.conf
similarity index 65%
rename from distro-configs/CPWin32-MPL.conf
rename to distro-configs/CPWin64.conf
index 966d39df2d45..2fff7ab85891 100644
--- a/distro-configs/CPWin32-MPL.conf
+++ b/distro-configs/CPWin64.conf
@@ -1,28 +1,25 @@
---enable-mpl-subset
+--host=x86_64-pc-cygwin
 --with-vendor=Collabora
 --disable-community-flavor
 --with-branding=icon-themes/galaxy/brand_cp
---with-theme=colibre
---without-help
---with-myspell-dicts
 --without-junit
 --without-helppack-integration
 --enable-extension-integration
 --disable-online-update
 --disable-odk
---disable-ext-wiki-publisher
---disable-report-builder
---disable-ext-nlpsolver
---disable-ext-numbertext
---disable-ext-ct2n
---disable-postgresql-sdbc
---disable-lotuswordpro
---disable-lpsolve
---with-webdav=serf
+--enable-scripting-beanshell
+--enable-scripting-javascript
+--enable-ext-wiki-publisher
+--enable-report-builder
+--enable-ext-nlpsolver
+--enable-ext-numbertext
+--enable-ext-ct2n
 --enable-release-build
+--with-help
+--with-myspell-dicts
 --with-package-format=msi
 --enable-mergelibs
 --with-lang=ar as ast bg bn-IN br ca ca-valencia cy cs da de el en-US en-GB es et eu fi fr ga gd gl gu he hi hr hu id is it ja km kn ko lt lv ml mr nb nl nn oc or pa-IN pl pt pt-BR ro ru sk sl sr sr-Latn sv ta te tr uk vi zh-CN zh-TW
 --enable-windows-build-signing
---without-java
---disable-pdfimport
+--enable-symbols
+--enable-breakpad