strepsirrhini/office-gobmx
9
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

upgrade to liblangtag-0.6.2

Browse source 
Change-Id: I315d9bcea575920b718da46007bd7500d6cca9c2
Reviewed-on: https://gerrit.libreoffice.org/29777
Reviewed-by: Eike Rathke <erack@redhat.com>
Tested-by: Eike Rathke <erack@redhat.com>
This commit is contained in:
Eike Rathke 2016-10-13 16:27:44 +02:00
parent 4eed1d8533
commit ab32758ea8
4 changed files with 3 additions and 39 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
download.lst
View file

@ -90,8 +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_MD5SUM := 90be6460842d8b719de0c2058bf108e1
export LIBLANGTAG_TARBALL := liblangtag-0.6.1.tar.bz2
export LIBLANGTAG_MD5SUM := 284f120247323a35122ab32b4b359c45
export LIBLANGTAG_TARBALL := liblangtag-0.6.2.tar.bz2
export LIBTOMMATH_MD5SUM := da283d2e3e72137d0c600ac36b991c9d
export LIBTOMMATH_TARBALL := ltm-1.0.zip
export LIBXMLSEC_TARBALL := 0fb1bb06d60d7708abc4797008209bcc-xmlsec1-1.2.22.tar.gz

35
external/liblangtag/0001-use-standard-function.patch.1 vendored
View file

@ -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

2
external/liblangtag/ExternalPackage_liblangtag.mk vendored
View file

@ -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:

1
external/liblangtag/UnpackedTarball_langtag.mk vendored
View file

@ -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: