[Libreoffice-commits] core.git: ios/CustomTarget_TiledLibreOffice_app.mk

Tor Lillqvist tml at collabora.com
Tue Aug 12 13:19:09 PDT 2014


 ios/CustomTarget_TiledLibreOffice_app.mk |    1 +
 1 file changed, 1 insertion(+)

New commits:
commit b513f288275ae96f55e232f07bf94294c66e95a1
Author: Tor Lillqvist <tml at collabora.com>
Date:   Tue Aug 12 23:05:40 2014 +0300

    LO_LIB_DIR is used in nsscrypto_initialize() so must give it a value
    
    Its actual value is irrelevant in the nsscrypto_initialize() case for
    iOS, though, as it is used to form a pathname to a hypothetical
    libnssckbi.dylib (which does not exist for iOS, as we build NSS
    statically), and we patch the NSS code to recognize the nssckbi name
    specially in the static build case... Such elegance.
    
    Change-Id: Ib5015a18e86cc604f80433a676faa10ac76e04ab

diff --git a/ios/CustomTarget_TiledLibreOffice_app.mk b/ios/CustomTarget_TiledLibreOffice_app.mk
index aa89470..9c33364 100644
--- a/ios/CustomTarget_TiledLibreOffice_app.mk
+++ b/ios/CustomTarget_TiledLibreOffice_app.mk
@@ -91,6 +91,7 @@ TiledLibreOffice_setup:
 	# Do we really need all these?
 	file=$(TiledLibreOffice_resource)/fundamentalrc; \
 	echo '[Bootstrap]'                                      >  $$file; \
+	echo 'LO_LIB_DIR=file://$$APP_DATA_DIR/lib/'            >> $$file; \
 	echo 'BRAND_BASE_DIR=file://$$APP_DATA_DIR'             >> $$file; \
 	echo 'CONFIGURATION_LAYERS=xcsxcu:$${BRAND_BASE_DIR}/share/registry res:$${BRAND_BASE_DIR}/registry' >> $$file;
 


More information about the Libreoffice-commits mailing list