From 6e28930bddbc65f90291b2de8801948f3c90e31c Mon Sep 17 00:00:00 2001
From: Saul Wold <sgw@linux.intel.com>
Date: Thu, 2 Feb 2012 10:19:33 -0800
Subject: libidn: Update to 1.24

(From OE-Core rev: ef2dcae84fe3a91f781ce906ea283d9f8d698af8)

Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
---
 meta/recipes-extended/libidn/libidn_1.23.bb | 24 ----------------------
 meta/recipes-extended/libidn/libidn_1.24.bb | 31 +++++++++++++++++++++++++++++
 2 files changed, 31 insertions(+), 24 deletions(-)
 delete mode 100644 meta/recipes-extended/libidn/libidn_1.23.bb
 create mode 100644 meta/recipes-extended/libidn/libidn_1.24.bb

(limited to 'meta/recipes-extended/libidn')

diff --git a/meta/recipes-extended/libidn/libidn_1.23.bb b/meta/recipes-extended/libidn/libidn_1.23.bb
deleted file mode 100644
index 851b5fccfc..0000000000
--- a/meta/recipes-extended/libidn/libidn_1.23.bb
+++ /dev/null
@@ -1,24 +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+ & GPLv3+"
-LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504 \
-                    file://COPYING.LIB;md5=4fbd65380cdd255951079008b364516c \
-                    file://lib/idna.h;endline=21;md5=dbd4426bbc38846d5a6b94c3570fd756 \
-                    file://src/idn.c;endline=20;md5=e7bc77cab53f7367b7e381aaa546e76c"
-PR = "r0"
-
-inherit pkgconfig autotools gettext
-
-SRC_URI = "${GNU_MIRROR}/libidn/${BPN}-${PV}.tar.gz"
-
-SRC_URI[md5sum] = "f9a417270cc9b6bf763ae1f88e60191c"
-SRC_URI[sha256sum] = "25b42d75851ebae52e1c969353b74eefd3d6817f41c8d2a6db258f5ec60c5e6a"
-
-# command tool is under GPLv3+, while libidn itself is under LGPLv2.1+
-# so package command into a separate package
-PACKAGES =+ "idn"
-FILES_idn = "${bindir}/*"
-
-EXTRA_OECONF = " --disable-tld"
diff --git a/meta/recipes-extended/libidn/libidn_1.24.bb b/meta/recipes-extended/libidn/libidn_1.24.bb
new file mode 100644
index 0000000000..018f1181e5
--- /dev/null
+++ b/meta/recipes-extended/libidn/libidn_1.24.bb
@@ -0,0 +1,31 @@
+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=9c9d9d207a3468a696a03368913d360b \
+                    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=7364f6a250728ffe16170f5e3ab37512 \
+                    file://src/idn.c;endline=20;md5=7d7235e7951ac87d9dfac42e1b69d9cb"
+PR = "r0"
+
+inherit pkgconfig autotools gettext
+
+SRC_URI = "${GNU_MIRROR}/libidn/${BPN}-${PV}.tar.gz"
+
+SRC_URI[md5sum] = "764d7258eeb273941680499fab2c7367"
+SRC_URI[sha256sum] = "da1708c6063ecb7951a0908e67df3eacdfe128b18edaa6cf6867d7b73b5f35ff"
+
+# 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}/*"
+
+EXTRA_OECONF = " --disable-tld"
+
+do_install_append() {
+	rm -rf ${D}${datadir}/emacs
+}
-- 
cgit v1.2.3-54-g00ecf