[Libreoffice-commits] core.git: liblangtag/liblangtag-0.5.1-reg2xml-encoding-problem.patch liblangtag/UnpackedTarball_langtag.mk

[Eike Rathke]

 liblangtag/UnpackedTarball_langtag.mk                      |    1 
 liblangtag/liblangtag-0.5.1-reg2xml-encoding-problem.patch |   18 -------------
 2 files changed, 19 deletions(-)

New commits:
commit e7c06d3081e68d49d1c2cca32a01ac3e081d4c3b
Author: Eike Rathke <erack at redhat.com>
Date:   Fri Jul 26 16:39:48 2013 +0200

    patching out doc->encoding is not needed anymore
    
    Upstream 71e2b41a366ecd150700025058364c7dbf3576a7 fixed that.
    
    Change-Id: I6f91170be9888c1fca19839d3ec6bb745dcff329

diff --git a/liblangtag/UnpackedTarball_langtag.mk b/liblangtag/UnpackedTarball_langtag.mk
index 32f993a..8594707 100644
--- a/liblangtag/UnpackedTarball_langtag.mk
+++ b/liblangtag/UnpackedTarball_langtag.mk
@@ -13,7 +13,6 @@ $(eval $(call gb_UnpackedTarball_set_tarball,langtag,$(LIBLANGTAG_TARBALL)))
 
 $(eval $(call gb_UnpackedTarball_add_patches,langtag,\
 	liblangtag/liblangtag-0.5.1-msvc-warning.patch \
-	liblangtag/liblangtag-0.5.1-reg2xml-encoding-problem.patch \
 	liblangtag/liblangtag-0.5.1-vsnprintf.patch \
 	liblangtag/liblangtag-0.5.1-msvc-ssize_t.patch \
 	liblangtag/liblangtag-0.5.1-msvc-snprintf.patch \
diff --git a/liblangtag/liblangtag-0.5.1-reg2xml-encoding-problem.patch b/liblangtag/liblangtag-0.5.1-reg2xml-encoding-problem.patch
deleted file mode 100644
index d63a571..0000000
--- a/liblangtag/liblangtag-0.5.1-reg2xml-encoding-problem.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-# libxml2 has a problem when a document encoding is specified, even though
-# documentation says that all internal representation would be in UTF-8 and
-# language-subtag-registry data already is passed in UTF-8, when specifying the
-# document encoding to be UTF-8 the output to language-subtag-registry.xml is
-# conversion garbage, '?' on Linux UTF-8 locale, ISO-8859-1 on Windows. If no
-# document encoding is specified at all no conversion happens and non-ASCII
-# values are correctly written as entities.
-
---- misc/liblangtag-0.4.0/data/reg2xml.c	2012-01-30 13:20:57.000000000 +0100
-+++ misc/build/liblangtag-0.4.0/data/reg2xml.c	2012-08-11 02:30:39.147779753 +0200
-@@ -134,7 +134,6 @@
- 	lt_bool_t retval;
- 
- 	doc = xmlNewDoc((const xmlChar *)"1.0");
--	doc->encoding = xmlStrdup((const xmlChar *)"UTF-8");
- 	root = xmlNewDocNode(doc, NULL,
- 			     (const xmlChar *)"registry",
- 			     NULL);