[Libreoffice-commits] online.git: Branch 'distro/collabora/co-4-2-3' - 2 commits - debian/control wsd/LOOLWSD.cpp

[Andras Timar (via logerrit)]

 debian/control  |    2 +-
 wsd/LOOLWSD.cpp |    4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

New commits:
commit 2045a506fd6be4b848580f7ba6b53ac71339a823
Author:     Andras Timar <andras.timar at collabora.com>
AuthorDate: Thu May 28 13:26:44 2020 +0200
Commit:     Andras Timar <andras.timar at collabora.com>
CommitDate: Thu May 28 14:54:36 2020 +0200

    we don't have to depend on locales-all
    
    Change-Id: I6afd18929b08cf82d23bdcae256ada417d292bef
    Reviewed-on: https://gerrit.libreoffice.org/c/online/+/95026
    Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice at gmail.com>
    Reviewed-by: Andras Timar <andras.timar at collabora.com>

diff --git a/debian/control b/debian/control
index 816e193f6..c926e9938 100644
--- a/debian/control
+++ b/debian/control
@@ -9,7 +9,7 @@ Package: loolwsd
 Section: web
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends},
- locales-all, adduser, expat, fontconfig, cpio, libcap2-bin, openssh-client,
+ adduser, expat, fontconfig, cpio, libcap2-bin, openssh-client,
  collaboraofficebasis6.2-calc,
  collaboraofficebasis6.2-core,
  collaboraofficebasis6.2-graphicfilter,
commit 2b7037773d43277583c082ba38e623bb7c2abb91
Author:     Andras Timar <andras.timar at collabora.com>
AuthorDate: Thu May 28 11:04:29 2020 +0200
Commit:     Andras Timar <andras.timar at collabora.com>
CommitDate: Thu May 28 14:54:26 2020 +0200

    use C.UTF-8 locale rather than en_US.UTF-8
    
    because en_US.UTF-8 is not present in minimal
    environments such as docker images
    
    Change-Id: I9edcb44df8a8f33117b2c5f1d2fa9e330bfc1770
    Reviewed-on: https://gerrit.libreoffice.org/c/online/+/95018
    Tested-by: Jenkins
    Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice at gmail.com>
    Reviewed-by: Jan Holesovsky <kendy at collabora.com>
    Reviewed-on: https://gerrit.libreoffice.org/c/online/+/95025
    Reviewed-by: Andras Timar <andras.timar at collabora.com>

diff --git a/wsd/LOOLWSD.cpp b/wsd/LOOLWSD.cpp
index 3b770cf03..538a4d0df 100644
--- a/wsd/LOOLWSD.cpp
+++ b/wsd/LOOLWSD.cpp
@@ -3610,8 +3610,8 @@ int LOOLWSD::innerMain()
     initializeSSL();
 
     // Force a uniform UTF-8 locale for ourselves & our children.
-    ::setenv("LC_ALL", "en_US.UTF-8", 1);
-    setlocale(LC_ALL, "en_US.UTF-8");
+    ::setenv("LC_ALL", "C.UTF-8", 1);
+    setlocale(LC_ALL, "C.UTF-8");
 
 #if !MOBILEAPP
     // We use the same option set for both parent and child loolwsd,