libidn2: upgrade to 2.2.0

The unistring patch isn't needed anymore (the relevant lines are entirely
removed).

License checksums updated because of a typo fix, and an added author name.

(From OE-Core rev: 73fe3f7108e1d194961440f63afa73d5f7a0b983)

Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Ross Burton
2019-06-04 17:04:13 +01:00
committed by Richard Purdie
parent 6a0d6ca080
commit 9d36aaacd4
2 changed files with 5 additions and 30 deletions

View File

@@ -1,23 +0,0 @@
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>
Index: libidn2-2.0.5/unistring/Makefile.am
===================================================================
--- libidn2-2.0.5.orig/unistring/Makefile.am
+++ libidn2-2.0.5/unistring/Makefile.am
@@ -293,7 +293,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 ;; \

View File

@@ -3,17 +3,15 @@ DESCRIPTION = "Implementation of the Stringprep, Punycode and IDNA specification
HOMEPAGE = "http://www.gnu.org/software/libidn/"
SECTION = "libs"
LICENSE = "(GPLv2+ | LGPLv3) & GPLv3+"
LIC_FILES_CHKSUM = "file://COPYING;md5=ab90e75ef97cc6318ce4f2fbda62fe4d \
LIC_FILES_CHKSUM = "file://COPYING;md5=2d834ea7d480438ada04e5d846152395 \
file://COPYING.LESSERv3;md5=e6a600fd5e1d9cbde2d983680233ad02 \
file://COPYINGv2;md5=b234ee4d69f5fce4486a80fdaf4a4263 \
file://src/idn2.c;endline=16;md5=0283aec28e049f5bcaaeee52aa865874 \
file://src/idn2.c;endline=16;md5=426b74d6deb620ab6d39c8a6efd4c13a \
file://lib/idn2.h.in;endline=27;md5=c2cd28d3f87260f157f022eabb83714f"
SRC_URI = "${GNU_MIRROR}/libidn/${BPN}-${PV}.tar.gz \
file://Unset-need_charset_alias-when-building-for-musl.patch \
"
SRC_URI[md5sum] = "eaf9a5b9d03b0cce3760f34b3124eb36"
SRC_URI[sha256sum] = "53f69170886f1fa6fa5b332439c7a77a7d22626a82ef17e2c1224858bb4ca2b8"
SRC_URI = "${GNU_MIRROR}/libidn/${BPN}-${PV}.tar.gz"
SRC_URI[md5sum] = "b846d4d20e22b99d6f7387bb66e00a1f"
SRC_URI[sha256sum] = "fc734732b506d878753ec6606982bf7b936e868c25c30ddb0d83f7d7056381fe"
DEPENDS = "virtual/libiconv libunistring"