From 3667da75208e6ccc6deb927555c861ddb3d34dd5 Mon Sep 17 00:00:00 2001
From: Caolán McNamara <caolanm@redhat.com>
Date: Wed, 20 Oct 2021 12:42:10 +0100
Subject: upgrade liblangtag to 0.6.3
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

langtag-valencia.patch.0 merged as:
https://bitbucket.org/tagoh/liblangtag/commits/fe35532a0b98d5a8179b9edee0d61ea8db9b5921

external/liblangtag/Wformat-overflow.patch redundant since:
https://bitbucket.org/tagoh/liblangtag/commits/49135ef561f309078f0bfd6e1f15052769cf75b4

Change-Id: Ieeb19679837f03a6938c97f069d6fb1e6dd9a30d
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/123890
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
---
 external/liblangtag/UnpackedTarball_liblangtag.mk |  5 ----
 external/liblangtag/Wformat-overflow.patch        | 17 -------------
 external/liblangtag/langtag-valencia.patch.0      | 29 -----------------------
 3 files changed, 51 deletions(-)
 delete mode 100644 external/liblangtag/Wformat-overflow.patch
 delete mode 100644 external/liblangtag/langtag-valencia.patch.0

(limited to 'external/liblangtag')

diff --git a/external/liblangtag/UnpackedTarball_liblangtag.mk b/external/liblangtag/UnpackedTarball_liblangtag.mk
index aae5a56e3295..16b9ea999f71 100644
--- a/external/liblangtag/UnpackedTarball_liblangtag.mk
+++ b/external/liblangtag/UnpackedTarball_liblangtag.mk
@@ -27,14 +27,9 @@ $(eval $(call gb_UnpackedTarball_add_patches,liblangtag,\
 endif
 endif
 
-# * external/liblangtag/Wformat-overflow.patch is effectively covered by upstream
-#   <https://bitbucket.org/tagoh/liblangtag/commits/49135ef561f309078f0bfd6e1f15052769cf75b4> "Fix
-#   possible null argument for %s directive":
 $(eval $(call gb_UnpackedTarball_add_patches,liblangtag, \
 	$(if $(SYSTEM_LIBXML),,external/liblangtag/langtag-libtool-rpath.patch.0) \
     external/liblangtag/clang-cl.patch.0 \
-    external/liblangtag/langtag-valencia.patch.0 \
-    external/liblangtag/Wformat-overflow.patch \
 ))
 
 # vim: set noet sw=4 ts=4:
diff --git a/external/liblangtag/Wformat-overflow.patch b/external/liblangtag/Wformat-overflow.patch
deleted file mode 100644
index f2d017e4b395..000000000000
--- a/external/liblangtag/Wformat-overflow.patch
+++ /dev/null
@@ -1,17 +0,0 @@
---- liblangtag/lt-script-db.c
-+++ liblangtag/lt-script-db.c
-@@ -134,8 +134,12 @@
- 			cnode = cnode->next;
- 		}
- 		if (!subtag) {
--			lt_warning("No subtag node: description = '%s'",
--				   desc);
-+			if (!desc) {
-+				lt_warning("No subtag nor description node");
-+			} else {
-+				lt_warning("No subtag node: description = '%s'",
-+					   desc);
-+			}
- 			goto bail1;
- 		}
- 		if (!desc) {
diff --git a/external/liblangtag/langtag-valencia.patch.0 b/external/liblangtag/langtag-valencia.patch.0
deleted file mode 100644
index dc28043042e4..000000000000
--- a/external/liblangtag/langtag-valencia.patch.0
+++ /dev/null
@@ -1,29 +0,0 @@
---- liblangtag/lt-tag.c
-+++ liblangtag/lt-tag.c
-@@ -2009,11 +2009,23 @@
- 	if (ctag->region)
- 		lt_string_append_printf(string, "_%s",
- 					lt_region_get_tag(ctag->region));
--	if (ctag->script) {
-+	if (ctag->script)
- 		mod = lt_script_convert_to_modifier(ctag->script);
--		if (mod)
--			lt_string_append_printf(string, "@%s", mod);
-+	if (!mod && ctag->variants)
-+	{
-+		lt_list_t* l;
-+		for (l = ctag->variants; l != NULL; l = lt_list_next(l)) {
-+			lt_variant_t *variant = lt_list_value(l);
-+			const char *s = lt_variant_get_tag(variant);
-+			if (lt_strcmp0(s, "valencia") == 0) {
-+				mod = "valencia";
-+				break;
-+			}
-+		}
- 	}
-+	if (mod)
-+		lt_string_append_printf(string, "@%s", mod);
-+
- 	lt_tag_unref(ctag);
- 
-   bail:
-- 
cgit