liblangtag: upgrade to 0.6.8

0001-const-up-__lt_localealias_tables.patch.1 has been fixed
upstream

Downloaded from https://gitlab.com/-/project/74684761/uploads/9f74bd278e6edfbf1093605d38fb7a97/liblangtag-0.6.8.tar.bz2

Change-Id: I4b171d98271921c959115a8fabdf20217350be5d
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/191445
Reviewed-by: Xisco Fauli <xiscofauli@libreoffice.org>
Tested-by: Jenkins

5 files changed, 5 insertions, 34 deletions

diff --git a/download.lst b/download.lst
index 45a945b3e380..7ec923add4a0 100644
--- a/download.lst
+++ b/download.lst
@@ -435,8 +435,8 @@ LIBGPGERROR_TARBALL := libgpg-error-1.55.tar.bz2
 # three static lines
 # so that git cherry-pick
 # will not run into conflicts
-LIBLANGTAG_SHA256SUM := 5ed6bcd4ae3f3c05c912e62f216cd1a44123846147f729a49fb5668da51e030e
-LIBLANGTAG_TARBALL := liblangtag-0.6.7.tar.bz2
+LIBLANGTAG_SHA256SUM := a96975b79ddd8fef6d9295c083fe3f1afa1a8898a57235d4069255ade44e5cf2
+LIBLANGTAG_TARBALL := liblangtag-0.6.8.tar.bz2
 # three static lines
 # so that git cherry-pick
 # will not run into conflicts
diff --git a/external/liblangtag/0001-const-up-__lt_localealias_tables.patch.1 b/external/liblangtag/0001-const-up-__lt_localealias_tables.patch.1
deleted file mode 100644
index 699e4d11fff4..000000000000
--- a/external/liblangtag/0001-const-up-__lt_localealias_tables.patch.1
+++ /dev/null
@@ -1,24 +0,0 @@
-diff -ru liblangtag.orig/liblangtag/buildaliastbl.sh liblangtag/liblangtag/buildaliastbl.sh
---- liblangtag.orig/liblangtag/buildaliastbl.sh	2025-07-22 12:19:49.716993437 +0100
-+++ liblangtag/liblangtag/buildaliastbl.sh	2025-07-22 12:22:16.548661384 +0100
-@@ -48,7 +48,7 @@
- 	const char *locale;
- };
- 
--static lt_localealias_t __lt_localealias_tables[] = {
-+static const lt_localealias_t __lt_localealias_tables[] = {
- EOF
- 
- iconv -f iso8859-1 -t utf-8 $1 | awk '{ if ($0 !~ /^(#.*)?$/) printf("\t{\"%s\", \"%s\"},\n", $1, $2); }'
-diff -ru liblangtag.orig/liblangtag/lt-localealias.h liblangtag/liblangtag/lt-localealias.h
---- liblangtag.orig/liblangtag/lt-localealias.h	2025-07-22 12:19:49.715993433 +0100
-+++ liblangtag/liblangtag/lt-localealias.h	2025-07-22 12:22:10.627634449 +0100
-@@ -27,7 +27,7 @@
- 	const char *locale;
- };
- 
--static lt_localealias_t __lt_localealias_tables[] = {
-+static const lt_localealias_t __lt_localealias_tables[] = {
- 	{"bokmal", "nb_NO.ISO-8859-1"},
- 	{"catalan", "ca_ES.ISO-8859-1"},
- 	{"croatian", "hr_HR.ISO-8859-2"},
diff --git a/external/liblangtag/ExternalPackage_liblangtag.mk b/external/liblangtag/ExternalPackage_liblangtag.mk
index 549f5eb36aed..385d54ddb799 100644
--- a/external/liblangtag/ExternalPackage_liblangtag.mk
+++ b/external/liblangtag/ExternalPackage_liblangtag.mk
@@ -14,7 +14,7 @@ $(eval $(call gb_ExternalPackage_use_external_project,liblangtag,liblangtag))
 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.1))
+$(eval $(call gb_ExternalPackage_add_file,liblangtag,$(LIBO_LIB_FOLDER)/liblangtag-lo.so.1,liblangtag/.libs/liblangtag-lo.so.1.4.2))
 endif
 
 # vim: set noet sw=4 ts=4:
diff --git a/external/liblangtag/UnpackedTarball_liblangtag.mk b/external/liblangtag/UnpackedTarball_liblangtag.mk
index acc0a77047d3..a6a1e97ab6f7 100644
--- a/external/liblangtag/UnpackedTarball_liblangtag.mk
+++ b/external/liblangtag/UnpackedTarball_liblangtag.mk
@@ -19,10 +19,6 @@ $(eval $(call gb_UnpackedTarball_update_autoconf_configs,liblangtag))
 
 $(eval $(call gb_UnpackedTarball_set_patchlevel,liblangtag,0))
 
-# 0001-const-up-__lt_localealias_tables.patch
-# upstreaming attempt at:
-# https://bitbucket.org/tagoh/liblangtag/pull-requests/14
-
 ifneq ($(OS),MACOSX)
 ifneq ($(OS),WNT)
 $(eval $(call gb_UnpackedTarball_add_patches,liblangtag,\
@@ -34,7 +30,6 @@ endif
 $(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/0001-const-up-__lt_localealias_tables.patch.1 \
 ))
 
 # vim: set noet sw=4 ts=4:
diff --git a/external/liblangtag/liblangtag-bundled-soname.patch.0 b/external/liblangtag/liblangtag-bundled-soname.patch.0
index 4780d7a125f4..036498dd9567 100644
--- a/external/liblangtag/liblangtag-bundled-soname.patch.0
+++ b/external/liblangtag/liblangtag-bundled-soname.patch.0
@@ -1,8 +1,8 @@
 --- liblangtag/Makefile.in.orig	2015-08-07 11:57:42.256742305 +0200
 +++ liblangtag/Makefile.in	2015-08-07 11:58:11.818741799 +0200
-@@ -638,6 +638,7 @@
- liblangtag_la_LDFLAGS = \
+@@ -685,6 +685,7 @@
  	$(LDFLAGS)						\
+ 	-no-undefined						\
  	-version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE)	\
 +	-release lo \
  	$(NULL)