bin/oss-fuzz-setup.sh | 2 -
download.lst | 4 +--
external/liblangtag/UnpackedTarball_liblangtag.mk | 5 ---
external/liblangtag/Wformat-overflow.patch | 17 ------------
external/liblangtag/langtag-valencia.patch.0 | 29 ----------------------
solenv/flatpak-manifest.in | 6 ++--
6 files changed, 6 insertions(+), 57 deletions(-)
New commits:
commit 3667da75208e6ccc6deb927555c861ddb3d34dd5
Author: Caolán McNamara <caol...@redhat.com>
AuthorDate: Wed Oct 20 12:42:10 2021 +0100
Commit: Caolán McNamara <caol...@redhat.com>
CommitDate: Wed Oct 20 16:02:48 2021 +0200
upgrade liblangtag to 0.6.3
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 <caol...@redhat.com>
diff --git a/bin/oss-fuzz-setup.sh b/bin/oss-fuzz-setup.sh
index 78c4e0a940b9..8eb1313937d4 100755
--- a/bin/oss-fuzz-setup.sh
+++ b/bin/oss-fuzz-setup.sh
@@ -28,7 +28,7 @@ curl --no-progress-meter -S \
-C - -O https://dev-www.libreoffice.org/src/cairo-1.17.4.tar.xz \
-C - -O https://dev-www.libreoffice.org/src/curl-7.79.1.tar.xz \
-C - -O https://dev-www.libreoffice.org/src/xmlsec1-1.2.32.tar.gz \
- -C - -O https://dev-www.libreoffice.org/src/liblangtag-0.6.2.tar.bz2 \
+ -C - -O https://dev-www.libreoffice.org/src/liblangtag-0.6.3.tar.bz2 \
-C - -O https://dev-www.libreoffice.org/src/libabw-0.1.3.tar.xz \
-C - -O https://dev-www.libreoffice.org/src/libcdr-0.1.7.tar.xz \
-C - -O https://dev-www.libreoffice.org/src/libcmis-0.5.2.tar.xz \
diff --git a/download.lst b/download.lst
index 0573475da78b..2902003dfabf 100644
--- a/download.lst
+++ b/download.lst
@@ -158,8 +158,8 @@ export LIBFFI_SHA256SUM :=
72fba7922703ddfa7a028d513ac15a85c8d54c8d67f55fa5a4802
export LIBFFI_TARBALL := libffi-3.3.tar.gz
export LIBGPGERROR_SHA256SUM :=
b32d6ff72a73cf79797f7f2d039e95e9c6f92f0c1450215410840ab62aea9763
export LIBGPGERROR_TARBALL := libgpg-error-1.37.tar.bz2
-export LIBLANGTAG_SHA256SUM :=
d6242790324f1432fb0a6fae71b6851f520b2c5a87675497cf8ea14c2924d52e
-export LIBLANGTAG_TARBALL := liblangtag-0.6.2.tar.bz2
+export LIBLANGTAG_SHA256SUM :=
1f12a20a02ec3a8d22e54dedb8b683a43c9c160bda1ba337bf1060607ae733bd
+export LIBLANGTAG_TARBALL := liblangtag-0.6.3.tar.bz2
export LIBNUMBERTEXT_SHA256SUM :=
17b8249cb89ae11ae15a85612d2665626c0e0e3e56b35654363ba6566d8b61fc
export LIBNUMBERTEXT_TARBALL := libnumbertext-1.0.7.tar.xz
export LIBTOMMATH_SHA256SUM :=
083daa92d8ee6f4af96a6143b12d7fc8fe1a547e14f862304f7281f8f7347483
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:
diff --git a/solenv/flatpak-manifest.in b/solenv/flatpak-manifest.in
index 3bfde02d37ea..d0e93080a0cc 100644
--- a/solenv/flatpak-manifest.in
+++ b/solenv/flatpak-manifest.in
@@ -292,11 +292,11 @@
"dest-filename":
"language-subtag-registry-2021-08-06.tar.bz2"
},
{
- "url":
"https://dev-www.libreoffice.org/src/liblangtag-0.6.2.tar.bz2";,
- "sha256":
"d6242790324f1432fb0a6fae71b6851f520b2c5a87675497cf8ea14c2924d52e",
+ "url":
"https://dev-www.libreoffice.org/src/liblangtag-0.6.3.tar.bz2";,
+ "sha256":
"1f12a20a02ec3a8d22e54dedb8b683a43c9c160bda1ba337bf1060607ae733bd",
"type": "file",
"dest": "external/tarballs",
- "dest-filename": "liblangtag-0.6.2.tar.bz2"
+ "dest-filename": "liblangtag-0.6.3.tar.bz2"
},
{
"url":
"https://dev-www.libreoffice.org/src/libmspub-0.1.4.tar.xz";,
