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

[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 <david at ostrovsky.org>
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 <ci at libreoffice.org>
    Reviewed-by: Michael Stahl <mstahl at redhat.com>

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 0000000..535797b
--- /dev/null
+++ b/external/liblangtag/liblangtag-msvc.patch
@@ -0,0 +1,36 @@
+--- 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
+ 
+