From 7a5eeeb58e19afa2334ae2fe377126fab6735eb7 Mon Sep 17 00:00:00 2001
From: Zhai Edwin <edwin.zhai@intel.com>
Date: Thu, 8 Jul 2010 10:04:47 +0800
Subject: libxslt: Update to 1.1.26

Also removed the doublefix.patch(removeing duplicated code), as there is no
this issue in 1.1.26

Signed-off-by: Zhai Edwin <edwin.zhai@intel.com>
---
 meta/packages/libxslt/libxslt/doublefix.patch | 17 -----------------
 meta/packages/libxslt/libxslt_1.1.22.bb       | 26 --------------------------
 meta/packages/libxslt/libxslt_1.1.26.bb       | 26 ++++++++++++++++++++++++++
 3 files changed, 26 insertions(+), 43 deletions(-)
 delete mode 100644 meta/packages/libxslt/libxslt/doublefix.patch
 delete mode 100644 meta/packages/libxslt/libxslt_1.1.22.bb
 create mode 100644 meta/packages/libxslt/libxslt_1.1.26.bb

(limited to 'meta')

diff --git a/meta/packages/libxslt/libxslt/doublefix.patch b/meta/packages/libxslt/libxslt/doublefix.patch
deleted file mode 100644
index e70393dcb7..0000000000
--- a/meta/packages/libxslt/libxslt/doublefix.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-This double definition breaks recent autoconf+automake.
-
-RP 1/2/10
-
-Index: libxslt-1.1.22/libexslt/Makefile.am
-===================================================================
---- libxslt-1.1.22.orig/libexslt/Makefile.am	2010-02-01 10:55:59.337788365 +0000
-+++ libxslt-1.1.22/libexslt/Makefile.am	2010-02-01 10:56:08.239068767 +0000
-@@ -11,8 +11,6 @@
- exsltinc_HEADERS =                      \
- 	exslt.h				\
- 	exsltconfig.h			\
--	exslt.h				\
--	exsltconfig.h			\
- 	exsltexports.h
- 
- libexslt_la_SOURCES =                   \
diff --git a/meta/packages/libxslt/libxslt_1.1.22.bb b/meta/packages/libxslt/libxslt_1.1.22.bb
deleted file mode 100644
index ce6cca7f78..0000000000
--- a/meta/packages/libxslt/libxslt_1.1.22.bb
+++ /dev/null
@@ -1,26 +0,0 @@
-DESCRIPTION = "GNOME XSLT library"
-HOMEPAGE = "http://xmlsoft.org/XSLT/"
-BUGTRACKER = "https://bugzilla.gnome.org/"
-
-LICENSE = "MIT"
-
-SECTION = "libs"
-PRIORITY = "optional"
-DEPENDS = "libxml2 (>=2.6.27)"
-PR = "r3"
-
-SRC_URI = "ftp://xmlsoft.org/libxml2/libxslt-${PV}.tar.gz \
-           file://pkgconfig_fix.patch;patch=1 \
-           file://doublefix.patch;patch=1"
-S = "${WORKDIR}/libxslt-${PV}"
-
-inherit autotools pkgconfig
-
-EXTRA_OECONF = "--without-python --without-debug --without-mem-debug --without-crypto"
-
-PACKAGES = "${PN}-dbg ${PN}-dev ${PN}-utils ${PN} ${PN}-doc ${PN}-locale"
-
-FILES_${PN}-dev += "${bindir}/xslt-config"
-FILES_${PN}-utils += "${bindir}"
-
-BBCLASSEXTEND = "native"
diff --git a/meta/packages/libxslt/libxslt_1.1.26.bb b/meta/packages/libxslt/libxslt_1.1.26.bb
new file mode 100644
index 0000000000..b5726974f1
--- /dev/null
+++ b/meta/packages/libxslt/libxslt_1.1.26.bb
@@ -0,0 +1,26 @@
+DESCRIPTION = "GNOME XSLT library"
+HOMEPAGE = "http://xmlsoft.org/XSLT/"
+BUGTRACKER = "https://bugzilla.gnome.org/"
+
+LICENSE = "MIT"
+LIC_FILES_CHKSUM = "file://COPYING;md5=0cd9a07afbeb24026c9b03aecfeba458"
+
+SECTION = "libs"
+PRIORITY = "optional"
+DEPENDS = "libxml2 (>=2.6.27)"
+PR = "r0"
+
+SRC_URI = "ftp://xmlsoft.org/libxslt//libxslt-${PV}.tar.gz \
+           file://pkgconfig_fix.patch;patch=1"
+S = "${WORKDIR}/libxslt-${PV}"
+
+inherit autotools pkgconfig
+
+EXTRA_OECONF = "--without-python --without-debug --without-mem-debug --without-crypto"
+
+PACKAGES = "${PN}-dbg ${PN}-dev ${PN}-utils ${PN} ${PN}-doc ${PN}-locale"
+
+FILES_${PN}-dev += "${bindir}/xslt-config"
+FILES_${PN}-utils += "${bindir}"
+
+BBCLASSEXTEND = "native"
-- 
cgit v1.2.3-54-g00ecf