core.git: external/liblangtag

2024-04-26 Thread Julien Nabet (via logerrit) 
 external/liblangtag/ExternalProject_liblangtag.mk |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 73229b441f0f0aa6ab4e3ae051f9d09f683361fc
Author: Julien Nabet 
AuthorDate: Thu Apr 25 21:56:45 2024 +0200
Commit: Julien Nabet 
CommitDate: Fri Apr 26 08:45:59 2024 +0200

Typo gb_Trace_ liblangtrag instead of liblangtag

Change-Id: Ib4b66549725c6010b1c9b9baf11674f86ac5f1ac
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/166652
Reviewed-by: Christian Lohmaier 
Tested-by: Jenkins

diff --git a/external/liblangtag/ExternalProject_liblangtag.mk 
b/external/liblangtag/ExternalProject_liblangtag.mk
index 0f005e27b355..a682250ebe8e 100644
--- a/external/liblangtag/ExternalProject_liblangtag.mk
+++ b/external/liblangtag/ExternalProject_liblangtag.mk
@@ -18,7 +18,7 @@ $(eval $(call gb_ExternalProject_register_targets,liblangtag,\
 ))
 
 $(call gb_ExternalProject_get_state_target,liblangtag,build):
-   $(call gb_Trace_StartRange,liblangtrag,EXTERNAL)
+   $(call gb_Trace_StartRange,liblangtag,EXTERNAL)
$(call gb_ExternalProject_run,build,\
MAKE=$(MAKE) $(gb_RUN_CONFIGURE) ./configure --disable-modules 
--disable-test --disable-introspection --with-pic \
$(if $(or $(DISABLE_DYNLOADING),$(filter MSC,$(COM))), \
@@ -44,6 +44,6 @@ $(call gb_ExternalProject_get_state_target,liblangtag,build):

$(EXTERNAL_WORKDIR)/liblangtag/.libs/liblangtag.1.dylib \
) \
)
-   $(call gb_Trace_EndRange,liblangtrag,EXTERNAL)
+   $(call gb_Trace_EndRange,liblangtag,EXTERNAL)
 
 # vim: set noet sw=4 ts=4:

[Libreoffice-commits] core.git: external/liblangtag

2020-04-22 Thread Stephan Bergmann (via logerrit) 
 external/liblangtag/UnpackedTarball_liblangtag.mk |3 +++
 1 file changed, 3 insertions(+)

New commits:
commit 4e3c4fee33fe39a61932d05cdd84d04955f9de1b
Author: Stephan Bergmann 
AuthorDate: Wed Apr 22 16:55:31 2020 +0200
Commit: Stephan Bergmann 
CommitDate: Wed Apr 22 20:39:21 2020 +0200

Mark external/liblangtag/Wformat-overflow.patch as effectively covered 
upstream

Change-Id: I31aa3c6d4e381078670cc90ccf83aadf6c7efdde
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/92708
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann 

diff --git a/external/liblangtag/UnpackedTarball_liblangtag.mk 
b/external/liblangtag/UnpackedTarball_liblangtag.mk
index 66b8051782d0..aae5a56e3295 100644
--- a/external/liblangtag/UnpackedTarball_liblangtag.mk
+++ b/external/liblangtag/UnpackedTarball_liblangtag.mk
@@ -27,6 +27,9 @@ $(eval $(call gb_UnpackedTarball_add_patches,liblangtag,\
 endif
 endif
 
+# * external/liblangtag/Wformat-overflow.patch is effectively covered by 
upstream
+#   

 "Fix
+#   possible null argument for %s directive":
 $(eval $(call gb_UnpackedTarball_add_patches,liblangtag, \
$(if 
$(SYSTEM_LIBXML),,external/liblangtag/langtag-libtool-rpath.patch.0) \
 external/liblangtag/clang-cl.patch.0 \
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: external/liblangtag

2020-04-22 Thread Eike Rathke (via logerrit) 
 external/liblangtag/README |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 4c3e5ef2419a1f67ab3a3af0248f358361ea5a8d
Author: Eike Rathke 
AuthorDate: Wed Apr 22 16:42:57 2020 +0200
Commit: Eike Rathke 
CommitDate: Wed Apr 22 16:44:29 2020 +0200

Correct upstream URL

Change-Id: Ice1e559df0614fd34c40890fc798b1ddef492618

diff --git a/external/liblangtag/README b/external/liblangtag/README
index 0f50cf2bdae5..254e40a22ccb 100644
--- a/external/liblangtag/README
+++ b/external/liblangtag/README
@@ -1,4 +1,4 @@
-From [http://tagoh.bitbucket.org/liblangtag/]. An interface for BCP47 language 
tags.
+From [https://bitbucket.org/tagoh/liblangtag]. An interface for BCP47 language 
tags.
 
 Updated IANA Language Subtag Registry files are available as
 
[https://www.iana.org/assignments/language-subtag-registry/language-subtag-registry]
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: external/liblangtag

2019-11-27 Thread Stephan Bergmann (via logerrit) 
 external/liblangtag/UnpackedTarball_liblangtag.mk |3 +++
 external/liblangtag/Wformat-overflow.patch|   17 +
 2 files changed, 20 insertions(+)

New commits:
commit 047e8ae5d189f030d565b13f97a4d6a45b00e6be
Author: Stephan Bergmann 
AuthorDate: Wed Nov 27 10:28:52 2019 +0100
Commit: Stephan Bergmann 
CommitDate: Wed Nov 27 12:43:37 2019 +0100

external/liblangtag: Avoid null pointer deref in lt_warning call

Recent GCC 10 trunk warns (when LO is configured with --enable-optimized):

> In file included from lt-script-db.c:24:
> lt-script-db.c: In function ‘lt_script_db_parse.constprop’:
> lt-messages.h:105:2: error: ‘%s’ directive argument is null 
[-Werror=format-overflow=]
>   105 |  lt_message_printf(LT_MSG_WARNING, \
>   |  ^~~
>   106 |  LT_MSG_FLAG_NONE, \
>   |  ~~~
>   107 |  0,   \
>   |  ~~
>   108 |  __VA_ARGS__)
>   |  
> lt-script-db.c:137:4: note: in expansion of macro ‘lt_warning’
>   137 |lt_warning("No subtag node: description = '%s'",
>   |^~
> lt-script-db.c:137:47: note: format string is defined here
>   137 |lt_warning("No subtag node: description = '%s'",
>   |   ^~

Change-Id: I2924f7aab84f4f2640f277ee5c2689753627ae78
Reviewed-on: https://gerrit.libreoffice.org/83869
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann 

diff --git a/external/liblangtag/UnpackedTarball_liblangtag.mk 
b/external/liblangtag/UnpackedTarball_liblangtag.mk
index cd52b169fa57..66b8051782d0 100644
--- a/external/liblangtag/UnpackedTarball_liblangtag.mk
+++ b/external/liblangtag/UnpackedTarball_liblangtag.mk
@@ -17,6 +17,8 @@ $(eval $(call gb_UnpackedTarball_set_pre_action,liblangtag,\
 
 $(eval $(call gb_UnpackedTarball_update_autoconf_configs,liblangtag))
 
+$(eval $(call gb_UnpackedTarball_set_patchlevel,liblangtag,0))
+
 ifneq ($(OS),MACOSX)
 ifneq ($(OS),WNT)
 $(eval $(call gb_UnpackedTarball_add_patches,liblangtag,\
@@ -29,6 +31,7 @@ $(eval $(call gb_UnpackedTarball_add_patches,liblangtag, \
$(if 
$(SYSTEM_LIBXML),,external/liblangtag/langtag-libtool-rpath.patch.0) \
 external/liblangtag/clang-cl.patch.0 \
 external/liblangtag/langtag-valencia.patch.0 \
+external/liblangtag/Wformat-overflow.patch \
 ))
 
 # vim: set noet sw=4 ts=4:
diff --git a/external/liblangtag/Wformat-overflow.patch 
b/external/liblangtag/Wformat-overflow.patch
new file mode 100644
index ..f2d017e4b395
--- /dev/null
+++ b/external/liblangtag/Wformat-overflow.patch
@@ -0,0 +1,17 @@
+--- liblangtag/lt-script-db.c
 liblangtag/lt-script-db.c
+@@ -134,8 +134,12 @@
+   cnode = cnode->next;
+   }
+   if (!subtag) {
+-  lt_warning("No subtag node: description = '%s'",
+- desc);
++  if (!desc) {
++  lt_warning("No subtag nor description node");
++  } else {
++  lt_warning("No subtag node: description = '%s'",
++ desc);
++  }
+   goto bail1;
+   }
+   if (!desc) {
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: external/liblangtag

2018-04-12 Thread Stephan Bergmann 
 external/liblangtag/ExternalProject_liblangtag.mk |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit cf215a627ccf106cc5de2575f145c769ab6c4d73
Author: Stephan Bergmann 
Date:   Thu Apr 12 13:41:17 2018 +0200

Missing quoting

...so the $ are not eaten by the sub-make

Change-Id: Ifa9383a5d31720be517c03631224f5244f112d3d
Reviewed-on: https://gerrit.libreoffice.org/52775
Tested-by: Jenkins 
Reviewed-by: Stephan Bergmann 

diff --git a/external/liblangtag/ExternalProject_liblangtag.mk 
b/external/liblangtag/ExternalProject_liblangtag.mk
index a2c3cbf39b59..963cf5a0d6da 100644
--- a/external/liblangtag/ExternalProject_liblangtag.mk
+++ b/external/liblangtag/ExternalProject_liblangtag.mk
@@ -44,7 +44,7 @@ $(call gb_ExternalProject_get_state_target,liblangtag,build):
REAL_CC_FLAGS="$(filter -%,$(CC))") \
   $(if $(verbose),V=1) \
   $(MAKE) \
-LIBO_TUNNEL_LIBRARY_PATH='$(subst ','\'',$(call 
gb_Helper_extend_ld_path,$(call 
gb_UnpackedTarball_get_dir,liblangtag)/liblangtag/.libs))' \
+LIBO_TUNNEL_LIBRARY_PATH='$(subst ','\'',$(subst 
$$,,$(call gb_Helper_extend_ld_path,$(call 
gb_UnpackedTarball_get_dir,liblangtag)/liblangtag/.libs)))' \
$(if $(filter MACOSX,$(OS)),\
&& $(PERL) 
$(SRCDIR)/solenv/bin/macosx-change-install-names.pl shl URELIB \

$(EXTERNAL_WORKDIR)/liblangtag/.libs/liblangtag.1.dylib \
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: external/liblangtag

2017-09-09 Thread Thorsten Behrens 
 external/liblangtag/ExternalProject_langtag.mk |5 +
 1 file changed, 5 insertions(+)

New commits:
commit 6edd48993bf345baf973c134d859b50ad13fd18a
Author: Thorsten Behrens 
Date:   Sat Sep 9 23:27:22 2017 +0200

liblangtag: pass through debug options to CFLAGS

Change-Id: I08ecf01de2a7f32117dc4a3cac3cd782c0c8f83f
Reviewed-on: https://gerrit.libreoffice.org/42126
Tested-by: Jenkins 
Reviewed-by: Thorsten Behrens 

diff --git a/external/liblangtag/ExternalProject_langtag.mk 
b/external/liblangtag/ExternalProject_langtag.mk
index d20d7dd7fd85..a6c23b9b5455 100644
--- a/external/liblangtag/ExternalProject_langtag.mk
+++ b/external/liblangtag/ExternalProject_langtag.mk
@@ -28,6 +28,11 @@ $(call gb_ExternalProject_get_state_target,langtag,build):
--enable-shared --disable-static) \
$(if $(verbose),--disable-silent-rules,--enable-silent-rules) \
$(if $(filter 
TRUE,$(HAVE_GCC_BUILTIN_ATOMIC)),"lt_cv_has_atomic=yes","lt_cv_has_atomic=no") \
+   CFLAGS='$(CFLAGS) \
+   $(if $(ENABLE_OPTIMIZED), \
+   
$(gb_COMPILEROPTFLAGS),$(gb_COMPILERNOOPTFLAGS)) \
+   $(if $(ENABLE_DEBUG),$(gb_DEBUG_CFLAGS)) \
+   $(if $(filter 
$(true),$(gb_SYMBOL)),$(gb_DEBUGINFO_FLAGS))' \
$(if $(CROSS_COMPILING),--build=$(BUILD_PLATFORM) 
--host=$(HOST_PLATFORM) "ac_cv_va_copy=no") \
LIBXML2_CFLAGS="$(LIBXML_CFLAGS)" \
LIBXML2_LIBS="$(if $(filter WNT,$(OS)),-L$(call 
gb_UnpackedTarball_get_dir,xml2)/win32/bin.msvc -llibxml2,$(LIBXML_LIBS))" \
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: external/liblangtag

2017-06-12 Thread jan Iversen 
 external/liblangtag/UnpackedTarball_langtag.mk |1 +
 external/liblangtag/langtag-iOS.patch.0|   20 
 2 files changed, 21 insertions(+)

New commits:
commit 025faa3b755e52615b9a4621fd53ccf47afcac72
Author: jan Iversen 
Date:   Mon Jun 12 12:30:30 2017 +0200

iOS, patch langtag

Support for arm64

Change-Id: I1f5d8a11f42026b08aa01a8a19059c18ff116c1c

diff --git a/external/liblangtag/UnpackedTarball_langtag.mk 
b/external/liblangtag/UnpackedTarball_langtag.mk
index 32cfd8685ab9..fb8ddd1ef137 100644
--- a/external/liblangtag/UnpackedTarball_langtag.mk
+++ b/external/liblangtag/UnpackedTarball_langtag.mk
@@ -27,6 +27,7 @@ $(eval $(call gb_UnpackedTarball_add_patches,langtag, \
$(if 
$(SYSTEM_LIBXML),,external/liblangtag/langtag-libtool-rpath.patch.0) \
 external/liblangtag/clang-cl.patch.0 \
 external/liblangtag/langtag-valencia.patch.0 \
+external/liblangtag/langtag-iOS.patch.0 \
 ))
 
 # vim: set noet sw=4 ts=4:
diff --git a/external/liblangtag/langtag-iOS.patch.0 
b/external/liblangtag/langtag-iOS.patch.0
new file mode 100644
index ..ffd4a39a815a
--- /dev/null
+++ b/external/liblangtag/langtag-iOS.patch.0
@@ -0,0 +1,20 @@
+--- config.sub
 config.sub
+@@ -253,7 +253,7 @@
+   | alpha64 | alpha64ev[4-8] | alpha64ev56 | alpha64ev6[78] | 
alpha64pca5[67] \
+   | am33_2.0 \
+   | arc | arceb \
+-  | arm | arm[bl]e | arme[lb] | armv[2-8] | armv[3-8][lb] | armv7[arm] \
++  | arm | arm[bl]e | arme[lb] | armv[2-8] | armv[3-8][lb] | armv7[arm] | 
arm64 \
+   | avr | avr32 \
+   | be32 | be64 \
+   | bfin \
+@@ -374,7 +374,7 @@
+   | alpha-* | alphaev[4-8]-* | alphaev56-* | alphaev6[78]-* \
+   | alpha64-* | alpha64ev[4-8]-* | alpha64ev56-* | alpha64ev6[78]-* \
+   | alphapca5[67]-* | alpha64pca5[67]-* | arc-* | arceb-* \
+-  | arm-*  | armbe-* | armle-* | armeb-* | armv*-* \
++  | arm-*  | armbe-* | armle-* | armeb-* | armv*-* | arm64-* \
+   | avr-* | avr32-* \
+   | be32-* | be64-* \
+   | bfin-* | bs2000-* \
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: external/liblangtag

2017-05-24 Thread Caolán McNamara 
 external/liblangtag/UnpackedTarball_langtag.mk |1 
 external/liblangtag/langtag-valencia.patch.0   |   29 +
 2 files changed, 30 insertions(+)

New commits:
commit 18ef85fb86a4b0f356cb1d94270b2b6c6dab9161
Author: Caolán McNamara 
Date:   Wed May 24 11:50:09 2017 +0100

liblangtag#10 support roundtripping ca@valencia

Change-Id: I67932541fbb14316798fe94b64b4b32a3d1c29f6
Reviewed-on: https://gerrit.libreoffice.org/37984
Tested-by: Jenkins 
Reviewed-by: Caolán McNamara 
Tested-by: Caolán McNamara 

diff --git a/external/liblangtag/UnpackedTarball_langtag.mk 
b/external/liblangtag/UnpackedTarball_langtag.mk
index d8fccf261512..32cfd8685ab9 100644
--- a/external/liblangtag/UnpackedTarball_langtag.mk
+++ b/external/liblangtag/UnpackedTarball_langtag.mk
@@ -26,6 +26,7 @@ endif
 $(eval $(call gb_UnpackedTarball_add_patches,langtag, \
$(if 
$(SYSTEM_LIBXML),,external/liblangtag/langtag-libtool-rpath.patch.0) \
 external/liblangtag/clang-cl.patch.0 \
+external/liblangtag/langtag-valencia.patch.0 \
 ))
 
 # vim: set noet sw=4 ts=4:
diff --git a/external/liblangtag/langtag-valencia.patch.0 
b/external/liblangtag/langtag-valencia.patch.0
new file mode 100644
index ..dc28043042e4
--- /dev/null
+++ b/external/liblangtag/langtag-valencia.patch.0
@@ -0,0 +1,29 @@
+--- liblangtag/lt-tag.c
 liblangtag/lt-tag.c
+@@ -2009,11 +2009,23 @@
+   if (ctag->region)
+   lt_string_append_printf(string, "_%s",
+   lt_region_get_tag(ctag->region));
+-  if (ctag->script) {
++  if (ctag->script)
+   mod = lt_script_convert_to_modifier(ctag->script);
+-  if (mod)
+-  lt_string_append_printf(string, "@%s", mod);
++  if (!mod && ctag->variants)
++  {
++  lt_list_t* l;
++  for (l = ctag->variants; l != NULL; l = lt_list_next(l)) {
++  lt_variant_t *variant = lt_list_value(l);
++  const char *s = lt_variant_get_tag(variant);
++  if (lt_strcmp0(s, "valencia") == 0) {
++  mod = "valencia";
++  break;
++  }
++  }
+   }
++  if (mod)
++  lt_string_append_printf(string, "@%s", mod);
++
+   lt_tag_unref(ctag);
+ 
+   bail:
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: external/liblangtag

2017-03-20 Thread Stephan Bergmann 
 external/liblangtag/README |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 231070fc9c94411e5a5feacc7b375886b8a904a2
Author: Stephan Bergmann 
Date:   Mon Mar 20 21:05:52 2017 +0100

Adapt README to MD5SUM -> SHA256SUM change

Change-Id: Icd7d15c342de28b664295916a92023feca9f219c

diff --git a/external/liblangtag/README b/external/liblangtag/README
index 5d7bfc948237..0f50cf2bdae5 100644
--- a/external/liblangtag/README
+++ b/external/liblangtag/README
@@ -7,4 +7,4 @@ language-subtag-registry--MM-DD.tar.bz2 archive, with 
-MM-DD being the
 File-Date entry of the file, for example
 language-subtag-registry-2015-08-04.tar.bz2, and uploaded to the external
 sources repository to be included in the build of liblangtag. See download.lst
-LANGTAGREG_TARBALL and LANGTAGREG_MD5SUM.
+LANGTAGREG_TARBALL and LANGTAGREG_SHA256SUM.
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: external/liblangtag

2016-09-27 Thread Stephan Bergmann 
 external/liblangtag/clang-cl.patch.0 |   21 +
 1 file changed, 21 insertions(+)

New commits:
commit 0901c29d522f03c29c60fcda537918c2bf9eda63
Author: Stephan Bergmann 
Date:   Tue Sep 27 17:30:23 2016 +0200

Adapt external/liblangtag/clang-cl.patch.0 to liblangtag 0.6.1

Change-Id: Idf75ffa042c4858ef9bea99d603adb691b295139

diff --git a/external/liblangtag/clang-cl.patch.0 
b/external/liblangtag/clang-cl.patch.0
index cbc22a26..94348b6 100755
--- a/external/liblangtag/clang-cl.patch.0
+++ b/external/liblangtag/clang-cl.patch.0
@@ -18,3 +18,24 @@
  #  define LT_GNUC_NULL_TERMINATED \
__attribute__((__sentinel__))
  #else /* !__GNUC__ */
+@@ -220,17 +220,17 @@
+  *
+  * See the GNU C documentation for more details.
+  */
+-#if __GNUC__ > 3 || (__GNUC__ == 3 && __GNUC_MINOR__ >= 1)
++#if defined __GNUC__ && (__GNUC__ > 3 || (__GNUC__ == 3 && __GNUC_MINOR__ >= 
1))
+ #define LT_GNUC_DEPRECATED __attribute__((__deprecated__))
+ #else
+ #define LT_GNUC_DEPRECATED
+ #endif
+-#if __GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 5)
++#if defined __GNUC__ && (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 
5))
+ #define LT_GNUC_DEPRECATED_FOR(f) __attribute__((deprecated("Use " #f " 
instead")))
+ #else
+ #define LT_GNUC_DEPRECATED_FOR(f) LT_GNUC_DEPRECATED
+ #endif
+-#if __GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 6)
++#if defined __GNUC__ && (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 
6))
+ #define LT_GNUC_BEGIN_IGNORE_DEPRECATIONS \
+   _Pragma ("GCC diagnostic push") \
+   _Pragma ("GCC diagnostic ignored \"-Wdeprecated-declarations\"")
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: external/liblangtag

2016-09-23 Thread Stephan Bergmann 
 external/liblangtag/ExternalProject_langtag.mk|2 +-
 external/liblangtag/langtag-libtool-rpath.patch.0 |   11 +++
 2 files changed, 12 insertions(+), 1 deletion(-)

New commits:
commit 3a2818280ad65c3d0aa9e720f62fec571713b2e7
Author: Stephan Bergmann 
Date:   Fri Sep 23 09:03:49 2016 +0200

external/liblangtag: Tunnel LD_LIBRARY_PATH to where it's actually needed

At least make-4.1-5.fc24.x86_64's /usr/bin/make (indirectly) links against
libfreebl3.so, so it could erroneously pick up our 
instdir/program/libfreebl3.so
delivered there from external/nss.  But that's a problem for ASan/UBSan 
builds,
where that libfreebl3.so is instrumented and expects to find certain symbols
exported from the executable (and which /usr/bin/make of course doesn't 
have),
so running make from within external/liblangtag/ExternalProject_langtag.mk
fails.

Turns out that the only place where LD_LIBRARY_PATH is needed during the 
build
of external/liblangtag is when running
workdir/UnpackedTarget/langtag/data/reg2xml.

(This is unrelated to the recent changes to external/liblangtag by the way; 
just
happend to show up now by accident, when doing an incremental build where
external/nss had already been built when external/liblangtag got rebuilt.
external/firebird has a similar problem, but everybody seems to run 
ASan/UBSan
builds with --disable-firebird-sdbc anyway for now.)

Change-Id: I6e045b6d33a154e350f4640265e6568f96634187
Reviewed-on: https://gerrit.libreoffice.org/29211
Reviewed-by: Stephan Bergmann 
Tested-by: Stephan Bergmann 

diff --git a/external/liblangtag/ExternalProject_langtag.mk 
b/external/liblangtag/ExternalProject_langtag.mk
index 6ac51f3..5be74fb 100644
--- a/external/liblangtag/ExternalProject_langtag.mk
+++ b/external/liblangtag/ExternalProject_langtag.mk
@@ -39,8 +39,8 @@ $(call gb_ExternalProject_get_state_target,langtag,build):
REAL_CC="$(shell cygpath -w $(lastword $(filter-out 
-%,$(CC" \
REAL_CC_FLAGS="$(filter -%,$(CC))") \
   $(if $(verbose),V=1) \
-  $(call gb_Helper_extend_ld_path,$(call 
gb_UnpackedTarball_get_dir,langtag)/liblangtag/.libs) \
   $(MAKE) \
+LIBO_TUNNEL_LIBRARY_PATH='$(subst ','\'',$(call 
gb_Helper_extend_ld_path,$(call 
gb_UnpackedTarball_get_dir,langtag)/liblangtag/.libs))' \
$(if $(filter MACOSX,$(OS)),\
&& $(PERL) 
$(SRCDIR)/solenv/bin/macosx-change-install-names.pl shl OOO \

$(EXTERNAL_WORKDIR)/liblangtag/.libs/liblangtag.1.dylib \
diff --git a/external/liblangtag/langtag-libtool-rpath.patch.0 
b/external/liblangtag/langtag-libtool-rpath.patch.0
index 905516f..368832b 100644
--- a/external/liblangtag/langtag-libtool-rpath.patch.0
+++ b/external/liblangtag/langtag-libtool-rpath.patch.0
@@ -10,3 +10,14 @@ Prevent libtool from adding annoying stuff to RPATH
;;
  
  netbsd*)
+--- data/Makefile.in
 data/Makefile.in
+@@ -859,7 +859,7 @@
+ @cross_compiling_t...@language-subtag-registry.xml: language-subtag-registry 
reg2xml.c Makefile
+ @CROSS_COMPILING_TRUE@@echo Warning: Unable to rebuild $@ when 
cross-compiling
+ @CROSS_COMPILING_FALSE@@rebuild_data_t...@language-subtag-registry.xml: 
language-subtag-registry reg2xml$(EXEEXT) Makefile
+-@CROSS_COMPILING_FALSE@@REBUILD_DATA_TRUE@$(AM_V_GEN) 
$(builddir)/reg2xml$(EXEEXT) $(srcdir)/language-subtag-registry $@.tmp || 
$(builddir)/reg2xml$(EXEEXT) $(builddir)/language-subtag-registry $@.tmp; \
++@CROSS_COMPILING_FALSE@@REBUILD_DATA_TRUE@$(AM_V_GEN) 
$(LIBO_TUNNEL_LIBRARY_PATH) $(builddir)/reg2xml$(EXEEXT) 
$(srcdir)/language-subtag-registry $@.tmp || $(LIBO_TUNNEL_LIBRARY_PATH) 
$(builddir)/reg2xml$(EXEEXT) $(builddir)/language-subtag-registry $@.tmp; \
+ @CROSS_COMPILING_FALSE@@REBUILD_DATA_TRUE@head -1 $@.tmp | grep -E 
'^<\?xml version'>/dev/null 2>&1 && mv $@.tmp $@ || (echo "E: $@ isn't an 
expected result"; rm $@.tmp)
+ @CROSS_COMPILING_FALSE@@rebuild_data_fa...@language-subtag-registry.xml:
+ @CROSS_COMPILING_FALSE@@REBUILD_DATA_FALSE@   @echo Warning: the rebuild of 
$@ is explicitly disabled.
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: external/liblangtag solenv/gbuild

2016-09-22 Thread Stephan Bergmann 
 external/liblangtag/ExternalProject_langtag.mk |2 +-
 solenv/gbuild/platform/com_MSC_defs.mk |   10 ++
 2 files changed, 11 insertions(+), 1 deletion(-)

New commits:
commit 14863b9a065ddc3332dd1da14c28708919b0101d
Author: Stephan Bergmann 
Date:   Thu Sep 22 09:52:41 2016 +0200

Make workdir/UnpackedTarball/langtag/data/.libs/lt-reg2xml find its libs

...after ecd5d49dc30d11845ccc1a14e26bf37d73959463 "liblangtag: prevent 
libtool
from adding annoying stuff to RPATH".  "Outsmarting" libtool in the way
described in 1d028d4783da69c5c0e6e0b59e0f8ac55eb9d2b1 "Fix Linux RPATH of
various external modules" only works if there's no utility applications in 
the
outsmarted module, that are run while building the outsmarted module (cf. 
the
redland case in 1d028d4783da69c5c0e6e0b59e0f8ac55eb9d2b1).  To work around 
that,
pass in an LD_LIBRARY_PATH (or equivalent) that finds the relevant libs as 
built
in that module.

(And gb_Helper_extend_ld_path was until now only available in 
com_GCC_defs.mk.
There, it accepts any number of paths separated by ":".  When used in a
platform-independend way like it is used here, it will only support a single
path.)

Change-Id: Ic615e436b19b8b9aa7daa019c8f5287de90c3abc

diff --git a/external/liblangtag/ExternalProject_langtag.mk 
b/external/liblangtag/ExternalProject_langtag.mk
index cf41f35..6ac51f3 100644
--- a/external/liblangtag/ExternalProject_langtag.mk
+++ b/external/liblangtag/ExternalProject_langtag.mk
@@ -39,7 +39,7 @@ $(call gb_ExternalProject_get_state_target,langtag,build):
REAL_CC="$(shell cygpath -w $(lastword $(filter-out 
-%,$(CC" \
REAL_CC_FLAGS="$(filter -%,$(CC))") \
   $(if $(verbose),V=1) \
-  $(gb_Helper_set_ld_path) \
+  $(call gb_Helper_extend_ld_path,$(call 
gb_UnpackedTarball_get_dir,langtag)/liblangtag/.libs) \
   $(MAKE) \
$(if $(filter MACOSX,$(OS)),\
&& $(PERL) 
$(SRCDIR)/solenv/bin/macosx-change-install-names.pl shl OOO \
diff --git a/solenv/gbuild/platform/com_MSC_defs.mk 
b/solenv/gbuild/platform/com_MSC_defs.mk
index 91a3d4a..940801b 100644
--- a/solenv/gbuild/platform/com_MSC_defs.mk
+++ b/solenv/gbuild/platform/com_MSC_defs.mk
@@ -316,6 +316,11 @@ define gb_Helper_prepend_ld_path
 PATH="$(shell cygpath -w $(INSTDIR)/$(LIBO_URE_LIB_FOLDER));$(shell cygpath -w 
$(INSTDIR)/$(LIBO_BIN_FOLDER));$(1);$$PATH"
 endef
 
+# $(1): one directory pathname to append to the ld path
+define gb_Helper_extend_ld_path
+$(gb_Helper_set_ld_path);$(shell cygpath -w $(1))
+endef
+
 else
 gb_Helper_set_ld_path := PATH="$(shell cygpath -u 
$(INSTDIR)/$(LIBO_URE_LIB_FOLDER)):$(shell cygpath -u 
$(INSTDIR)/$(LIBO_BIN_FOLDER)):$$PATH"
 
@@ -323,6 +328,11 @@ define gb_Helper_prepend_ld_path
 PATH="$(shell cygpath -u $(INSTDIR)/$(LIBO_URE_LIB_FOLDER)):$(shell cygpath -u 
$(INSTDIR)/$(LIBO_BIN_FOLDER)):$(1):$$PATH"
 endef
 
+# $(1): one directory pathname to append to the ld path
+define gb_Helper_extend_ld_path
+$(gb_Helper_set_ld_path):$(shell cygpath -u $(1))
+endef
+
 endif
 
 # vim: set noet sw=4:
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: external/liblangtag

2015-11-10 Thread Eike Rathke 
 external/liblangtag/README |9 +
 1 file changed, 9 insertions(+)

New commits:
commit 0871a03bbda59e0935234c9760a655a911ea0897
Author: Eike Rathke 
Date:   Tue Nov 10 14:41:27 2015 +0100

add description of the language-subtag-registry update process

Change-Id: I94b8cd007bdbf3b535c5de9eb56fe5495f39dabf

diff --git a/external/liblangtag/README b/external/liblangtag/README
index 694daee..5d7bfc9 100644
--- a/external/liblangtag/README
+++ b/external/liblangtag/README
@@ -1 +1,10 @@
 From [http://tagoh.bitbucket.org/liblangtag/]. An interface for BCP47 language 
tags.
+
+Updated IANA Language Subtag Registry files are available as
+[https://www.iana.org/assignments/language-subtag-registry/language-subtag-registry]
+and per convention are stored as a data/language-subtag-registry file in a
+language-subtag-registry--MM-DD.tar.bz2 archive, with -MM-DD being the
+File-Date entry of the file, for example
+language-subtag-registry-2015-08-04.tar.bz2, and uploaded to the external
+sources repository to be included in the build of liblangtag. See download.lst
+LANGTAGREG_TARBALL and LANGTAGREG_MD5SUM.
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: external/liblangtag

2015-09-03 Thread David Ostrovsky 
 external/liblangtag/UnpackedTarball_langtag.mk |7 ++--
 external/liblangtag/liblangtag-msvc.patch  |   36 +
 2 files changed, 39 insertions(+), 4 deletions(-)

New commits:
commit 8a4848b373afee618769051d6c70fb4c9efdaeed
Author: David Ostrovsky 
Date:   Sun Jul 5 10:58:55 2015 +0200

Fix liblangtag on MSVC 14.0

Change-Id: Ied20186f4863b49dba5d0c7ed98b3a297f3f2239
Reviewed-on: https://gerrit.libreoffice.org/16767
Tested-by: Jenkins 
Reviewed-by: Michael Stahl 

diff --git a/external/liblangtag/UnpackedTarball_langtag.mk 
b/external/liblangtag/UnpackedTarball_langtag.mk
index 541baa3..52ffc39 100644
--- a/external/liblangtag/UnpackedTarball_langtag.mk
+++ b/external/liblangtag/UnpackedTarball_langtag.mk
@@ -15,10 +15,9 @@ $(eval $(call gb_UnpackedTarball_set_pre_action,langtag,\
$(GNUTAR) -x -j -f 
$(gb_UnpackedTarget_TARFILE_LOCATION)/$(LANGTAGREG_TARBALL) \
 ))
 
-# Currently no patches applied, if there were it would be:
-#$(eval $(call gb_UnpackedTarball_add_patches,langtag,\
-#  external/liblangtag/your-modification.patch \
-#))
+$(eval $(call gb_UnpackedTarball_add_patches,langtag,\
+   external/liblangtag/liblangtag-msvc.patch \
+))
 
 ifeq ($(OS),WNT)
 ifeq ($(COM),GCC)
diff --git a/external/liblangtag/liblangtag-msvc.patch 
b/external/liblangtag/liblangtag-msvc.patch
new file mode 100644
index 000..535797b
--- /dev/null
+++ b/external/liblangtag/liblangtag-msvc.patch
@@ -0,0 +1,36 @@
+--- foo/langtag.orig/configure 2015-06-26 10:53:36.0 +0200
 foo/langtag/configure  2015-09-03 08:16:58.672240500 +0200
+@@ -14786,8 +14786,7 @@
+   fi
+ 
+ 
+-if test "x$ac_cv_func_vsnprintf" = xyes; then
+-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking Whether vsnprintf is 
C99-compliant" >&5
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking Whether vsnprintf is 
C99-compliant" >&5
+ $as_echo_n "checking Whether vsnprintf is C99-compliant... " >&6; }
+ if ${lt_cv_c99_vsnprintf+:} false; then :
+   $as_echo_n "(cached) " >&6
+@@ -14798,7 +14797,10 @@
+   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* end confdefs.h.  */
+ 
++#include 
++#include 
+ #include 
++#include 
+ int
+ foo(char *format, ...)
+ {
+@@ -14834,11 +14836,10 @@
+ fi
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_c99_vsnprintf" >&5
+ $as_echo "$lt_cv_c99_vsnprintf" >&6; }
+-  if test "x$lt_cv_c99_vsnprintf" = xyes; then
++if test "x$lt_cv_c99_vsnprintf" = xyes; then
+ 
+ $as_echo "#define LT_HAVE_C99_VSNPRINTF 1" >>confdefs.h
+ 
+-  fi
+ fi
+ 
+ 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: external/liblangtag

2015-07-16 Thread Eike Rathke 
 external/liblangtag/liblangtag-0.5.1-redefinition-of-typedef.patch |   31 
--
 1 file changed, 31 deletions(-)

New commits:
commit 43cf7b9abf1262011b22a7b1a355569585f76b16
Author: Eike Rathke er...@redhat.com
Date:   Thu Jul 16 11:50:27 2015 +0200

rm unused patch

Change-Id: Ie33bc6a6ef5c1a638a138e4989bd885b6b678ab4

diff --git a/external/liblangtag/liblangtag-0.5.1-redefinition-of-typedef.patch 
b/external/liblangtag/liblangtag-0.5.1-redefinition-of-typedef.patch
deleted file mode 100644
index 1c9ac14..000
--- a/external/liblangtag/liblangtag-0.5.1-redefinition-of-typedef.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-diff -ru langtag.orig/liblangtag/lt-trie.c langtag/liblangtag/lt-trie.c
 UnpackedTarball/langtag.orig/liblangtag/lt-trie.c  2013-04-30 
04:37:30.0 +0200
-+++ UnpackedTarball/langtag/liblangtag/lt-trie.c   2013-04-30 
14:57:50.777932196 +0200
-@@ -33,11 +33,6 @@
-   lt_iter_tmpl_t  parent;
-   lt_trie_node_t *root;
- };
--typedef struct _lt_trie_iter_t {
--  lt_iter_tparent;
--  lt_list_t   *stack;
--  lt_string_t *pos_str;
--} lt_trie_iter_t;
- 
- /* private */
- static lt_trie_node_t *
-diff -ru langtag.orig/liblangtag/lt-trie.h langtag/liblangtag/lt-trie.h
 UnpackedTarball/langtag.orig/liblangtag/lt-trie.h  2013-04-30 
04:44:36.0 +0200
-+++ UnpackedTarball/langtag/liblangtag/lt-trie.h   2013-04-30 
14:57:57.746969291 +0200
-@@ -21,7 +21,11 @@
- LT_BEGIN_DECLS
- 
- typedef struct _lt_trie_t lt_trie_t;
--typedef struct _lt_trie_iter_t  lt_trie_iter_t;
-+typedef struct _lt_trie_iter_t {
-+  lt_iter_tparent;
-+  lt_list_t   *stack;
-+  lt_string_t *pos_str;
-+} lt_trie_iter_t;
- 
- lt_trie_t  *lt_trie_new(void);
- lt_trie_t  *lt_trie_ref(lt_trie_t *trie);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: external/liblangtag

2014-04-05 Thread Eike Rathke 
 external/liblangtag/UnpackedTarball_langtag.mk 
|1 
 
external/liblangtag/liblangtag-0.5.1-include-last-record-in-language-subtag-registry.patch
 |   49 ++
 2 files changed, 50 insertions(+)

New commits:
commit f854b05013a587a6ea568b32180f5c81de26eeeb
Author: Eike Rathke er...@redhat.com
Date:   Sat Apr 5 20:04:37 2014 +0200

include last record in language-subtag-registry.xml

Change-Id: Iaca0fc9ca12ee672f640be9c639b7b0d0dd3bc10

diff --git a/external/liblangtag/UnpackedTarball_langtag.mk 
b/external/liblangtag/UnpackedTarball_langtag.mk
index 88f7f16..3bce944 100644
--- a/external/liblangtag/UnpackedTarball_langtag.mk
+++ b/external/liblangtag/UnpackedTarball_langtag.mk
@@ -22,6 +22,7 @@ $(eval $(call gb_UnpackedTarball_add_patches,langtag,\
external/liblangtag/liblangtag-0.5.1-undefined-have-sys-param-h.patch \

external/liblangtag/liblangtag-0.5.1-windows-do-not-prepend-dir-separator.patch 
\
external/liblangtag/liblangtag-0.5.1-unistd.patch \
+   
external/liblangtag/liblangtag-0.5.1-include-last-record-in-language-subtag-registry.patch
 \
 ))
 
 ifeq ($(OS),WNT)
diff --git 
a/external/liblangtag/liblangtag-0.5.1-include-last-record-in-language-subtag-registry.patch
 
b/external/liblangtag/liblangtag-0.5.1-include-last-record-in-language-subtag-registry.patch
new file mode 100644
index 000..c28727c3b
--- /dev/null
+++ 
b/external/liblangtag/liblangtag-0.5.1-include-last-record-in-language-subtag-registry.patch
@@ -0,0 +1,49 @@
+Upstream 6564b87c2f6dac2482e530bc43b038a3e93a0e07
+resolves #6, include last record in language-subtag-registry.xml
+
+The '%%' in language-subtag-registry is a record delimiter, not record
+end marker, it is not present on the last record at file end.
+
+(cherry picked from commit 4fff73a834f94a7ca256c086d99ea0a654a6c287)
+
+diff --git a/data/reg2xml.c b/data/reg2xml.c
+--- UnpackedTarball/langtag.orig/data/reg2xml.c
 UnpackedTarball/langtag/data/reg2xml.c
+@@ -48,6 +48,7 @@ _parse(const char *filename,
+   FILE *fp;
+   char buffer[1024], *range = NULL, *begin = NULL, *end = NULL;
+   lt_bool_t in_entry = FALSE;
++  lt_bool_t file_end = FALSE;
+   xmlNodePtr ent = NULL;
+ 
+   if ((fp = fopen(filename, rb)) == NULL) {
+@@ -56,10 +57,13 @@ _parse(const char *filename,
+   }
+   while (1) {
+   fgets(buffer, 1024, fp);
+-  if (feof(fp))
+-  break;
++  if (feof(fp)) {
++if (!in_entry)
++break;
++file_end = TRUE;
++}
+   _drop_crlf(buffer);
+-  if (lt_strcmp0(buffer, %%) == 0) {
++  if (lt_strcmp0(buffer, %%) == 0 || file_end) {
+   if (in_entry) {
+   if (ent) {
+   if (range) {
+@@ -102,7 +106,7 @@ _parse(const char *filename,
+   ent = NULL;
+   range = NULL;
+   }
+-  in_entry = TRUE;
++  in_entry = !file_end;
+   } else {
+   if (!in_entry) {
+   /* ignore it */
+
+--erAck-patch-parts--
+
+
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: external/liblangtag external/Module_external.mk liblangtag/ExternalPackage_langtag_data.mk liblangtag/ExternalPackage_liblangtag_data.mk liblangtag/ExternalProject_lang

2013-10-19 Thread Khaled Hosny 
 RepositoryModule_build.mk  
 |1 
 RepositoryModule_host.mk   
 |1 
 external/Module_external.mk
 |1 
 external/liblangtag/ExternalPackage_langtag_data.mk
 |   28 
 external/liblangtag/ExternalPackage_liblangtag_data.mk 
 |   36 +
 external/liblangtag/ExternalProject_langtag.mk 
 |   40 ++
 external/liblangtag/Makefile   
 |7 +
 external/liblangtag/Module_liblangtag.mk   
 |   19 ++
 external/liblangtag/README 
 |1 
 external/liblangtag/UnpackedTarball_langtag.mk 
 |   34 +
 external/liblangtag/liblangtag-0.5.1-mingw.patch   
 |   64 ++
 external/liblangtag/liblangtag-0.5.1-msvc-snprintf.patch   
 |   25 +++
 external/liblangtag/liblangtag-0.5.1-msvc-ssize_t.patch
 |   12 +
 external/liblangtag/liblangtag-0.5.1-msvc-strtoull.patch   
 |   15 ++
 external/liblangtag/liblangtag-0.5.1-msvc-warning.patch
 |   21 +++
 external/liblangtag/liblangtag-0.5.1-redefinition-of-typedef.patch 
 |   31 
 external/liblangtag/liblangtag-0.5.1-scope-declaration.patch   
 |   13 ++
 external/liblangtag/liblangtag-0.5.1-undefined-have-sys-param-h.patch  
 |   14 ++
 external/liblangtag/liblangtag-0.5.1-unistd.patch  
 |   12 +
 external/liblangtag/liblangtag-0.5.1-vsnprintf.patch   
 |   18 ++
 
external/liblangtag/liblangtag-0.5.1-windows-do-not-prepend-dir-separator.patch 
|   16 ++
 liblangtag/ExternalPackage_langtag_data.mk 
 |   28 
 liblangtag/ExternalPackage_liblangtag_data.mk  
 |   36 -
 liblangtag/ExternalProject_langtag.mk  
 |   40 --
 liblangtag/Makefile
 |7 -
 liblangtag/Module_liblangtag.mk
 |   24 ---
 liblangtag/README  
 |1 
 liblangtag/UnpackedTarball_langtag.mk  
 |   34 -
 liblangtag/liblangtag-0.5.1-mingw.patch
 |   64 --
 liblangtag/liblangtag-0.5.1-msvc-snprintf.patch
 |   25 ---
 liblangtag/liblangtag-0.5.1-msvc-ssize_t.patch 
 |   12 -
 liblangtag/liblangtag-0.5.1-msvc-strtoull.patch
 |   15 --
 liblangtag/liblangtag-0.5.1-msvc-warning.patch 
 |   21 ---
 liblangtag/liblangtag-0.5.1-redefinition-of-typedef.patch  
 |   31 
 liblangtag/liblangtag-0.5.1-scope-declaration.patch
 |   13 --
 liblangtag/liblangtag-0.5.1-undefined-have-sys-param-h.patch   
 |   14 --
 liblangtag/liblangtag-0.5.1-unistd.patch   
 |   12 -
 liblangtag/liblangtag-0.5.1-vsnprintf.patch
 |   18 --
 liblangtag/liblangtag-0.5.1-windows-do-not-prepend-dir-separator.patch 
 |   16 --
 39 files changed, 407 insertions(+), 413 deletions(-)

New commits:
commit fc26490252a63b851560be0af97e14b784a20350
Author: Khaled Hosny khaledho...@eglug.org
Date:   Fri Oct 18 19:58:14 2013 +0200

fdo#70393: move liblangtag to a subdir of external

Change-Id: I18cded289591bdf872c7a818326a35ac00d38482
Reviewed-on: https://gerrit.libreoffice.org/6330
Reviewed-by: David Tardon dtar...@redhat.com
Tested-by: David Tardon dtar...@redhat.com

diff --git a/RepositoryModule_build.mk b/RepositoryModule_build.mk
index aa15853..70cf74f 100644
--- a/RepositoryModule_build.mk
+++ b/RepositoryModule_build.mk
@@ -87,7 +87,6 @@ $(eval $(call gb_Module_add_moduledirs,cross_toolset,\
helpcompiler \
xmlhelp \
) \
-   $(call gb_Helper_optional,LIBLANGTAG,liblangtag) \
$(call gb_Helper_optional,LIBXML2,libxml2) \
$(call gb_Helper_optional,LIBXSLT,libxslt) \
$(call gb_Helper_optional,QADEVOOO,qadevOOo) \
diff --git a/RepositoryModule_host.mk b/RepositoryModule_host.mk
index 706a9e9..7a2acad 100644
--- a/RepositoryModule_host.mk
+++ b/RepositoryModule_host.mk
@@ -70,7 +70,6 @@ $(eval $(call gb_Module_add_moduledirs,libreoffice,\
jvmaccess \
jvmfwk \
$(call gb_Helper_optional,LANGUAGETOOL,languagetool) \
-   $(call gb_Helper_optional,LIBLANGTAG,liblangtag) \