fdo#70393: move liblangtag to a subdir of external

Change-Id: I18cded289591bdf872c7a818326a35ac00d38482
Reviewed-on: https://gerrit.libreoffice.org/6330
Reviewed-by: David Tardon <dtardon@redhat.com>
Tested-by: David Tardon <dtardon@redhat.com>

18 files changed, 0 insertions, 411 deletions

diff --git a/liblangtag/ExternalPackage_langtag_data.mk b/liblangtag/ExternalPackage_langtag_data.mk
deleted file mode 100644
index 3435e7080e1c..000000000000
--- a/liblangtag/ExternalPackage_langtag_data.mk
+++ /dev/null
@@ -1,28 +0,0 @@
-# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
-#
-# This file is part of the LibreOffice project.
-#
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-#
-
-$(eval $(call gb_ExternalPackage_ExternalPackage,langtag_data,langtag))
-
-$(eval $(call gb_ExternalPackage_add_unpacked_files,langtag_data,unittest/install/$(LIBO_SHARE_FOLDER)/liblangtag,data/language-subtag-registry.xml))
-$(eval $(call gb_ExternalPackage_add_unpacked_files,langtag_data,unittest/install/$(LIBO_SHARE_FOLDER)/liblangtag/common/bcp47,\
-	data/common/bcp47/calendar.xml \
-	data/common/bcp47/collation.xml \
-	data/common/bcp47/currency.xml \
-	data/common/bcp47/number.xml \
-	data/common/bcp47/timezone.xml \
-	data/common/bcp47/transform.xml \
-	data/common/bcp47/transform_ime.xml \
-	data/common/bcp47/transform_keyboard.xml \
-	data/common/bcp47/transform_mt.xml \
-	data/common/bcp47/transform_private_use.xml \
-	data/common/bcp47/variant.xml \
-))
-$(eval $(call gb_ExternalPackage_add_unpacked_files,langtag_data,unittest/install/$(LIBO_SHARE_FOLDER)/liblangtag/common/supplemental,data/common/supplemental/likelySubtags.xml))
-
-# vim: set shiftwidth=4 tabstop=4 noexpandtab:
diff --git a/liblangtag/ExternalPackage_liblangtag_data.mk b/liblangtag/ExternalPackage_liblangtag_data.mk
deleted file mode 100644
index 0991d9621ea2..000000000000
--- a/liblangtag/ExternalPackage_liblangtag_data.mk
+++ /dev/null
@@ -1,36 +0,0 @@
-# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
-#
-# This file is part of the LibreOffice project.
-#
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-#
-
-$(eval $(call gb_ExternalPackage_ExternalPackage,liblangtag_data,langtag))
-
-$(eval $(call gb_ExternalPackage_set_outdir,liblangtag_data,$(INSTROOT)))
-
-$(eval $(call gb_ExternalPackage_add_unpacked_files,liblangtag_data,$(LIBO_SHARE_FOLDER)/liblangtag,\
-	data/language-subtag-registry.xml \
-))
-
-$(eval $(call gb_ExternalPackage_add_unpacked_files,liblangtag_data,$(LIBO_SHARE_FOLDER)/liblangtag/common/bcp47,\
-	data/common/bcp47/calendar.xml \
-	data/common/bcp47/collation.xml \
-	data/common/bcp47/currency.xml \
-	data/common/bcp47/number.xml \
-	data/common/bcp47/timezone.xml \
-	data/common/bcp47/transform.xml \
-	data/common/bcp47/transform_ime.xml \
-	data/common/bcp47/transform_keyboard.xml \
-	data/common/bcp47/transform_mt.xml \
-	data/common/bcp47/transform_private_use.xml \
-	data/common/bcp47/variant.xml \
-))
-
-$(eval $(call gb_ExternalPackage_add_unpacked_files,liblangtag_data,$(LIBO_SHARE_FOLDER)/liblangtag/common/supplemental,\
-	data/common/supplemental/likelySubtags.xml \
-))
-
-# vim: set shiftwidth=4 tabstop=4 noexpandtab:
diff --git a/liblangtag/ExternalProject_langtag.mk b/liblangtag/ExternalProject_langtag.mk
deleted file mode 100644
index 23619ed3b2de..000000000000
--- a/liblangtag/ExternalProject_langtag.mk
+++ /dev/null
@@ -1,40 +0,0 @@
-# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
-#
-# This file is part of the LibreOffice project.
-#
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-#
-
-$(eval $(call gb_ExternalProject_ExternalProject,langtag))
-
-$(eval $(call gb_ExternalProject_use_external,langtag,libxml2))
-
-$(eval $(call gb_ExternalProject_use_autoconf,langtag,build))
-
-$(eval $(call gb_ExternalProject_register_targets,langtag,\
-	build \
-))
-
-# disable ccache on windows, as it doesn't cope with the quoted defines
-# liblangtag uses (-DBUILDDIR="\"$(abs_top_builddir)\"" and similar).
-# Results in "cl : Command line error D8003 : missing source filename"
-$(call gb_ExternalProject_get_state_target,langtag,build):
-	$(call gb_ExternalProject_run,build,\
-		./configure --disable-modules --disable-test --disable-introspection --disable-shared --enable-static --with-pic \
-		$(if $(filter WNTMSC,$(OS)$(COM)),--disable-rebuild-data) \
-		$(if $(filter TRUE,$(HAVE_GCC_BUILTIN_ATOMIC)),"lt_cv_has_atomic=yes","lt_cv_has_atomic=no") \
-		$(if $(filter YES,$(CROSS_COMPILING)),--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM) "ac_cv_va_copy=no") \
-		$(if $(filter NO,$(SYSTEM_LIBXML)),LIBXML2_CFLAGS="-I$(call gb_UnpackedTarball_get_dir,xml2)/include" \
-			LIBXML2_LIBS=$(if $(filter WNTMSC,$(OS)$(COM)),"-L$(OUTDIR)/lib -llibxml2","-L$(gb_Helper_OUTDIRLIBDIR) -lxml2"),\
-		$(if $(filter MACOSX,$(OS)),LIBXML2_CFLAGS="$(LIBXML_CFLAGS)" LIBXML2_LIBS="$(LIBXML_LIBS)")) \
-		$(if $(filter MACOSX,$(OS)),--prefix=/@.__________________________________________________OOO) \
-		$(if $(filter-out LINUX FREEBSD,$(OS)),,LDFLAGS="-Wl$(COMMA)-z$(COMMA)origin -Wl$(COMMA)-rpath,\\"\$$\$$ORIGIN:'\'\$$\$$ORIGIN/../ure-link/lib) \
-		$(if $(filter-out SOLARIS,$(OS)),,LDFLAGS="-Wl$(COMMA)-z$(COMMA)origin -Wl$(COMMA)-R$(COMMA)\\"\$$\$$ORIGIN:'\'\$$\$$ORIGIN/../ure-link/lib) \
-		$(if $(filter-out WNTGCC,$(OS)$(COM)),,LDFLAGS="-Wl$(COMMA)--enable-runtime-pseudo-reloc-v2") \
-		&& $(if $(filter WNTMSC,$(OS)$(COM)),REAL_CC="$(shell cygpath -w $(lastword $(CC)))") \
-		   $(if $(VERBOSE)$(verbose),V=1) \
-		   $(MAKE) \
-	)
-# vim: set noet sw=4 ts=4:
diff --git a/liblangtag/Makefile b/liblangtag/Makefile
deleted file mode 100644
index ccb1c85a04da..000000000000
--- a/liblangtag/Makefile
+++ /dev/null
@@ -1,7 +0,0 @@
-# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
-
-module_directory:=$(dir $(realpath $(firstword $(MAKEFILE_LIST))))
-
-include $(module_directory)/../solenv/gbuild/partial_build.mk
-
-# vim: set noet sw=4 ts=4:
diff --git a/liblangtag/Module_liblangtag.mk b/liblangtag/Module_liblangtag.mk
deleted file mode 100644
index a1bcdab62748..000000000000
--- a/liblangtag/Module_liblangtag.mk
+++ /dev/null
@@ -1,24 +0,0 @@
-# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
-#
-# This file is part of the LibreOffice project.
-#
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-#
-
-$(eval $(call gb_Module_Module,liblangtag))
-
-ifeq ($(ENABLE_LIBLANGTAG),TRUE)
-ifeq ($(SYSTEM_LIBLANGTAG),NO)
-
-$(eval $(call gb_Module_add_targets,liblangtag,\
-	UnpackedTarball_langtag \
-	ExternalPackage_langtag_data \
-	ExternalProject_langtag \
-	ExternalPackage_liblangtag_data \
-))
-endif
-endif
-
-# vim: set noet sw=4 ts=4:
diff --git a/liblangtag/README b/liblangtag/README
deleted file mode 100644
index 694daee093e6..000000000000
--- a/liblangtag/README
+++ /dev/null
@@ -1 +0,0 @@
-From [http://tagoh.bitbucket.org/liblangtag/]. An interface for BCP47 language tags.
diff --git a/liblangtag/UnpackedTarball_langtag.mk b/liblangtag/UnpackedTarball_langtag.mk
deleted file mode 100644
index b7c80b091a35..000000000000
--- a/liblangtag/UnpackedTarball_langtag.mk
+++ /dev/null
@@ -1,34 +0,0 @@
-# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
-#
-# This file is part of the LibreOffice project.
-#
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-#
-
-$(eval $(call gb_UnpackedTarball_UnpackedTarball,langtag))
-
-$(eval $(call gb_UnpackedTarball_set_tarball,langtag,$(LIBLANGTAG_TARBALL),,liblangtag))
-
-$(eval $(call gb_UnpackedTarball_add_patches,langtag,\
-	liblangtag/liblangtag-0.5.1-msvc-warning.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 \
-	liblangtag/liblangtag-0.5.1-msvc-strtoull.patch \
-	liblangtag/liblangtag-0.5.1-scope-declaration.patch \
-	liblangtag/liblangtag-0.5.1-redefinition-of-typedef.patch \
-	liblangtag/liblangtag-0.5.1-undefined-have-sys-param-h.patch \
-	liblangtag/liblangtag-0.5.1-windows-do-not-prepend-dir-separator.patch \
-	liblangtag/liblangtag-0.5.1-unistd.patch \
-))
-
-ifeq ($(OS),WNT)
-ifeq ($(COM),GCC)
-$(eval $(call gb_UnpackedTarball_add_patches,langtag,\
-	liblangtag/liblangtag-0.5.1-mingw.patch \
-))
-endif
-endif
-# vim: set noet sw=4 ts=4:
diff --git a/liblangtag/liblangtag-0.5.1-mingw.patch b/liblangtag/liblangtag-0.5.1-mingw.patch
deleted file mode 100644
index 54790e99a0c7..000000000000
--- a/liblangtag/liblangtag-0.5.1-mingw.patch
+++ /dev/null
@@ -1,64 +0,0 @@
---- misc/liblangtag-0.4.0/liblangtag/lt-ext-module.c	2013-06-14 15:06:13.629182430 +0100
-+++ misc/liblangtag-0.4.0/liblangtag/lt-ext-module.c	2013-06-14 15:06:43.537534204 +0100
-@@ -608,8 +608,8 @@
- 			size_t len;
- 
- 			while (1) {
--				if (readdir_r(dir, &dent, &dresult) || dresult == NULL)
--					break;
-+/*				if (readdir_r(dir, &dent, &dresult) || dresult == NULL)
-+					break;*/ abort(); /* we do not use liblangtag-gobject anyway */
- 
- 				len = strlen(dent.d_name);
- 				if (len > suffix_len &&
---- misc/liblangtag-0.4.0/liblangtag/Makefile.am	2013-06-14 15:06:13.636182512 +0100
-+++ misc/liblangtag-0.4.0/liblangtag/Makefile.am	2013-06-14 15:08:53.556063464 +0100
-@@ -211,6 +211,7 @@
- liblangtag_la_LDFLAGS =						\
- 	$(LDFLAGS)						\
- 	-version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE)	\
-+	-no-undefined                                           \
- 	$(NULL)
- 
- -include $(top_srcdir)/git.mk
---- misc/liblangtag-0.4.0/liblangtag/Makefile.in	2013-06-14 15:06:13.636182512 +0100
-+++ misc/liblangtag-0.4.0/liblangtag/Makefile.in	2013-06-14 15:09:07.204223994 +0100
-@@ -576,6 +576,7 @@
- liblangtag_la_LDFLAGS = \
- 	$(LDFLAGS)						\
- 	-version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE)	\
-+	-no-undefined                                           \
- 	$(NULL)
- 
- all: $(BUILT_SOURCES)
---- misc/liblangtag-0.4.0/liblangtag-gobject/Makefile.am	2013-06-14 15:06:13.648182653 +0100
-+++ misc/liblangtag-0.4.0/liblangtag-gobject/Makefile.am	2013-06-14 15:09:27.122458271 +0100
-@@ -149,6 +149,7 @@
- liblangtag_gobject_la_LDFLAGS =						\
- 	$(LDFLAGS)							\
- 	-version-info $(LT_G_CURRENT):$(LT_G_REVISION):$(LT_G_AGE)	\
-+	-no-undefined                                           \
- 	$(NULL)
- #
- if HAVE_INTROSPECTION
---- misc/liblangtag-0.4.0/liblangtag-gobject/Makefile.in	2013-06-14 15:06:13.648182653 +0100
-+++ misc/liblangtag-0.4.0/liblangtag-gobject/Makefile.in	2013-06-14 15:09:33.099528574 +0100
-@@ -476,6 +476,7 @@
- liblangtag_gobject_la_LDFLAGS = \
- 	$(LDFLAGS)							\
- 	-version-info $(LT_G_CURRENT):$(LT_G_REVISION):$(LT_G_AGE)	\
-+	-no-undefined                                           \
- 	$(NULL)
- 
- #
---- misc/liblangtag-0.4.0/Makefile.am	2013-06-14 15:06:13.652182700 +0100
-+++ misc/liblangtag-0.4.0/Makefile.am	2013-06-14 15:06:43.539534228 +0100
-@@ -6,7 +6,7 @@
- SUBDIRS += liblangtag-gobject
- endif
- #SUBDIRS += docs tests
--SUBDIRS += tests
-+#SUBDIRS += tests
- 
- ACLOCAL_AMFLAGS = -I m4macros
- 
diff --git a/liblangtag/liblangtag-0.5.1-msvc-snprintf.patch b/liblangtag/liblangtag-0.5.1-msvc-snprintf.patch
deleted file mode 100644
index 61067e21b407..000000000000
--- a/liblangtag/liblangtag-0.5.1-msvc-snprintf.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-diff -ru langtag.orig/liblangtag/lt-messages.c langtag/liblangtag/lt-messages.c
---- UnpackedTarball/langtag.orig/liblangtag/lt-messages.c	2013-04-22 10:06:57.000000000 +0200
-+++ UnpackedTarball/langtag/liblangtag/lt-messages.c	2013-04-30 11:38:04.116532065 +0200
-@@ -85,13 +85,21 @@
- 	clen = strlen(cs);
- 	if (clen > 0) {
- 		catstring = malloc(sizeof (char) * (clen + 6));
-+#ifdef _WIN32
-+		_snprintf(catstring, clen + 6, "[%s]: ", cs);
-+#else
- 		snprintf(catstring, clen + 6, "[%s]: ", cs);
-+#endif
- 		clen = strlen(catstring);
- 	}
- 	len = tlen + clen + 1;
- 	retval = malloc(sizeof (char) * len);
- 	if (retval) {
-+#ifdef _WIN32
-+		_snprintf(retval, len, "%s%s ", ts, catstring ? catstring : "");
-+#else
- 		snprintf(retval, len, "%s%s ", ts, catstring ? catstring : "");
-+#endif
- 	}
- 	if (catstring)
- 		free(catstring);
diff --git a/liblangtag/liblangtag-0.5.1-msvc-ssize_t.patch b/liblangtag/liblangtag-0.5.1-msvc-ssize_t.patch
deleted file mode 100644
index 84774c18d657..000000000000
--- a/liblangtag/liblangtag-0.5.1-msvc-ssize_t.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -ru UnpackedTarball/langtag.orig/liblangtag/lt-macros.h UnpackedTarball/langtag/liblangtag/lt-macros.h
---- UnpackedTarball/langtag.orig/liblangtag/lt-macros.h	2013-04-22 10:06:57.000000000 +0200
-+++ UnpackedTarball/langtag/liblangtag/lt-macros.h	2013-04-30 16:07:00.619638050 +0200
-@@ -261,7 +261,7 @@
- 
- LT_BEGIN_DECLS
- 
--#ifdef _MSC_VER
-+#if defined(_MSC_VER) && !defined(ssize_t)
- #  ifdef _M_AMD64
- typedef signed long long	ssize_t;
- #  else
diff --git a/liblangtag/liblangtag-0.5.1-msvc-strtoull.patch b/liblangtag/liblangtag-0.5.1-msvc-strtoull.patch
deleted file mode 100644
index e50dddb76c0a..000000000000
--- a/liblangtag/liblangtag-0.5.1-msvc-strtoull.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-diff -ru langtag.orig/extensions/lt-ext-ldml-u.c langtag/extensions/lt-ext-ldml-u.c
---- UnpackedTarball/langtag.orig/extensions/lt-ext-ldml-u.c	2013-04-22 10:06:56.000000000 +0200
-+++ UnpackedTarball/langtag/extensions/lt-ext-ldml-u.c	2013-04-30 12:56:19.557490167 +0200
-@@ -137,7 +137,11 @@
- 							if (!strchr(hexdigit, subtag[j]))
- 								goto bail2;
- 						}
-+#ifdef _WIN32
-+						x = _strtoui64(subtag, &p, 16);
-+#else
- 						x = strtoull(subtag, &p, 16);
-+#endif
- 						if (p && p[0] == 0 && x <= 0x10ffff) {
- 							retval = TRUE;
- 							xmlFree(name);
diff --git a/liblangtag/liblangtag-0.5.1-msvc-warning.patch b/liblangtag/liblangtag-0.5.1-msvc-warning.patch
deleted file mode 100644
index 2d34fe8f0941..000000000000
--- a/liblangtag/liblangtag-0.5.1-msvc-warning.patch
+++ /dev/null
@@ -1,21 +0,0 @@
---- misc/liblangtag-0.4.0/liblangtag/lt-ext-module.h	2012-02-02 06:02:45.000000000 +0100
-+++ misc/build/liblangtag-0.4.0/liblangtag/lt-ext-module.h	2012-08-08 08:46:57.810860044 +0200
-@@ -143,12 +143,12 @@
-  * and #lt_ext_module_t and extend features.
-  */
- struct _lt_ext_module_funcs_t {
--	const lt_ext_module_singleton_func_t get_singleton;
--	const lt_ext_module_data_new_func_t  create_data;
--	const lt_ext_module_precheck_func_t  precheck_tag;
--	const lt_ext_module_parse_func_t     parse_tag;
--	const lt_ext_module_get_tag_func_t   get_tag;
--	const lt_ext_module_validate_func_t  validate_tag;
-+	lt_ext_module_singleton_func_t get_singleton;
-+	lt_ext_module_data_new_func_t  create_data;
-+	lt_ext_module_precheck_func_t  precheck_tag;
-+	lt_ext_module_parse_func_t     parse_tag;
-+	lt_ext_module_get_tag_func_t   get_tag;
-+	lt_ext_module_validate_func_t  validate_tag;
- };
- 
- 
diff --git a/liblangtag/liblangtag-0.5.1-redefinition-of-typedef.patch b/liblangtag/liblangtag-0.5.1-redefinition-of-typedef.patch
deleted file mode 100644
index 1c9ac14077dd..000000000000
--- a/liblangtag/liblangtag-0.5.1-redefinition-of-typedef.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-diff -ru langtag.orig/liblangtag/lt-trie.c langtag/liblangtag/lt-trie.c
---- UnpackedTarball/langtag.orig/liblangtag/lt-trie.c	2013-04-30 04:37:30.000000000 +0200
-+++ UnpackedTarball/langtag/liblangtag/lt-trie.c	2013-04-30 14:57:50.777932196 +0200
-@@ -33,11 +33,6 @@
- 	lt_iter_tmpl_t  parent;
- 	lt_trie_node_t *root;
- };
--typedef struct _lt_trie_iter_t {
--	lt_iter_t    parent;
--	lt_list_t   *stack;
--	lt_string_t *pos_str;
--} lt_trie_iter_t;
- 
- /*< private >*/
- static lt_trie_node_t *
-diff -ru langtag.orig/liblangtag/lt-trie.h langtag/liblangtag/lt-trie.h
---- UnpackedTarball/langtag.orig/liblangtag/lt-trie.h	2013-04-30 04:44:36.000000000 +0200
-+++ UnpackedTarball/langtag/liblangtag/lt-trie.h	2013-04-30 14:57:57.746969291 +0200
-@@ -21,7 +21,11 @@
- LT_BEGIN_DECLS
- 
- typedef struct _lt_trie_t	lt_trie_t;
--typedef struct _lt_trie_iter_t  lt_trie_iter_t;
-+typedef struct _lt_trie_iter_t {
-+	lt_iter_t    parent;
-+	lt_list_t   *stack;
-+	lt_string_t *pos_str;
-+} lt_trie_iter_t;
- 
- lt_trie_t      *lt_trie_new        (void);
- lt_trie_t      *lt_trie_ref        (lt_trie_t         *trie);
diff --git a/liblangtag/liblangtag-0.5.1-scope-declaration.patch b/liblangtag/liblangtag-0.5.1-scope-declaration.patch
deleted file mode 100644
index 69bc434b46da..000000000000
--- a/liblangtag/liblangtag-0.5.1-scope-declaration.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff -ru langtag.orig/tests/variant-db.c langtag/tests/variant-db.c
---- UnpackedTarball/langtag.orig/tests/variant-db.c	2013-04-22 10:06:57.000000000 +0200
-+++ UnpackedTarball/langtag/tests/variant-db.c	2013-04-30 14:12:18.399306545 +0200
-@@ -53,8 +53,8 @@
- 		}
- 		lt_iter_finish(iter);
- 	} else if (lt_strcmp0(argv[1], "lookup") == 0) {
--		variant = lt_variant_db_lookup(variantdb, argv[2]);
- 		const lt_list_t *prefix, *l;
-+		variant = lt_variant_db_lookup(variantdb, argv[2]);
- 
- 		if (variant) {
- 			printf("desc: %s\n", lt_variant_get_name(variant));
diff --git a/liblangtag/liblangtag-0.5.1-undefined-have-sys-param-h.patch b/liblangtag/liblangtag-0.5.1-undefined-have-sys-param-h.patch
deleted file mode 100644
index 3cee1458ab7e..000000000000
--- a/liblangtag/liblangtag-0.5.1-undefined-have-sys-param-h.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-# liblangtag/lt-macros.h:17:5: error: "HAVE_SYS_PARAM_H" is not defined [-Werror=undef]
-
-diff -ru UnpackedTarball/langtag.orig/liblangtag/lt-macros.h UnpackedTarball/langtag/liblangtag/lt-macros.h
---- UnpackedTarball/langtag.orig/liblangtag/lt-macros.h	2013-04-30 16:09:19.362392416 +0200
-+++ UnpackedTarball/langtag/liblangtag/lt-macros.h	2013-04-30 18:01:13.275188759 +0200
-@@ -14,7 +14,7 @@
- #error "Only <liblangtag/langtag.h> can be included directly."
- #endif
- 
--#if HAVE_SYS_PARAM_H
-+#if defined(HAVE_SYS_PARAM_H) && HAVE_SYS_PARAM_H
- #include <sys/param.h>
- #endif
- 
diff --git a/liblangtag/liblangtag-0.5.1-unistd.patch b/liblangtag/liblangtag-0.5.1-unistd.patch
deleted file mode 100644
index 0aebe0b09cda..000000000000
--- a/liblangtag/liblangtag-0.5.1-unistd.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- UnpackedTarball/langtag/liblangtag/lt-utils.c	2013-05-10 14:36:54.445200000 +0200
-+++ UnpackedTarball/langtag/liblangtag/lt-utils.c	2013-05-10 14:38:31.446000000 +0200
-@@ -23,7 +23,9 @@
- #if HAVE_STRING_H
- #include <string.h>
- #endif
-+#if HAVE_UNISTD_H
- #include <unistd.h>
-+#endif
- #include <sys/types.h>
- #include "lt-messages.h"
- #include "lt-utils.h"
diff --git a/liblangtag/liblangtag-0.5.1-vsnprintf.patch b/liblangtag/liblangtag-0.5.1-vsnprintf.patch
deleted file mode 100644
index 599c47f9ae52..000000000000
--- a/liblangtag/liblangtag-0.5.1-vsnprintf.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-diff -ru UnpackedTarball/orig.langtag/liblangtag/lt-utils.c UnpackedTarball/langtag/liblangtag/lt-utils.c
---- UnpackedTarball/orig.langtag/liblangtag/lt-utils.c	2013-07-19 16:47:20.310734230 +0200
-+++ UnpackedTarball/langtag/liblangtag/lt-utils.c	2013-07-19 16:53:10.839914271 +0200
-@@ -173,9 +173,11 @@
- 
- 		va_end(ap);
- 
--		retval = malloc(sizeof (char) * size);
--		if (retval) {
--			vsprintf(retval, format, args);
-+		if (size > 0) {
-+			retval = malloc(sizeof (char) * size);
-+			if (retval) {
-+				vsprintf(retval, format, args);
-+			}
- 		}
- 	} LT_STMT_END;
- #elif HAVE_VSNPRINTF
diff --git a/liblangtag/liblangtag-0.5.1-windows-do-not-prepend-dir-separator.patch b/liblangtag/liblangtag-0.5.1-windows-do-not-prepend-dir-separator.patch
deleted file mode 100644
index cc0e4abaed59..000000000000
--- a/liblangtag/liblangtag-0.5.1-windows-do-not-prepend-dir-separator.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-diff -ru UnpackedTarball/langtag.orig/liblangtag/lt-string.c UnpackedTarball/langtag/liblangtag/lt-string.c
---- UnpackedTarball/langtag.orig/liblangtag/lt-string.c	2013-04-22 10:35:07.000000000 +0200
-+++ UnpackedTarball/langtag/liblangtag/lt-string.c	2013-04-30 18:34:14.422037274 +0200
-@@ -308,8 +308,12 @@
- 	lt_return_val_if_fail (string != NULL, NULL);
- 	lt_return_val_if_fail (path != NULL, string);
- 
-+#ifdef _WIN32
-+    /* This simply does not work on Windows with "D:\..." */
-+#else
- 	if (lt_string_length(string) == 0 && path[0] != LT_DIR_SEPARATOR)
- 		lt_string_append(string, LT_DIR_SEPARATOR_S);
-+#endif
- 
- 	va_start(ap, path);
- 	p = path;