[Libreoffice-commits] core.git: 2 commits - external/icu helpcontent2

[Libreoffice Gerrit user]

 external/icu/ExternalProject_icu.mk |    1 +
 helpcontent2                        |    2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

New commits:
commit a5c1d1c021d98e515574f8bd689c76eaf6c6a3ce
Author:     Caolán McNamara <caolanm at redhat.com>
AuthorDate: Fri Sep 7 10:29:48 2018 +0100
Commit:     Gerrit Code Review <gerrit at gerrit.libreoffice.org>
CommitDate: Fri Sep 7 16:43:39 2018 +0200

    Update git submodules
    
    * Update helpcontent2 from branch 'master'
      - adapt to merge of namero and namerw
    
        Change-Id: I46883713361bf8107b601e4cc775ef5bce185e3d
        Reviewed-on: https://gerrit.libreoffice.org/60138
        Tested-by: Jenkins
        Reviewed-by: Caolán McNamara <caolanm at redhat.com>
        Tested-by: Caolán McNamara <caolanm at redhat.com>

diff --git a/helpcontent2 b/helpcontent2
index 991e7f1f76d5..23f7d53f6e4c 160000
--- a/helpcontent2
+++ b/helpcontent2
@@ -1 +1 @@
-Subproject commit 991e7f1f76d5ff87373cdf6e9f74897f36d8c393
+Subproject commit 23f7d53f6e4c2cc1d0c869bd31a35a248a8b0111
commit 0b8f70538040b306ccb0aa0a66e159c1b8005559
Author:     Caolán McNamara <caolanm at redhat.com>
AuthorDate: Fri Sep 7 09:50:09 2018 +0100
Commit:     Caolán McNamara <caolanm at redhat.com>
CommitDate: Fri Sep 7 16:43:20 2018 +0200

    ofz#10100 skip namespace check in icu
    
    fails under oss-fuzz with linker problem
    
    https://github.com/google/oss-fuzz/issues/1789
    
    Change-Id: I5788fca1914c1b795a91d59f7d9271f854b4d464
    Reviewed-on: https://gerrit.libreoffice.org/60134
    Tested-by: Jenkins
    Reviewed-by: Caolán McNamara <caolanm at redhat.com>
    Tested-by: Caolán McNamara <caolanm at redhat.com>

diff --git a/external/icu/ExternalProject_icu.mk b/external/icu/ExternalProject_icu.mk
index d52f3e5d3036..f0ce0d3b4c62 100644
--- a/external/icu/ExternalProject_icu.mk
+++ b/external/icu/ExternalProject_icu.mk
@@ -65,6 +65,7 @@ $(call gb_ExternalProject_get_state_target,icu,build) :
 		CPPFLAGS=$(icu_CPPFLAGS) CFLAGS=$(icu_CFLAGS) \
 		CXXFLAGS=$(icu_CXXFLAGS) LDFLAGS=$(icu_LDFLAGS) \
 		./configure \
+			ac_cv_namespace_ok=yes \
 			--disable-layout --disable-samples \
 			$(if $(CROSS_COMPILING),--disable-tools --disable-extras) \
 			$(if $(filter IOS ANDROID,$(OS)),--disable-dyload) \