diff options
| author | Eike Rathke <erack@redhat.com> | 2016-10-13 16:27:44 +0200 |
|---|---|---|
| committer | Eike Rathke <erack@redhat.com> | 2016-10-13 16:43:13 +0000 |
| commit | ab32758ea8378b56df04fb2a47791e0379adb5a2 (patch) | |
| tree | a340ae947e2cff4adbf7cf9d103af9588667c74a /external | |
| parent | 4eed1d85339f7f7572d5ddff543df447d4411e49 (diff) | |
upgrade to liblangtag-0.6.2
Change-Id: I315d9bcea575920b718da46007bd7500d6cca9c2
Reviewed-on: https://gerrit.libreoffice.org/29777
Reviewed-by: Eike Rathke <erack@redhat.com>
Tested-by: Eike Rathke <erack@redhat.com>
Diffstat (limited to 'external')
| -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 |
3 files changed, 1 insertions, 37 deletions
diff --git a/external/liblangtag/0001-use-standard-function.patch.1 b/external/liblangtag/0001-use-standard-function.patch.1 deleted file mode 100644 index fc21f1853e0a..000000000000 --- a/external/liblangtag/0001-use-standard-function.patch.1 +++ /dev/null @@ -1,35 +0,0 @@ -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 a29945e0ef0e..6b3eac1ad6fc 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.4.0)) +$(eval $(call gb_ExternalPackage_add_file,liblangtag,$(LIBO_LIB_FOLDER)/liblangtag-lo.so.1,liblangtag/.libs/liblangtag-lo.so.1.4.1)) endif # vim: set noet sw=4 ts=4: diff --git a/external/liblangtag/UnpackedTarball_langtag.mk b/external/liblangtag/UnpackedTarball_langtag.mk index 3cde9e7a8050..47505f85859c 100644 --- a/external/liblangtag/UnpackedTarball_langtag.mk +++ b/external/liblangtag/UnpackedTarball_langtag.mk @@ -34,7 +34,6 @@ 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: |