diff options
| author | Eike Rathke <erack@redhat.com> | 2015-11-10 14:11:06 +0100 |
|---|---|---|
| committer | Eike Rathke <erack@redhat.com> | 2015-11-10 18:21:31 +0000 |
| commit | 4b6e7da25f837349e10929b0258059398be8106d (patch) | |
| tree | 6154b5c5e031516f8eccd51e7acc6d72b3fd8e39 /external | |
| parent | f0c39754c4407d9f48249ba8c04a1222e25ded0c (diff) | |
upgrade liblangtag to 0.5.8
Change-Id: I219f99fe1d518974fcc0c021ac0582022c6f554a
Reviewed-on: https://gerrit.libreoffice.org/19887
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Eike Rathke <erack@redhat.com>
Tested-by: Eike Rathke <erack@redhat.com>
Diffstat (limited to 'external')
| -rw-r--r-- | external/liblangtag/UnpackedTarball_langtag.mk | 7 | ||||
| -rw-r--r-- | external/liblangtag/liblangtag-msvc.patch | 36 |
2 files changed, 4 insertions, 39 deletions
diff --git a/external/liblangtag/UnpackedTarball_langtag.mk b/external/liblangtag/UnpackedTarball_langtag.mk index 52ffc396b56f..541baa3736b6 100644 --- a/external/liblangtag/UnpackedTarball_langtag.mk +++ b/external/liblangtag/UnpackedTarball_langtag.mk @@ -15,9 +15,10 @@ $(eval $(call gb_UnpackedTarball_set_pre_action,langtag,\ $(GNUTAR) -x -j -f $(gb_UnpackedTarget_TARFILE_LOCATION)/$(LANGTAGREG_TARBALL) \ )) -$(eval $(call gb_UnpackedTarball_add_patches,langtag,\ - external/liblangtag/liblangtag-msvc.patch \ -)) +# Currently no patches applied, if there were it would be: +#$(eval $(call gb_UnpackedTarball_add_patches,langtag,\ +# external/liblangtag/your-modification.patch \ +#)) ifeq ($(OS),WNT) ifeq ($(COM),GCC) diff --git a/external/liblangtag/liblangtag-msvc.patch b/external/liblangtag/liblangtag-msvc.patch deleted file mode 100644 index 535797be928b..000000000000 --- a/external/liblangtag/liblangtag-msvc.patch +++ /dev/null @@ -1,36 +0,0 @@ ---- foo/langtag.orig/configure 2015-06-26 10:53:36.000000000 +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 <sys/types.h> -+#include <stdio.h> - #include <stdarg.h> -+#include <stdlib.h> - 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 - - |