]> git.ipfire.org Git - thirdparty/openembedded/openembedded-core-contrib.git/commitdiff
libidn: upgrade 1.34 -> 1.35
authorAlexander Kanavin <alexander.kanavin@linux.intel.com>
Thu, 17 May 2018 11:38:32 +0000 (14:38 +0300)
committerRichard Purdie <richard.purdie@linuxfoundation.org>
Tue, 29 May 2018 10:25:05 +0000 (11:25 +0100)
Add autoconf-archive dependency to expand AC_JAVA_OPTIONS and other
java-related macros.

Signed-off-by: Alexander Kanavin <alexander.kanavin@linux.intel.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
meta/recipes-extended/libidn/libidn/libidn_fix_for_automake-1.12.patch
meta/recipes-extended/libidn/libidn_1.35.bb [moved from meta/recipes-extended/libidn/libidn_1.34.bb with 89% similarity]

index 5d03810d006f15d2639bc42a3ff553c28f7a457a..3c0559e34f4fdbb74eb72e556caea65a3fd3b131 100644 (file)
@@ -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 <nitin.a.kamble@intel.com>
 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 <nitin.a.kamble@intel.com>
  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
similarity index 89%
rename from meta/recipes-extended/libidn/libidn_1.34.bb
rename to meta/recipes-extended/libidn/libidn_1.35.bb
index 424c6c9f981d13290a1d8f7bc2ab520196417026..d5ce5b46bd38cd4970ebeb28d4060d04644b1540 100644 (file)
@@ -10,7 +10,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=df4be47940a91ee69556f5f71eed4aec \
                     file://COPYINGv3;md5=d32239bcb673463ab874e80d47fae504 \
                     file://lib/idna.h;endline=21;md5=37cffad24807f446a24de3e7371f20b9 \
                     file://src/idn.c;endline=20;md5=09e97034a8877b3451cb65065fc2c06e"
-DEPENDS = "virtual/libiconv"
+DEPENDS = "virtual/libiconv autoconf-archive"
 
 inherit pkgconfig autotools gettext texinfo gtk-doc
 
@@ -21,8 +21,8 @@ SRC_URI = "${GNU_MIRROR}/libidn/${BPN}-${PV}.tar.gz \
            file://0001-idn-format-security-warnings.patch \
            "
 
-SRC_URI[md5sum] = "a829db6cd0b85733017c20a50bf10798"
-SRC_URI[sha256sum] = "3719e2975f2fb28605df3479c380af2cf4ab4e919e1506527e4c7670afff6e3c"
+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