[Libreoffice-commits] core.git: 2 commits - external/libabw external/libvisio l10ntools/source scp2/source solenv/inc

[Christian Lohmaier (via logerrit)]

 external/libabw/ExternalProject_libabw.mk     |    1 +
 external/libvisio/ExternalProject_libvisio.mk |    1 +
 l10ntools/source/ulfconv/msi-encodinglist.txt |    1 +
 scp2/source/ooo/module_langpack.ulf           |    6 ++++++
 solenv/inc/langlist.mk                        |    1 +
 5 files changed, 10 insertions(+)

New commits:
commit 3005c107f356ead72d18b5136361e75d82ab1dff
Author:     Christian Lohmaier <lohmaier+LibreOffice at googlemail.com>
AuthorDate: Tue Aug 27 14:12:32 2019 +0200
Commit:     Christian Lohmaier <lohmaier+LibreOffice at googlemail.com>
CommitDate: Tue Aug 27 14:12:32 2019 +0200

    libabw, libvisio: follow main configure's --disable-dependency-tracking
    
    Change-Id: Iaf4fd40a7178b50a396971cfcfd0c39211597285

diff --git a/external/libabw/ExternalProject_libabw.mk b/external/libabw/ExternalProject_libabw.mk
index c8c2bd2e9882..4f71a5739a3b 100644
--- a/external/libabw/ExternalProject_libabw.mk
+++ b/external/libabw/ExternalProject_libabw.mk
@@ -34,6 +34,7 @@ $(call gb_ExternalProject_get_state_target,libabw,build) :
 			$(if $(ENABLE_DEBUG),--enable-debug,--disable-debug) \
 			--disable-werror \
 			$(if $(verbose),--disable-silent-rules,--enable-silent-rules) \
+			$(if $(gb_FULLDEPS),,--disable-dependency-tracking) \
 			CXXFLAGS="$(gb_CXXFLAGS) $(if $(ENABLE_OPTIMIZED),$(gb_COMPILEROPTFLAGS),$(gb_COMPILERNOOPTFLAGS))" \
 			CPPFLAGS="$(CPPFLAGS) $(BOOST_CPPFLAGS)" \
 			$(if $(CROSS_COMPILING),--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM)) \
diff --git a/external/libvisio/ExternalProject_libvisio.mk b/external/libvisio/ExternalProject_libvisio.mk
index 668e30190988..8f34290a8e6e 100644
--- a/external/libvisio/ExternalProject_libvisio.mk
+++ b/external/libvisio/ExternalProject_libvisio.mk
@@ -35,6 +35,7 @@ $(call gb_ExternalProject_get_state_target,libvisio,build) :
 			$(if $(ENABLE_DEBUG),--enable-debug,--disable-debug) \
 			--disable-werror \
 			$(if $(verbose),--disable-silent-rules,--enable-silent-rules) \
+			$(if $(gb_FULLDEPS),,--disable-dependency-tracking) \
 			CXXFLAGS="$(gb_CXXFLAGS) $(if $(ENABLE_OPTIMIZED),$(gb_COMPILEROPTFLAGS),$(gb_COMPILERNOOPTFLAGS))" \
 			CPPFLAGS="$(CPPFLAGS) $(BOOST_CPPFLAGS)" \
 			$(if $(CROSS_COMPILING),--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM)) \
commit f22ce154c7aa2275ed51a5321892ba0d5254d94c
Author:     Christian Lohmaier <lohmaier+LibreOffice at googlemail.com>
AuthorDate: Tue Aug 27 14:09:34 2019 +0200
Commit:     Christian Lohmaier <lohmaier+LibreOffice at googlemail.com>
CommitDate: Tue Aug 27 14:10:43 2019 +0200

    add Silesian (szl) language pack
    
    Change-Id: I47d9659fc21abec652a5a440004c0c2d27ec3b53

diff --git a/l10ntools/source/ulfconv/msi-encodinglist.txt b/l10ntools/source/ulfconv/msi-encodinglist.txt
index 3c98165caae8..062988a85de5 100644
--- a/l10ntools/source/ulfconv/msi-encodinglist.txt
+++ b/l10ntools/source/ulfconv/msi-encodinglist.txt
@@ -149,6 +149,7 @@ st       0  1072   # Southern Sotho, Sutu
 sv       0  1053
 sw       0  1089   # Swahili
 sw-TZ    0  1089   # Swahili
+szl      0  1689   # Silesian
 so       0  1143
 ta       0  1097   # Tamil
 ta-IN    0  1097   # Tamil
diff --git a/scp2/source/ooo/module_langpack.ulf b/scp2/source/ooo/module_langpack.ulf
index 3cc7df5f0464..c4ee1701f1c5 100644
--- a/scp2/source/ooo/module_langpack.ulf
+++ b/scp2/source/ooo/module_langpack.ulf
@@ -718,6 +718,12 @@ en-US = "Sidama"
 [STR_DESC_MODULE_LANGPACK_SID]
 en-US = "Installs the Sidama user interface"
 
+[STR_NAME_MODULE_LANGPACK_SZL]
+en-US = "Silesian"
+
+[STR_DESC_MODULE_LANGPACK_SZL]
+en-US = "Installs the Silesian user interface"
+
 [STR_NAME_MODULE_LANGPACK_QTZ]
 en-US = "KeyID"
 
diff --git a/solenv/inc/langlist.mk b/solenv/inc/langlist.mk
index 9c8f266fba7e..7391ed2661fe 100644
--- a/solenv/inc/langlist.mk
+++ b/solenv/inc/langlist.mk
@@ -115,6 +115,7 @@ ss \
 st \
 sv \
 sw-TZ \
+szl \
 ta \
 te \
 tg \