From 52ba8d490733eb5e830717f414531270d88b3df6 Mon Sep 17 00:00:00 2001 From: Alexander Kanavin Date: Thu, 17 May 2018 14:38:32 +0300 Subject: libidn: upgrade 1.34 -> 1.35 Add autoconf-archive dependency to expand AC_JAVA_OPTIONS and other java-related macros. Signed-off-by: Alexander Kanavin Signed-off-by: Ross Burton --- .../libidn/libidn_fix_for_automake-1.12.patch | 8 ++--- meta/recipes-extended/libidn/libidn_1.34.bb | 42 ---------------------- meta/recipes-extended/libidn/libidn_1.35.bb | 42 ++++++++++++++++++++++ 3 files changed, 46 insertions(+), 46 deletions(-) delete mode 100644 meta/recipes-extended/libidn/libidn_1.34.bb create mode 100644 meta/recipes-extended/libidn/libidn_1.35.bb (limited to 'meta/recipes-extended/libidn') diff --git a/meta/recipes-extended/libidn/libidn/libidn_fix_for_automake-1.12.patch b/meta/recipes-extended/libidn/libidn/libidn_fix_for_automake-1.12.patch index 5d03810d00..3c0559e34f 100644 --- a/meta/recipes-extended/libidn/libidn/libidn_fix_for_automake-1.12.patch +++ b/meta/recipes-extended/libidn/libidn/libidn_fix_for_automake-1.12.patch @@ -1,4 +1,4 @@ -From c34c7aba769bff3e483f89145055b9b8733435f3 Mon Sep 17 00:00:00 2001 +From d4f64b78419139eda3c0e1c6ee116bb5f70ea67c Mon Sep 17 00:00:00 2001 From: Nitin A Kamble Date: Wed, 2 May 2012 18:05:19 -0700 Subject: [PATCH] libtasn1: fix build with automake 1.12 @@ -19,11 +19,11 @@ Signed-off-by: Nitin A Kamble 1 file changed, 4 insertions(+) diff --git a/configure.ac b/configure.ac -index f8049a4..261dad2 100644 +index 8297649..7b9626e 100644 --- a/configure.ac +++ b/configure.ac -@@ -33,6 +33,10 @@ AC_SUBST(LT_CURRENT, 17) - AC_SUBST(LT_REVISION, 18) +@@ -33,6 +33,10 @@ AC_SUBST(LT_CURRENT, 18) + AC_SUBST(LT_REVISION, 0) AC_SUBST(LT_AGE, 6) +# automake 1.12 seems to require this, but automake 1.11 doesn't recognize it diff --git a/meta/recipes-extended/libidn/libidn_1.34.bb b/meta/recipes-extended/libidn/libidn_1.34.bb deleted file mode 100644 index 424c6c9f98..0000000000 --- a/meta/recipes-extended/libidn/libidn_1.34.bb +++ /dev/null @@ -1,42 +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 = "(LGPLv2.1+ | LGPLv3) & GPLv3+" -LIC_FILES_CHKSUM = "file://COPYING;md5=df4be47940a91ee69556f5f71eed4aec \ - file://COPYING.LESSERv2;md5=4fbd65380cdd255951079008b364516c \ - file://COPYING.LESSERv3;md5=e6a600fd5e1d9cbde2d983680233ad02 \ - file://COPYINGv2;md5=b234ee4d69f5fce4486a80fdaf4a4263 \ - file://COPYINGv3;md5=d32239bcb673463ab874e80d47fae504 \ - file://lib/idna.h;endline=21;md5=37cffad24807f446a24de3e7371f20b9 \ - file://src/idn.c;endline=20;md5=09e97034a8877b3451cb65065fc2c06e" -DEPENDS = "virtual/libiconv" - -inherit pkgconfig autotools gettext texinfo gtk-doc - -SRC_URI = "${GNU_MIRROR}/libidn/${BPN}-${PV}.tar.gz \ - file://libidn_fix_for_automake-1.12.patch \ - file://avoid_AM_PROG_MKDIR_P_warning_error_with_automake_1.12.patch \ - file://dont-depend-on-help2man.patch \ - file://0001-idn-format-security-warnings.patch \ - " - -SRC_URI[md5sum] = "a829db6cd0b85733017c20a50bf10798" -SRC_URI[sha256sum] = "3719e2975f2fb28605df3479c380af2cf4ab4e919e1506527e4c7670afff6e3c" - -# command tool is under GPLv3+, while libidn itself is under LGPLv2.1+ or LGPLv3 -# so package command into a separate package -PACKAGES =+ "idn" -FILES_idn = "${bindir}/*" - -LICENSE_${PN} = "LGPLv2.1+ | LGPLv3" -LICENSE_idn = "GPLv3+" - -EXTRA_OECONF = "--disable-csharp" - -do_install_append() { - rm -rf ${D}${datadir}/emacs -} - -BBCLASSEXTEND = "native nativesdk" - diff --git a/meta/recipes-extended/libidn/libidn_1.35.bb b/meta/recipes-extended/libidn/libidn_1.35.bb new file mode 100644 index 0000000000..d5ce5b46bd --- /dev/null +++ b/meta/recipes-extended/libidn/libidn_1.35.bb @@ -0,0 +1,42 @@ +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 = "(LGPLv2.1+ | LGPLv3) & GPLv3+" +LIC_FILES_CHKSUM = "file://COPYING;md5=df4be47940a91ee69556f5f71eed4aec \ + file://COPYING.LESSERv2;md5=4fbd65380cdd255951079008b364516c \ + file://COPYING.LESSERv3;md5=e6a600fd5e1d9cbde2d983680233ad02 \ + file://COPYINGv2;md5=b234ee4d69f5fce4486a80fdaf4a4263 \ + file://COPYINGv3;md5=d32239bcb673463ab874e80d47fae504 \ + file://lib/idna.h;endline=21;md5=37cffad24807f446a24de3e7371f20b9 \ + file://src/idn.c;endline=20;md5=09e97034a8877b3451cb65065fc2c06e" +DEPENDS = "virtual/libiconv autoconf-archive" + +inherit pkgconfig autotools gettext texinfo gtk-doc + +SRC_URI = "${GNU_MIRROR}/libidn/${BPN}-${PV}.tar.gz \ + file://libidn_fix_for_automake-1.12.patch \ + file://avoid_AM_PROG_MKDIR_P_warning_error_with_automake_1.12.patch \ + file://dont-depend-on-help2man.patch \ + file://0001-idn-format-security-warnings.patch \ + " + +SRC_URI[md5sum] = "bef634141fe39326cb354b75e891fead" +SRC_URI[sha256sum] = "f11af1005b46b7b15d057d7f107315a1ad46935c7fcdf243c16e46ec14f0fe1e" + +# command tool is under GPLv3+, while libidn itself is under LGPLv2.1+ or LGPLv3 +# so package command into a separate package +PACKAGES =+ "idn" +FILES_idn = "${bindir}/*" + +LICENSE_${PN} = "LGPLv2.1+ | LGPLv3" +LICENSE_idn = "GPLv3+" + +EXTRA_OECONF = "--disable-csharp" + +do_install_append() { + rm -rf ${D}${datadir}/emacs +} + +BBCLASSEXTEND = "native nativesdk" + -- cgit 1.2.3-korg