From 960ad0998a9edbefe57d08b6f587682f0dc9d768 Mon Sep 17 00:00:00 2001
From: Constantin Musca <constantinx.musca@intel.com>
Date: Fri, 9 Nov 2012 12:00:41 +0200
Subject: libxslt: upgrade to 1.1.27

pkgconfig_fix.patch: adapted to the new version

Signed-off-by: Constantin Musca <constantinx.musca@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
---
 .../libxslt/libxslt/pkgconfig_fix.patch            | 22 +++++++-------
 meta/recipes-support/libxslt/libxslt_1.1.26.bb     | 35 ----------------------
 meta/recipes-support/libxslt/libxslt_1.1.27.bb     | 35 ++++++++++++++++++++++
 3 files changed, 46 insertions(+), 46 deletions(-)
 delete mode 100644 meta/recipes-support/libxslt/libxslt_1.1.26.bb
 create mode 100644 meta/recipes-support/libxslt/libxslt_1.1.27.bb

(limited to 'meta/recipes-support/libxslt')

diff --git a/meta/recipes-support/libxslt/libxslt/pkgconfig_fix.patch b/meta/recipes-support/libxslt/libxslt/pkgconfig_fix.patch
index 6386889524..16a801010c 100644
--- a/meta/recipes-support/libxslt/libxslt/pkgconfig_fix.patch
+++ b/meta/recipes-support/libxslt/libxslt/pkgconfig_fix.patch
@@ -1,24 +1,24 @@
 Upstream-Status: Inappropriate [configuration]
 
-Index: libxslt-1.1.22/libexslt.pc.in
+Index: libxslt-1.1.27/libexslt.pc.in
 ===================================================================
---- libxslt-1.1.22.orig/libexslt.pc.in	2008-03-19 16:52:20.000000000 +0000
-+++ libxslt-1.1.22/libexslt.pc.in	2008-03-19 16:55:49.000000000 +0000
-@@ -8,5 +8,5 @@
+--- libxslt-1.1.27.orig/libexslt.pc.in
++++ libxslt-1.1.27/libexslt.pc.in
+@@ -8,5 +8,5 @@ Name: libexslt
  Version: @LIBEXSLT_VERSION@
  Description: EXSLT Extension library
  Requires: libxml-2.0
 -Libs: @EXSLT_LIBDIR@ @EXSLT_LIBS@
-+Libs: -lexslt @EXSLT_LIBDIR@ @M_LIBS@
++Libs: -lexslt @EXSLT_LIBDIR@ @EXSLT_LIBS@
  Cflags: @EXSLT_INCLUDEDIR@
-Index: libxslt-1.1.22/libxslt.pc.in
+Index: libxslt-1.1.27/libxslt.pc.in
 ===================================================================
---- libxslt-1.1.22.orig/libxslt.pc.in	2008-03-19 16:52:20.000000000 +0000
-+++ libxslt-1.1.22/libxslt.pc.in	2008-03-19 16:55:38.000000000 +0000
-@@ -8,5 +8,5 @@
+--- libxslt-1.1.27.orig/libxslt.pc.in
++++ libxslt-1.1.27/libxslt.pc.in
+@@ -8,5 +8,5 @@ Name: libxslt
  Version: @VERSION@
  Description: XSLT library version 2.
  Requires: libxml-2.0
--Libs: @XSLT_LIBDIR@ @XSLT_LIBS@
-+Libs: -lxslt @XSLT_LIBDIR@ @M_LIBS@
+-Libs: @XSLT_LIBDIR@ @XSLT_LIBS@ @EXTRA_LIBS@
++Libs: -lxslt @XSLT_LIBDIR@ @XSLT_LIBS@ @EXTRA_LIBS@
  Cflags: @XSLT_INCLUDEDIR@
diff --git a/meta/recipes-support/libxslt/libxslt_1.1.26.bb b/meta/recipes-support/libxslt/libxslt_1.1.26.bb
deleted file mode 100644
index e4cc21472b..0000000000
--- a/meta/recipes-support/libxslt/libxslt_1.1.26.bb
+++ /dev/null
@@ -1,35 +0,0 @@
-DESCRIPTION = "GNOME XSLT library"
-HOMEPAGE = "http://xmlsoft.org/XSLT/"
-BUGTRACKER = "https://bugzilla.gnome.org/"
-
-LICENSE = "MIT"
-LIC_FILES_CHKSUM = "file://Copyright;md5=0cd9a07afbeb24026c9b03aecfeba458"
-
-SECTION = "libs"
-DEPENDS = "libxml2"
-PR = "r8"
-
-SRC_URI = "ftp://xmlsoft.org/libxslt//libxslt-${PV}.tar.gz \
-           file://pkgconfig_fix.patch"
-
-SRC_URI[md5sum] = "e61d0364a30146aaa3001296f853b2b9"
-SRC_URI[sha256sum] = "55dd52b42861f8a02989d701ef716d6280bfa02971e967c285016f99c66e3db1"
-S = "${WORKDIR}/libxslt-${PV}"
-
-inherit autotools pkgconfig binconfig lib_package
-
-# We don't DEPEND on binutils for ansidecl.h so ensure we don't use the header
-do_configure_prepend () {
-	sed -i -e 's/ansidecl.h//' ${S}/configure.in
-}
-
-EXTRA_OECONF = "--without-python --without-debug --without-mem-debug --without-crypto"
-# older versions of this recipe had ${PN}-utils
-RPROVIDES_${PN}-bin += "${PN}-utils"
-RCONFLICTS_${PN}-bin += "${PN}-utils"
-RREPLACES_${PN}-bin += "${PN}-utils"
-
-FILES_${PN} += "${libdir}/libxslt-plugins"
-FILES_${PN}-dev += "${libdir}/xsltConf.sh"
-
-BBCLASSEXTEND = "native"
diff --git a/meta/recipes-support/libxslt/libxslt_1.1.27.bb b/meta/recipes-support/libxslt/libxslt_1.1.27.bb
new file mode 100644
index 0000000000..925c8608c5
--- /dev/null
+++ b/meta/recipes-support/libxslt/libxslt_1.1.27.bb
@@ -0,0 +1,35 @@
+DESCRIPTION = "GNOME XSLT library"
+HOMEPAGE = "http://xmlsoft.org/XSLT/"
+BUGTRACKER = "https://bugzilla.gnome.org/"
+
+LICENSE = "MIT"
+LIC_FILES_CHKSUM = "file://Copyright;md5=0cd9a07afbeb24026c9b03aecfeba458"
+
+SECTION = "libs"
+DEPENDS = "libxml2"
+PR = "r0"
+
+SRC_URI = "ftp://xmlsoft.org/libxslt//libxslt-${PV}.tar.gz \
+           file://pkgconfig_fix.patch"
+
+SRC_URI[md5sum] = "4d01ff464b9ea7236925a1adf147c7f8"
+SRC_URI[sha256sum] = "b6a8d9a421f2630999ca91d9f8c091ee8ea2d580e6be84c1d21b2a45e11e7e26"
+S = "${WORKDIR}/libxslt-${PV}"
+
+inherit autotools pkgconfig binconfig lib_package
+
+# We don't DEPEND on binutils for ansidecl.h so ensure we don't use the header
+do_configure_prepend () {
+	sed -i -e 's/ansidecl.h//' ${S}/configure.in
+}
+
+EXTRA_OECONF = "--without-python --without-debug --without-mem-debug --without-crypto"
+# older versions of this recipe had ${PN}-utils
+RPROVIDES_${PN}-bin += "${PN}-utils"
+RCONFLICTS_${PN}-bin += "${PN}-utils"
+RREPLACES_${PN}-bin += "${PN}-utils"
+
+FILES_${PN} += "${libdir}/libxslt-plugins"
+FILES_${PN}-dev += "${libdir}/xsltConf.sh"
+
+BBCLASSEXTEND = "native"
-- 
cgit 1.2.3-korg