From 9d36aaacd47c7c88e31724c6dac3ab86edc47d41 Mon Sep 17 00:00:00 2001 From: Ross Burton Date: Tue, 4 Jun 2019 17:04:13 +0100 Subject: 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 Signed-off-by: Richard Purdie --- ...need_charset_alias-when-building-for-musl.patch | 23 ----------------- meta/recipes-extended/libidn/libidn2_2.0.5.bb | 29 ---------------------- meta/recipes-extended/libidn/libidn2_2.2.0.bb | 27 ++++++++++++++++++++ 3 files changed, 27 insertions(+), 52 deletions(-) delete mode 100644 meta/recipes-extended/libidn/libidn2/Unset-need_charset_alias-when-building-for-musl.patch delete mode 100644 meta/recipes-extended/libidn/libidn2_2.0.5.bb create mode 100644 meta/recipes-extended/libidn/libidn2_2.2.0.bb (limited to 'meta/recipes-extended/libidn') diff --git a/meta/recipes-extended/libidn/libidn2/Unset-need_charset_alias-when-building-for-musl.patch b/meta/recipes-extended/libidn/libidn2/Unset-need_charset_alias-when-building-for-musl.patch deleted file mode 100644 index ace50bbfde..0000000000 --- a/meta/recipes-extended/libidn/libidn2/Unset-need_charset_alias-when-building-for-musl.patch +++ /dev/null @@ -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 -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 ;; \ diff --git a/meta/recipes-extended/libidn/libidn2_2.0.5.bb b/meta/recipes-extended/libidn/libidn2_2.0.5.bb deleted file mode 100644 index 0daf7a6877..0000000000 --- a/meta/recipes-extended/libidn/libidn2_2.0.5.bb +++ /dev/null @@ -1,29 +0,0 @@ -SUMMARY = "Internationalized Domain Name support library" -DESCRIPTION = "Implementation of the Stringprep, Punycode and IDNA specifications defined by the IETF Internationalized Domain Names (IDN) working group." -HOMEPAGE = "http://www.gnu.org/software/libidn/" -SECTION = "libs" -LICENSE = "(GPLv2+ | LGPLv3) & GPLv3+" -LIC_FILES_CHKSUM = "file://COPYING;md5=ab90e75ef97cc6318ce4f2fbda62fe4d \ - file://COPYING.LESSERv3;md5=e6a600fd5e1d9cbde2d983680233ad02 \ - file://COPYINGv2;md5=b234ee4d69f5fce4486a80fdaf4a4263 \ - file://src/idn2.c;endline=16;md5=0283aec28e049f5bcaaeee52aa865874 \ - 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" - -DEPENDS = "virtual/libiconv libunistring" - -inherit pkgconfig autotools gettext texinfo gtk-doc lib_package - -EXTRA_OECONF += "--disable-rpath \ - --with-libunistring-prefix=${STAGING_EXECPREFIXDIR} \ - " - -LICENSE_${PN} = "(GPLv2+ | LGPLv3)" -LICENSE_${PN}-bin = "GPLv3+" - -BBCLASSEXTEND = "native nativesdk" diff --git a/meta/recipes-extended/libidn/libidn2_2.2.0.bb b/meta/recipes-extended/libidn/libidn2_2.2.0.bb new file mode 100644 index 0000000000..d7fec89fba --- /dev/null +++ b/meta/recipes-extended/libidn/libidn2_2.2.0.bb @@ -0,0 +1,27 @@ +SUMMARY = "Internationalized Domain Name support library" +DESCRIPTION = "Implementation of the Stringprep, Punycode and IDNA specifications defined by the IETF Internationalized Domain Names (IDN) working group." +HOMEPAGE = "http://www.gnu.org/software/libidn/" +SECTION = "libs" +LICENSE = "(GPLv2+ | LGPLv3) & GPLv3+" +LIC_FILES_CHKSUM = "file://COPYING;md5=2d834ea7d480438ada04e5d846152395 \ + file://COPYING.LESSERv3;md5=e6a600fd5e1d9cbde2d983680233ad02 \ + file://COPYINGv2;md5=b234ee4d69f5fce4486a80fdaf4a4263 \ + 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" +SRC_URI[md5sum] = "b846d4d20e22b99d6f7387bb66e00a1f" +SRC_URI[sha256sum] = "fc734732b506d878753ec6606982bf7b936e868c25c30ddb0d83f7d7056381fe" + +DEPENDS = "virtual/libiconv libunistring" + +inherit pkgconfig autotools gettext texinfo gtk-doc lib_package + +EXTRA_OECONF += "--disable-rpath \ + --with-libunistring-prefix=${STAGING_EXECPREFIXDIR} \ + " + +LICENSE_${PN} = "(GPLv2+ | LGPLv3)" +LICENSE_${PN}-bin = "GPLv3+" + +BBCLASSEXTEND = "native nativesdk" -- cgit v1.2.3-54-g00ecf