android/experiments/DocumentLoader/Makefile | 23 ++++++++++++++++------- android/experiments/DocumentLoader/fonts.conf | 13 ++++++------- distro-configs/LibreOfficeAndroid.conf | 1 - fontconfig/makefile.mk | 4 ++++ sysui/README | 2 +- vcl/android/androidinst.cxx | 13 +++++++++++++ vcl/source/window/dialog.cxx | 12 +++++++++++- 7 files changed, 51 insertions(+), 17 deletions(-)
New commits: commit bc21df051670cc78094779d9b4cd1d6cc78e9509 Author: Tor Lillqvist <tlillqv...@suse.com> Date: Wed Apr 4 22:21:07 2012 +0300 No dialogs to be shown from vcl in a non-NativeActivity Android app diff --git a/vcl/source/window/dialog.cxx b/vcl/source/window/dialog.cxx index 6e10da6..1353c6c 100644 --- a/vcl/source/window/dialog.cxx +++ b/vcl/source/window/dialog.cxx @@ -46,7 +46,9 @@ #include <vcl/msgbox.hxx> #include <vcl/unowrap.hxx> - +#ifdef ANDROID +#include <osl/detail/android-bootstrap.h> +#endif // ======================================================================= @@ -592,6 +594,14 @@ sal_Bool Dialog::Close() sal_Bool Dialog::ImplStartExecuteModal() { +#ifdef ANDROID + // If a non-NativeActivity app, we shouldn't be showing any dialogs + if (lo_get_app() == NULL) { + fprintf(stderr, "%s: Should not do anything, returning false\n", __FUNCTION__); + return sal_False; + } +#endif + if ( mbInExecute ) { #ifdef DBG_UTIL commit a5aa747d59dd67731d46c7f023bf15f2b431cdb3 Author: Tor Lillqvist <tlillqv...@suse.com> Date: Wed Apr 4 22:20:29 2012 +0300 Use -g in CFLAGS when debugging requested diff --git a/fontconfig/makefile.mk b/fontconfig/makefile.mk index 55c561a..a866c4c 100644 --- a/fontconfig/makefile.mk +++ b/fontconfig/makefile.mk @@ -43,6 +43,10 @@ PATCH_FILES=$(TARFILE_NAME).patch CONFIGURE_ACTION=./configure +.IF "$(debug)" != "" +CONFIGURE_ACTION!:=CFLAGS=-g $(CONFIGURE_ACTION) +.ENDIF + CONFIGURE_FLAGS=\ --disable-static \ --with-arch=arm \ commit cdc92518c53a15945f6fc4aaad4fbc40172d257c Author: Tor Lillqvist <tlillqv...@suse.com> Date: Wed Apr 4 22:18:53 2012 +0300 Do unpack fonts and include them in the experimental Android app diff --git a/android/experiments/DocumentLoader/Makefile b/android/experiments/DocumentLoader/Makefile index f818d73..0c1e666 100644 --- a/android/experiments/DocumentLoader/Makefile +++ b/android/experiments/DocumentLoader/Makefile @@ -176,17 +176,19 @@ copy-stuff: echo 'URE_BIN_DIR=file:///assets/ure/bin/dir/not-here/can-we/exec-anyway' >> assets/program/fundamentalrc echo 'URE_MORE_TYPES=file:///assets/bin/ure/types.rdb file:///assets/bin/types.rdb' >> assets/program/fundamentalrc echo 'URE_MORE_SERVICES=file:///assets/xml/ure/services.rdb file:///assets/xml/services.rdb <$$BRAND_BASE_DIR/program/services>*' >> assets/program/fundamentalrc +# # Set up unorc echo '[Bootstrap]' > assets/program/unorc echo "URE_INTERNAL_LIB_DIR=file://$(APP_DATA_PATH)/lib/" >> assets/program/unorc echo 'UNO_TYPES=file:///assets/bin/ure/types.rdb file:///assets/bin/types.rdb $${URE_MORE_TYPES}' >> assets/program/unorc echo 'UNO_SERVICES=file:///assets/xml/ure/services.rdb file:///assets/xml/services.rdb $${URE_MORE_SERVICES}' >> assets/program/unorc +# # Set up bootstraprc echo '[Bootstrap]' > assets/program/bootstraprc echo 'InstallMode=<installmode>' >> assets/program/bootstraprc echo 'ProductKey=LibreOffice 3.6' >> assets/program/bootstraprc - echo "UserInstallation=file://$(APP_DATA_PATH)/cache/.libreoffice" >> assets/program/bootstraprc - + echo "UserInstallation=file://$(APP_DATA_PATH)" >> assets/program/bootstraprc +# # Set up versionrc echo '[Version]' > assets/program/versionrc echo 'AllLanguages=en-US' >> assets/program/versionrc @@ -197,12 +199,23 @@ copy-stuff: echo 'ProductMinor=1' >> assets/program/versionrc echo 'ProductSource=OOO350' >> assets/program/versionrc echo 'ReferenceOOoMajorMinor=3.6' >> assets/program/versionrc +# # .res files mkdir -p assets/program/resource cp $(OUTDIR)/bin/*en-US.res assets/program/resource -# Assets that are unpacked at run-time into the app's data directory. +# +# Assets that are unpacked at run-time into the app's data directory. These +# are files read by non-LO code, fontconfig and freetype for now, that doesn't +# understand "/assets" paths. mkdir -p assets/unpack/etc/fonts cp fonts.conf assets/unpack/etc/fonts + mkdir -p assets/unpack/user/fonts +# $UserInstallation/user/fonts is added to the fontconfig path in +# vcl/generic/fontmanager/helper.cxx: psp::getFontPath(). UserInstallation is +# set to the app's data dir above. + cp $(OUTDIR)/pck/Liberation*.ttf assets/unpack/user/fonts + cp $(OUTDIR)/pck/Gen*.ttf assets/unpack/user/fonts + cp $(OUTDIR)/pck/opens___.ttf assets/unpack/user/fonts # # Then gdbserver and gdb.setup so that we can debug with ndk-gdb. # diff --git a/distro-configs/LibreOfficeAndroid.conf b/distro-configs/LibreOfficeAndroid.conf index 1c8e763..d789052 100644 --- a/distro-configs/LibreOfficeAndroid.conf +++ b/distro-configs/LibreOfficeAndroid.conf @@ -19,7 +19,6 @@ --disable-xmlsec --enable-mergelibs --enable-python=internal ---without-fonts --without-junit --without-ppds --without-stlport commit 00e093ea6c601a9f549f5678ee0ba932ebbab238 Author: Tor Lillqvist <tlillqv...@suse.com> Date: Wed Apr 4 22:18:08 2012 +0300 Use proper Android font names, use longer rescan interval diff --git a/android/experiments/DocumentLoader/fonts.conf b/android/experiments/DocumentLoader/fonts.conf index 64d714c..699e9d1 100644 --- a/android/experiments/DocumentLoader/fonts.conf +++ b/android/experiments/DocumentLoader/fonts.conf @@ -10,21 +10,20 @@ <alias> <family>serif</family> <prefer> - <family>DroidSerif</family> - <family>Roboto</family> + <family>Droid Serif</family> </prefer> </alias> <alias> <family>sans-serif</family> <prefer> <family>Roboto</family> - <family>DroidSerif</family> + <family>Droid Sans Fallback</family> </prefer> </alias> <alias> <family>monospace</family> <prefer> - <family>DroidSansMono</family> + <family>Droid Sans Mono</family> </prefer> </alias> @@ -75,7 +74,7 @@ later to patch in proper code in fontonfig on Android to find out a good place. --> - <cachedir>/data/data/org.libreoffice.android.libo/fontconfig</cachedir> + <cachedir>/data/data/org.libreoffice.android.examples/fontconfig</cachedir> <config> <!-- @@ -145,10 +144,10 @@ <int>0xFFFB</int> <!-- INTERLINEAR ANNOTATION TERMINATOR --> </blank> <!-- - Rescan configuration every 30 seconds when FcFontSetList is called + Rescan configuration every 3600 seconds when FcFontSetList is called --> <rescan> - <int>30</int> + <int>3600</int> </rescan> </config> commit 7fbb897391f563e9bda7732f3e50959f82d6921e Author: Tor Lillqvist <tlillqv...@suse.com> Date: Tue Apr 3 20:21:10 2012 +0300 Add debugging output (this file is experimental anyway) diff --git a/vcl/android/androidinst.cxx b/vcl/android/androidinst.cxx index 52ebe53..014b1e3 100644 --- a/vcl/android/androidinst.cxx +++ b/vcl/android/androidinst.cxx @@ -605,6 +605,19 @@ void AndroidSalInstance::Wakeup() void AndroidSalInstance::DoReleaseYield (int nTimeoutMS) { + // Presumably this should never be called at all except in + // NativeActivity-based apps with a GUI, like android/qa/desktop, where + // the message pump is run here in vcl? + if (!mpApp) { + static bool beenhere = false; + if (!beenhere) + { + fprintf (stderr, "**** Huh, %s called in non-NativeActivity app\n", __FUNCTION__); + beenhere = true; + } + return; + } + // release yield mutex sal_uLong nAcquireCount = ReleaseYieldMutex(); commit 9d200b61aaf6cb8b06f0bbff3cee842b21d56052 Author: Tor Lillqvist <tlillqv...@suse.com> Date: Tue Apr 3 15:35:51 2012 +0300 Hmm, no, why would we want the desktop GUI images in this app? diff --git a/android/experiments/DocumentLoader/Makefile b/android/experiments/DocumentLoader/Makefile index bbebd56..f818d73 100644 --- a/android/experiments/DocumentLoader/Makefile +++ b/android/experiments/DocumentLoader/Makefile @@ -200,10 +200,6 @@ copy-stuff: # .res files mkdir -p assets/program/resource cp $(OUTDIR)/bin/*en-US.res assets/program/resource -# Image Zip archives - for I in default tango; do \ - cp $(OUTDIR)/bin/images_$$I.zip assets/share/config; \ - done # Assets that are unpacked at run-time into the app's data directory. mkdir -p assets/unpack/etc/fonts cp fonts.conf assets/unpack/etc/fonts commit d2b516eb2640fe1d55a7e1cde97a8e0227f5be3e Author: Tor Lillqvist <tlillqv...@suse.com> Date: Tue Apr 3 15:07:43 2012 +0300 Tiny edit diff --git a/sysui/README b/sysui/README index 72728d8..beedede 100644 --- a/sysui/README +++ b/sysui/README @@ -1 +1 @@ -.desktop files for different distros. +.desktop files for various Linux distros, and similar stuff for other OSes _______________________________________________ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits