[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-6.0' - 2 commits - ios/CustomTarget_iOS_setup.mk sal/osl

[Libreoffice Gerrit user]

 ios/CustomTarget_iOS_setup.mk |    1 +
 sal/osl/unx/nlsupport.cxx     |    2 ++
 2 files changed, 3 insertions(+)

New commits:
commit 6604227399fb9b1cec2f6f8962573124ee3cc676
Author:     Tor Lillqvist <tml at collabora.com>
AuthorDate: Mon Nov 12 20:06:20 2018 +0200
Commit:     Tor Lillqvist <tml at collabora.com>
CommitDate: Mon Nov 12 22:44:10 2018 +0200

    We need share/liblangtag, too
    
    Otherwise i18nlantag works weirdly.
    
    Change-Id: Ic5bf2007e586e6bb53a9e89782c2b05f73e348e3

diff --git a/ios/CustomTarget_iOS_setup.mk b/ios/CustomTarget_iOS_setup.mk
index a7f9a714f531..6d2591a1ac4f 100644
--- a/ios/CustomTarget_iOS_setup.mk
+++ b/ios/CustomTarget_iOS_setup.mk
@@ -46,6 +46,7 @@ $(IOSGEN)/native-code.h: $(BUILDDIR)/config_host.mk $(SRCDIR)/ios/CustomTarget_i
 	cp $(INSTDIR)/share/filter/vml-shape-types $(IOSRES)/filter
 	cp -R $(INSTDIR)/share/registry $(IOSRES)
 	cp $(INSTDIR)/share/config/*zip $(IOSRES)/share/config
+	cp -R $(INSTDIR)/share/liblangtag $(IOSRES)/share
 
 	# Set up rc, the "inifile". See getIniFileName_Impl().
 	echo '[Bootstrap]' > $(IOSRES)/rc
commit 54e6c774a19972a97b716d86783bdd2c3b10498b
Author:     Tor Lillqvist <tml at collabora.com>
AuthorDate: Sat Nov 10 01:16:22 2018 +0200
Commit:     Tor Lillqvist <tml at collabora.com>
CommitDate: Mon Nov 12 22:44:11 2018 +0200

    Don't bother setting LC_ALL, LC_CTYPE, and LANG on iOS
    
    An iOS app might itself, for testing and debugging purposes, look for
    LANG in the environment (passed to by the developer in Xcode; the OS
    does not set such an environment variable). It is confusing if that
    then gets (re-)set during the execution of core code.
    
    (cherry picked from commit f1801432abaaa6c6137d62319d855b6a3599e182)
    
    Change-Id: I9dcf44090aed84b55fd4240bda2562026cd8dacb

diff --git a/sal/osl/unx/nlsupport.cxx b/sal/osl/unx/nlsupport.cxx
index 5300752335af..8b520f85f60a 100644
--- a/sal/osl/unx/nlsupport.cxx
+++ b/sal/osl/unx/nlsupport.cxx
@@ -834,9 +834,11 @@ void imp_getProcessLocale( rtl_Locale ** ppLocale )
     /* return the locale */
     *ppLocale = parse_locale( locale.getStr() );
 
+#ifndef IOS
     setenv( "LC_ALL", locale.getStr(), 1);
     setenv("LC_CTYPE", locale.getStr(), 1 );
     setenv("LANG", locale.getStr(), 1 );
+#endif
 }
 #else
 /*****************************************************************************