download.lst | 2 -
external/liblangtag/UnpackedTarball_langtag.mk | 7 ++--
external/liblangtag/liblangtag-msvc.patch | 36 -------------------------
3 files changed, 5 insertions(+), 40 deletions(-)
New commits:
commit 4b6e7da25f837349e10929b0258059398be8106d
Author: Eike Rathke <er...@redhat.com>
Date: Tue Nov 10 14:11:06 2015 +0100
upgrade liblangtag to 0.5.8
Change-Id: I219f99fe1d518974fcc0c021ac0582022c6f554a
Reviewed-on: https://gerrit.libreoffice.org/19887
Tested-by: Jenkins <c...@libreoffice.org>
Reviewed-by: Eike Rathke <er...@redhat.com>
Tested-by: Eike Rathke <er...@redhat.com>
diff --git a/download.lst b/download.lst
index 6c00b4f..a70467b 100755
--- a/download.lst
+++ b/download.lst
@@ -86,7 +86,7 @@ export LIBEOT_TARBALL := libeot-0.01.tar.bz2
export LIBEXTTEXTCAT_TARBALL :=
10d61fbaa6a06348823651b1bd7940fe-libexttextcat-3.4.4.tar.bz2
export LIBGLTF_MD5SUM := d63a9f47ab048f5009d90693d6aa6424
export LIBGLTF_TARBALL := libgltf-0.0.2.tar.bz2
-export LIBLANGTAG_TARBALL :=
80d063d6db4c010e18c606af8aed6231-liblangtag-0.5.7.tar.bz2
+export LIBLANGTAG_TARBALL :=
aa899eff126216dafe721149fbdb511b-liblangtag-0.5.8.tar.bz2
export LIBXMLSEC_TARBALL :=
1f24ab1d39f4a51faf22244c94a6203f-xmlsec1-1.2.14.tar.gz
export LIBXML_TARBALL := 9c0cfef285d5c4a5c80d00904ddab380-libxml2-2.9.1.tar.gz
export LIBXSLT_TARBALL :=
9667bf6f9310b957254fdcf6596600b7-libxslt-1.1.28.tar.gz
diff --git a/external/liblangtag/UnpackedTarball_langtag.mk
b/external/liblangtag/UnpackedTarball_langtag.mk
index 52ffc39..541baa3 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 535797b..0000000
--- 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
-
-
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
