[Libreoffice-commits] core.git: Branch 'distro/collabora/cd-5.3-3.1' - 4 commits - distro-configs/CPLinux-MPL.conf

[Andras Timar]

 distro-configs/CPLinux-MPL.conf |   63 ++++++++++++++++++++++++++++++++++++++++
 1 file changed, 63 insertions(+)

New commits:
commit f65e00de9d67582da436ad1e83b218bfde94c8e9
Author: Andras Timar <andras.timar at collabora.com>
Date:   Tue Mar 20 10:29:16 2018 +0100

    sync distro-configs/CPLinux-MPL.conf with distro-configs/CPLinux-LOKit.conf
    
    Change-Id: I080c611e4ee721ab9716ab493fa85336e318c4b4

diff --git a/distro-configs/CPLinux-MPL.conf b/distro-configs/CPLinux-MPL.conf
index 5caa80d6abca..83f46a0452e3 100644
--- a/distro-configs/CPLinux-MPL.conf
+++ b/distro-configs/CPLinux-MPL.conf
@@ -1,8 +1,6 @@
 --enable-mpl-subset
 --with-vendor=Collabora
 --with-branding=icon-themes/galaxy/brand_cp
---with-theme=tango
---without-help
 --with-system-dicts
 --with-myspell-dicts
 --with-system-zlib
@@ -16,29 +14,39 @@
 --with-system-curl
 --without-system-jars
 --without-system-postgresql
+--without-java
 --without-junit
---without-helppack-integration
+--without-help
 --with-linker-hash-style=both
 --with-fonts
 --enable-noto-font
+--with-galleries=no
+--with-theme=galaxy tango
 --with-external-thes-dir=/usr/share/mythes
 --with-external-hyph-dir=/usr/share/hyphen
 --with-external-dict-dir=/usr/share/hunspell
---enable-dbus
+--disable-dbus
 --enable-extension-integration
 --disable-odk
 --disable-kde4
 --disable-gtk3
 --disable-gtk
---enable-gstreamer-0-10
+--disable-gstreamer-0-10
 --disable-gstreamer-1-0
---enable-evolution2
---enable-gio
+--disable-evolution2
+--disable-gio
 --disable-scripting-beanshell
 --disable-scripting-javascript
 --disable-ext-wiki-publisher
 --disable-report-builder
 --disable-ext-nlpsolver
+--disable-sdremote
+--disable-sdremote-bluetooth
+--disable-postgresql-sdbc
+--disable-firebird-sdbc
+--disable-gltf
+--disable-collada
+--disable-randr
 --disable-ext-numbertext
 --disable-ext-ct2n
 --enable-epm
@@ -48,8 +56,7 @@
 --enable-mergelibs
 --with-package-format=deb
 --enable-release-build
---without-java
---with-lang=en-US
+--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
 --with-webdav=serf
 --disable-postgresql-sdbc
 --disable-lotuswordpro
commit 21dcbc4f2a62a2efbf697c87c32be0446a2e8f9f
Author: Andras Timar <andras.timar at collabora.com>
Date:   Tue Mar 20 10:21:12 2018 +0100

    Use system openssl, libpng, libxml, ligjpeg, expat, curl
    
    Change-Id: I827fbdc3fedc641cb82a0a9714e81f0de07ea3e3

diff --git a/distro-configs/CPLinux-MPL.conf b/distro-configs/CPLinux-MPL.conf
index 76fddc2e4949..5caa80d6abca 100644
--- a/distro-configs/CPLinux-MPL.conf
+++ b/distro-configs/CPLinux-MPL.conf
@@ -8,10 +8,12 @@
 --with-system-zlib
 --with-system-poppler
 --without-system-cairo
---without-system-openssl
---without-system-libpng
---without-system-libxml
---without-system-jpeg
+--with-system-openssl
+--with-system-libpng
+--with-system-libxml
+--with-system-jpeg
+--with-system-expat
+--with-system-curl
 --without-system-jars
 --without-system-postgresql
 --without-junit
commit 75c85e236e7a7a9ac45f1c2ff8645079f43d76d9
Author: Andras Timar <andras.timar at collabora.com>
Date:   Thu Dec 14 11:13:54 2017 +0000

    Do not use system cairo
    
    Change-Id: I4e57a4398503dddc583212e073c0e934761e3e38
    (cherry picked from commit 819158d656700658b24bfd6799c875aa7110c6ed)

diff --git a/distro-configs/CPLinux-MPL.conf b/distro-configs/CPLinux-MPL.conf
index 89ff35f5e690..76fddc2e4949 100644
--- a/distro-configs/CPLinux-MPL.conf
+++ b/distro-configs/CPLinux-MPL.conf
@@ -7,6 +7,7 @@
 --with-myspell-dicts
 --with-system-zlib
 --with-system-poppler
+--without-system-cairo
 --without-system-openssl
 --without-system-libpng
 --without-system-libxml
@@ -26,6 +27,7 @@
 --disable-odk
 --disable-kde4
 --disable-gtk3
+--disable-gtk
 --enable-gstreamer-0-10
 --disable-gstreamer-1-0
 --enable-evolution2
commit 84cee65e3fbfe82b50e6b74331c8ba107edcd4d8
Author: Andras Timar <andras.timar at collabora.com>
Date:   Fri Jul 7 16:15:58 2017 +0200

    CPLinux-MPL.conf
    
    Change-Id: I35c364f207d0e3d8b2d029ec0456b2abc45841a1
    (cherry picked from commit 8d0f02fd81f5327a1648d1a0a2c7d192f21d44ae)

diff --git a/distro-configs/CPLinux-MPL.conf b/distro-configs/CPLinux-MPL.conf
new file mode 100644
index 000000000000..89ff35f5e690
--- /dev/null
+++ b/distro-configs/CPLinux-MPL.conf
@@ -0,0 +1,52 @@
+--enable-mpl-subset
+--with-vendor=Collabora
+--with-branding=icon-themes/galaxy/brand_cp
+--with-theme=tango
+--without-help
+--with-system-dicts
+--with-myspell-dicts
+--with-system-zlib
+--with-system-poppler
+--without-system-openssl
+--without-system-libpng
+--without-system-libxml
+--without-system-jpeg
+--without-system-jars
+--without-system-postgresql
+--without-junit
+--without-helppack-integration
+--with-linker-hash-style=both
+--with-fonts
+--enable-noto-font
+--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
+--disable-odk
+--disable-kde4
+--disable-gtk3
+--enable-gstreamer-0-10
+--disable-gstreamer-1-0
+--enable-evolution2
+--enable-gio
+--disable-scripting-beanshell
+--disable-scripting-javascript
+--disable-ext-wiki-publisher
+--disable-report-builder
+--disable-ext-nlpsolver
+--disable-ext-numbertext
+--disable-ext-ct2n
+--enable-epm
+--enable-python=internal
+--disable-online-update
+--disable-dconf
+--enable-mergelibs
+--with-package-format=deb
+--enable-release-build
+--without-java
+--with-lang=en-US
+--with-webdav=serf
+--disable-postgresql-sdbc
+--disable-lotuswordpro
+--disable-lpsolve