libunistring: update 0.9.10 -> 1.0

Delete patches, as one is a backport, another patches code that upstream removed.

License-Update: license changed to gplv2+
https://git.savannah.gnu.org/gitweb/?p=libunistring.git;a=commitdiff;h=87f797a50b854a4a2231203c25adbcec4f0dcd05

(From OE-Core rev: 32d2479782c7577352150ea1e3e6d2d48dad2eb0)

Signed-off-by: Alexander Kanavin <alex@linutronix.de>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>

3 files changed, 5 insertions, 96 deletions

diff --git a/meta/recipes-support/libunistring/libunistring/0001-Make-gl_INIT_PACKAGE-work-with-Automake-1.16.4.patch b/meta/recipes-support/libunistring/libunistring/0001-Make-gl_INIT_PACKAGE-work-with-Automake-1.16.4.patch
deleted file mode 100644
index d8424f28d4..0000000000
--- a/meta/recipes-support/libunistring/libunistring/0001-Make-gl_INIT_PACKAGE-work-with-Automake-1.16.4.patch
+++ /dev/null
@@ -1,57 +0,0 @@
-From 15e4365267e316f15222b8bf9f0a7cd0db231e9c Mon Sep 17 00:00:00 2001
-From: Bruno Haible <bruno@clisp.org>
-Date: Sun, 8 Aug 2021 01:58:42 +0200
-Subject: [PATCH] Make gl_INIT_PACKAGE work with Automake >= 1.16.4.
-
-Reported and analyzed by Nicole Mazzuca <mazzucan@outlook.com> in
-<https://lists.gnu.org/archive/html/bug-libunistring/2021-08/msg00002.html>.
-
-* m4/init-package-version.m4 (gl_INIT_PACKAGE): Use a new macro
-gl_INIT_EMPTY.
-(gl_INIT_DUMMY): Expand to empty in two steps, via a new macro
-gl_INIT_DUMMY2.
-
-Upstream-Status: Backport
-Signed-off-by: Alexander Kanavin <alex@linutronix.de>
----
- ChangeLog                  | 10 ++++++++++
- m4/init-package-version.m4 | 12 ++++++++----
- 2 files changed, 18 insertions(+), 4 deletions(-)
-
-diff --git a/m4/init-package-version.m4 b/m4/init-package-version.m4
-index f131a84..a26b1ab 100644
---- a/m4/init-package-version.m4
-+++ b/m4/init-package-version.m4
-@@ -1,5 +1,5 @@
--# init-package-version.m4 serial 1 (gettext-0.18)
--dnl Copyright (C) 1992-2009 Free Software Foundation, Inc.
-+# init-package-version.m4 serial 2
-+dnl Copyright (C) 1992-2021 Free Software Foundation, Inc.
- dnl This file is free software, distributed under the terms of the GNU
- dnl General Public License.  As a special exception to the GNU General
- dnl Public License, this file may be distributed as part of a program
-@@ -77,7 +77,7 @@ AC_DEFUN([gl_INIT_PACKAGE],
-             m4_bpatsubst(m4_dquote(
-                 m4_defn([AM_INIT_AUTOMAKE])),
-               [AC_PACKAGE_NAME], [gl_INIT_DUMMY])),
--          [AC_PACKAGE_TARNAME], [gl_INIT_DUMMY])),
-+          [AC_PACKAGE_TARNAME], [gl_INIT_EMPTY])),
-       [AC_PACKAGE_VERSION], [gl_INIT_DUMMY])
-     [AC_SUBST([PACKAGE], [$1])
-      AC_SUBST([VERSION], [$2])
-@@ -85,7 +85,11 @@ AC_DEFUN([gl_INIT_PACKAGE],
-   m4_define([AM_INIT_AUTOMAKE],
-     m4_defn([gl_RPL_INIT_AUTOMAKE]))
- ])
--m4_define([gl_INIT_DUMMY], [])
-+m4_define([gl_INIT_EMPTY], [])
-+dnl Automake 1.16.4 no longer accepts an empty value for gl_INIT_DUMMY.
-+dnl But a macro that later expands to empty works.
-+m4_define([gl_INIT_DUMMY], [gl_INIT_DUMMY2])
-+m4_define([gl_INIT_DUMMY2], [])
- AC_DEFUN([gl_RPL_INIT_AUTOMAKE], [
-   m4_ifval([$2],
-     [m4_fatal([After gl_INIT_PACKAGE, the two-argument form of AM_INIT_AUTOMAKE cannot be used.])])
--- 
-2.20.1
-
diff --git a/meta/recipes-support/libunistring/libunistring/0001-Unset-need_charset_alias-when-building-for-musl.patch b/meta/recipes-support/libunistring/libunistring/0001-Unset-need_charset_alias-when-building-for-musl.patch
deleted file mode 100644
index 2aeacb868e..0000000000
--- a/meta/recipes-support/libunistring/libunistring/0001-Unset-need_charset_alias-when-building-for-musl.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-From b9565dc2fe0c4f7daaec91b7e83bc7313dee2f4a Mon Sep 17 00:00:00 2001
-From: Khem Raj <raj.khem@gmail.com>
-Date: Mon, 13 Apr 2015 17:02:13 -0700
-Subject: [PATCH] Unset need_charset_alias when building for musl
-
-localcharset uses ac_cv_gnu_library_2_1 from glibc21.m4
-which actually shoudl be fixed in gnulib and then all downstream
-projects will get it eventually. For now we apply the fix to
-coreutils
-
-Upstream-Status: Pending
-
-Signed-off-by: Khem Raj <raj.khem@gmail.com>
----
- lib/gnulib.mk | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-Index: libunistring-0.9.4/lib/Makefile.gnulib
-===================================================================
---- libunistring-0.9.4.orig/lib/Makefile.gnulib
-+++ libunistring-0.9.4/lib/Makefile.gnulib
-@@ -380,7 +380,7 @@ install-exec-localcharset: all-local
-          case '$(host_os)' in \
-            darwin[56]*) \
-              need_charset_alias=true ;; \
--           darwin* | cygwin* | mingw* | pw32* | cegcc*) \
-+           darwin* | cygwin* | mingw* | pw32* | cegcc* | linux-musl*) \
-              need_charset_alias=false ;; \
-            *) \
-              need_charset_alias=true ;; \
diff --git a/meta/recipes-support/libunistring/libunistring_0.9.10.bb b/meta/recipes-support/libunistring/libunistring_1.0.bb
index 0692bbcb44..31c84cb790 100644
--- a/meta/recipes-support/libunistring/libunistring_0.9.10.bb
+++ b/meta/recipes-support/libunistring/libunistring_1.0.bb
@@ -13,19 +13,15 @@ DESCRIPTION = "Text files are nowadays usually encoded in Unicode, and may\
 
 HOMEPAGE = "http://www.gnu.org/software/libunistring/"
 SECTION = "devel"
-LICENSE = "LGPLv3+ | GPLv2"
+LICENSE = "LGPLv3+ | GPLv2+"
 LIC_FILES_CHKSUM = "file://COPYING.LIB;md5=6a6a8e020838b23406c81b19c1d46df6 \
-                    file://README;beginline=45;endline=65;md5=08287d16ba8d839faed8d2dc14d7d6a5 \
-                    file://doc/libunistring.texi;md5=287fa6075f78a3c85c1a52b0a92547cd \
+                    file://README;beginline=45;endline=65;md5=3a896a943b4da2c551e6be1af27eff8d \
+                    file://doc/libunistring.texi;md5=266e4297d7c18f197be3d9622ba99685 \
                    "
 DEPENDS = "gperf-native"
 
-SRC_URI = "${GNU_MIRROR}/libunistring/libunistring-${PV}.tar.gz \
-           file://0001-Unset-need_charset_alias-when-building-for-musl.patch \
-           file://0001-Make-gl_INIT_PACKAGE-work-with-Automake-1.16.4.patch \
-"
-SRC_URI[md5sum] = "0d3274e9838396b12200f8b54ddaf43b"
-SRC_URI[sha256sum] = "a82e5b333339a88ea4608e4635479a1cfb2e01aafb925e1290b65710d43f610b"
+SRC_URI = "${GNU_MIRROR}/libunistring/libunistring-${PV}.tar.gz"
+SRC_URI[sha256sum] = "3c0184c0e492d7c208ce31d25dd1d2c58f0c3ed6cbbe032c5b248cddad318544"
 
 inherit autotools texinfo
 BBCLASSEXTEND = "native nativesdk"