configure.ac | 1 - distro-configs/LibreOfficeAndroid.conf | 1 + distro-configs/LibreOfficeAndroidAarch64.conf | 1 + distro-configs/LibreOfficeAndroidX86.conf | 1 + sal/android/libreofficekit-jni.c | 10 ++++++---- 5 files changed, 9 insertions(+), 5 deletions(-)
New commits: commit 46bc671e837d9d9695b2d7474c2d322c7aef3142 Author: Jan Holesovsky <[email protected]> AuthorDate: Wed Jun 19 20:29:02 2019 +0200 Commit: Jan Holesovsky <[email protected]> CommitDate: Wed Oct 9 10:41:10 2019 +0200 android: Fix type of a C string to be const char[]. With the wrong type, we were measuring the sizeof() wrongly, leading to a hard to catch crash at start that appeared only from time to time. Improve the concatenation too when at that. Change-Id: I4a4ab2909124281aac99118d66c62d669294d5f7 Reviewed-on: https://gerrit.libreoffice.org/74375 Reviewed-by: Michael Meeks <[email protected]> Tested-by: Michael Meeks <[email protected]> Reviewed-on: https://gerrit.libreoffice.org/74444 Tested-by: Jenkins Reviewed-on: https://gerrit.libreoffice.org/80285 Tested-by: Jenkins CollaboraOffice <[email protected]> Reviewed-by: Jan Holesovsky <[email protected]> diff --git a/sal/android/libreofficekit-jni.c b/sal/android/libreofficekit-jni.c index 9466d2efdb3f..9f96d30d7ae0 100644 --- a/sal/android/libreofficekit-jni.c +++ b/sal/android/libreofficekit-jni.c @@ -75,7 +75,8 @@ jboolean libreofficekit_initialize(JNIEnv* env, const char *cacheDirPath; const char *apkFilePath; - const char *fontsConf = "/etc/fonts/fonts.conf"; + size_t data_dir_len; + const char fontsConf[] = "/etc/fonts/fonts.conf"; char *fontsConfPath; setenv("OOO_DISABLE_RECOVERY", "1", 1); @@ -93,9 +94,10 @@ jboolean libreofficekit_initialize(JNIEnv* env, // TMPDIR is used by osl_getTempDirURL() setenv("TMPDIR", cache_dir, 1); - fontsConfPath = malloc(strlen(data_dir) + sizeof(fontsConf)); - strcpy(fontsConfPath, data_dir); - strcat(fontsConfPath, fontsConf); + data_dir_len = strlen(data_dir); + fontsConfPath = malloc(data_dir_len + sizeof(fontsConf)); + strncpy(fontsConfPath, data_dir, data_dir_len); + strncpy(fontsConfPath + data_dir_len, fontsConf, sizeof(fontsConf)); fd = open(fontsConfPath, O_RDONLY); if (fd != -1) { commit 5b4b8538fdab65a2a8b9884fa031672e9ed32052 Author: Jan Holesovsky <[email protected]> AuthorDate: Mon Jun 17 21:35:48 2019 +0200 Commit: Jan Holesovsky <[email protected]> CommitDate: Wed Oct 9 10:40:52 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 <[email protected]> Tested-by: Andras Timar <[email protected]> Reviewed-on: https://gerrit.libreoffice.org/74442 Tested-by: Jenkins Reviewed-by: Jan Holesovsky <[email protected]> Reviewed-on: https://gerrit.libreoffice.org/80284 Tested-by: Jan Holesovsky <[email protected]> diff --git a/configure.ac b/configure.ac index 98bac05ad20a..67c2a5801b8e 100644 --- a/configure.ac +++ b/configure.ac @@ -768,7 +768,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 cc82b0df393b..2cd0df1261a6 100644 --- a/distro-configs/LibreOfficeAndroid.conf +++ b/distro-configs/LibreOfficeAndroid.conf @@ -8,3 +8,4 @@ --without-helppack-integration --without-junit --disable-largefile +--with-theme=colibre diff --git a/distro-configs/LibreOfficeAndroidAarch64.conf b/distro-configs/LibreOfficeAndroidAarch64.conf index 7a8c6416d500..a6ea82b52c4d 100644 --- a/distro-configs/LibreOfficeAndroidAarch64.conf +++ b/distro-configs/LibreOfficeAndroidAarch64.conf @@ -7,3 +7,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 d66b1b87ed27..73e29f9c800f 100644 --- a/distro-configs/LibreOfficeAndroidX86.conf +++ b/distro-configs/LibreOfficeAndroidX86.conf @@ -8,3 +8,4 @@ --without-helppack-integration --without-junit --disable-largefile +--with-theme=colibre _______________________________________________ Libreoffice-commits mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
