[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-6.0' - configure.ac distro-configs/LibreOfficeAndroidAarch64.conf distro-configs/LibreOfficeAndroid.conf distro-configs/LibreOfficeAndroidX86.conf

[Jan Holesovsky (via logerrit)]

 configure.ac                                  |    1 -
 distro-configs/LibreOfficeAndroid.conf        |    1 +
 distro-configs/LibreOfficeAndroidAarch64.conf |    1 +
 distro-configs/LibreOfficeAndroidX86.conf     |    1 +
 4 files changed, 3 insertions(+), 1 deletion(-)

New commits:
commit fe8e38a8dd07ae490064c7736e7ed904f59e1647
Author:     Jan Holesovsky <kendy at collabora.com>
AuthorDate: Mon Jun 17 21:35:48 2019 +0200
Commit:     Andras Timar <andras.timar at collabora.com>
CommitDate: Tue Jun 18 09:52:22 2019 +0200

    android: Define the icon theme in distro-configs and switch to colibre.
    
    No need to reinvent the wheel and hardcode it in configure.ac.
    
    Change-Id: Idb08ea0e5ce228bb0758dbdf023f3aee44da76eb
    Reviewed-on: https://gerrit.libreoffice.org/74247
    Reviewed-by: Andras Timar <andras.timar at collabora.com>
    Tested-by: Andras Timar <andras.timar at collabora.com>

diff --git a/configure.ac b/configure.ac
index eb510df19335..a58403b3b611 100644
--- a/configure.ac
+++ b/configure.ac
@@ -760,7 +760,6 @@ linux-android*)
     enable_odk=no
     enable_postgresql_sdbc=no
     enable_python=no
-    with_theme="tango"
     test_cups=no
     test_dbus=no
     test_fontconfig=no
diff --git a/distro-configs/LibreOfficeAndroid.conf b/distro-configs/LibreOfficeAndroid.conf
index 9cc574909d66..2b4081b72c09 100644
--- a/distro-configs/LibreOfficeAndroid.conf
+++ b/distro-configs/LibreOfficeAndroid.conf
@@ -9,3 +9,4 @@
 --without-helppack-integration
 --without-junit
 --disable-largefile
+--with-theme=colibre
diff --git a/distro-configs/LibreOfficeAndroidAarch64.conf b/distro-configs/LibreOfficeAndroidAarch64.conf
index 4f3d2f44c5fc..4dbafba466d6 100644
--- a/distro-configs/LibreOfficeAndroidAarch64.conf
+++ b/distro-configs/LibreOfficeAndroidAarch64.conf
@@ -8,3 +8,4 @@
 --without-export-validation
 --without-helppack-integration
 --without-junit
+--with-theme=colibre
diff --git a/distro-configs/LibreOfficeAndroidX86.conf b/distro-configs/LibreOfficeAndroidX86.conf
index 7a2586989391..6b4aa2aff796 100644
--- a/distro-configs/LibreOfficeAndroidX86.conf
+++ b/distro-configs/LibreOfficeAndroidX86.conf
@@ -9,3 +9,4 @@
 --without-helppack-integration
 --without-junit
 --disable-largefile
+--with-theme=colibre