diff options
| -rw-r--r-- | download.lst | 3 | ||||
| -rw-r--r-- | external/liblangtag/0001-use-standard-function.patch.1 | 35 | ||||
| -rw-r--r-- | external/liblangtag/ExternalPackage_liblangtag.mk | 2 | ||||
| -rw-r--r-- | external/liblangtag/UnpackedTarball_langtag.mk | 1 | ||||
| -rwxr-xr-x | external/liblangtag/clang-cl.patch.0 | 6 |
5 files changed, 42 insertions, 5 deletions
diff --git a/download.lst b/download.lst index 58a35e849f30..018679ea998f 100644 --- a/download.lst +++ b/download.lst @@ -90,7 +90,8 @@ 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 := aa899eff126216dafe721149fbdb511b-liblangtag-0.5.8.tar.bz2 +export LIBLANGTAG_MD5SUM := 90be6460842d8b719de0c2058bf108e1 +export LIBLANGTAG_TARBALL := liblangtag-0.6.1.tar.bz2 export LIBTOMMATH_MD5SUM := da283d2e3e72137d0c600ac36b991c9d export LIBTOMMATH_TARBALL := ltm-1.0.zip export LIBXMLSEC_TARBALL := 0fb1bb06d60d7708abc4797008209bcc-xmlsec1-1.2.22.tar.gz diff --git a/external/liblangtag/0001-use-standard-function.patch.1 b/external/liblangtag/0001-use-standard-function.patch.1 new file mode 100644 index 000000000000..fc21f1853e0a --- /dev/null +++ b/external/liblangtag/0001-use-standard-function.patch.1 @@ -0,0 +1,35 @@ +From 5caa5eb0cb1b356fcbdef586ea700c0b8df34ce1 Mon Sep 17 00:00:00 2001 +From: David Tardon <dtardon@redhat.com> +Date: Thu, 22 Sep 2016 18:12:36 +0200 +Subject: [PATCH] use standard function + +--- + liblangtag/lt-xml.c | 5 +---- + 1 file changed, 1 insertion(+), 4 deletions(-) + +diff --git a/liblangtag/lt-xml.c b/liblangtag/lt-xml.c +index 170d8bb..abf2254 100644 +--- a/liblangtag/lt-xml.c ++++ b/liblangtag/lt-xml.c +@@ -16,9 +16,6 @@ + + #include <stddef.h> + #include <string.h> +-#ifdef HAVE_STRINGS_H +-#include <strings.h> +-#endif + #include <sys/stat.h> + #include <libxml/parser.h> + #include <libxml/xpath.h> +@@ -409,7 +406,7 @@ lt_xml_get_cldr(lt_xml_t *xml, + xmlDocPtr *d = &pref[idx - 1], doc = NULL; + + do { +- p = index(pp, ':'); ++ p = strchr(pp, ':'); + if (p) + s = lt_strndup(pp, p - pp); + else +-- +2.7.4 + diff --git a/external/liblangtag/ExternalPackage_liblangtag.mk b/external/liblangtag/ExternalPackage_liblangtag.mk index d93c0d409f0a..a29945e0ef0e 100644 --- a/external/liblangtag/ExternalPackage_liblangtag.mk +++ b/external/liblangtag/ExternalPackage_liblangtag.mk @@ -14,7 +14,7 @@ $(eval $(call gb_ExternalPackage_use_external_project,liblangtag,langtag)) ifeq ($(OS),MACOSX) $(eval $(call gb_ExternalPackage_add_file,liblangtag,$(LIBO_LIB_FOLDER)/liblangtag.1.dylib,liblangtag/.libs/liblangtag.1.dylib)) else ifeq ($(DISABLE_DYNLOADING),) -$(eval $(call gb_ExternalPackage_add_file,liblangtag,$(LIBO_LIB_FOLDER)/liblangtag-lo.so.1,liblangtag/.libs/liblangtag-lo.so.1.3.1)) +$(eval $(call gb_ExternalPackage_add_file,liblangtag,$(LIBO_LIB_FOLDER)/liblangtag-lo.so.1,liblangtag/.libs/liblangtag-lo.so.1.4.0)) endif # vim: set noet sw=4 ts=4: diff --git a/external/liblangtag/UnpackedTarball_langtag.mk b/external/liblangtag/UnpackedTarball_langtag.mk index 47505f85859c..3cde9e7a8050 100644 --- a/external/liblangtag/UnpackedTarball_langtag.mk +++ b/external/liblangtag/UnpackedTarball_langtag.mk @@ -34,6 +34,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/0001-use-standard-function.patch.1 \ )) # vim: set noet sw=4 ts=4: diff --git a/external/liblangtag/clang-cl.patch.0 b/external/liblangtag/clang-cl.patch.0 index d61fde270cd1..cbc22a265ce5 100755 --- a/external/liblangtag/clang-cl.patch.0 +++ b/external/liblangtag/clang-cl.patch.0 @@ -1,14 +1,14 @@ --- liblangtag/lt-macros.h +++ liblangtag/lt-macros.h @@ -120,7 +120,7 @@ - * It allows the compiler to type-check the arguments passed to the function. - * See the GNU C documentation for details. + * + * See the GNU C documentation for more details. */ -#if __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ > 4) +#if (defined __GNUC__ && (__GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ > 4))) || defined __clang__ # define LT_GNUC_PRINTF(format_idx, arg_idx) \ __attribute__((__format__ (__printf__, format_idx, arg_idx))) - #else /* !__GNUC__ */ + # define LT_GNUC_UNUSED \ @@ -136,7 +136,7 @@ * explicit %NULL. * See the GNU C documentation for details. |