diff options
| -rw-r--r-- | meta/packages/libxslt/libxslt/doublefix.patch | 17 | ||||
| -rw-r--r-- | meta/packages/libxslt/libxslt_1.1.26.bb (renamed from meta/packages/libxslt/libxslt_1.1.22.bb) | 8 |
2 files changed, 4 insertions, 21 deletions
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 @@ | |||
| 1 | This double definition breaks recent autoconf+automake. | ||
| 2 | |||
| 3 | RP 1/2/10 | ||
| 4 | |||
| 5 | Index: libxslt-1.1.22/libexslt/Makefile.am | ||
| 6 | =================================================================== | ||
| 7 | --- libxslt-1.1.22.orig/libexslt/Makefile.am 2010-02-01 10:55:59.337788365 +0000 | ||
| 8 | +++ libxslt-1.1.22/libexslt/Makefile.am 2010-02-01 10:56:08.239068767 +0000 | ||
| 9 | @@ -11,8 +11,6 @@ | ||
| 10 | exsltinc_HEADERS = \ | ||
| 11 | exslt.h \ | ||
| 12 | exsltconfig.h \ | ||
| 13 | - exslt.h \ | ||
| 14 | - exsltconfig.h \ | ||
| 15 | exsltexports.h | ||
| 16 | |||
| 17 | libexslt_la_SOURCES = \ | ||
diff --git a/meta/packages/libxslt/libxslt_1.1.22.bb b/meta/packages/libxslt/libxslt_1.1.26.bb index ce6cca7f78..b5726974f1 100644 --- a/meta/packages/libxslt/libxslt_1.1.22.bb +++ b/meta/packages/libxslt/libxslt_1.1.26.bb | |||
| @@ -3,15 +3,15 @@ HOMEPAGE = "http://xmlsoft.org/XSLT/" | |||
| 3 | BUGTRACKER = "https://bugzilla.gnome.org/" | 3 | BUGTRACKER = "https://bugzilla.gnome.org/" |
| 4 | 4 | ||
| 5 | LICENSE = "MIT" | 5 | LICENSE = "MIT" |
| 6 | LIC_FILES_CHKSUM = "file://COPYING;md5=0cd9a07afbeb24026c9b03aecfeba458" | ||
| 6 | 7 | ||
| 7 | SECTION = "libs" | 8 | SECTION = "libs" |
| 8 | PRIORITY = "optional" | 9 | PRIORITY = "optional" |
| 9 | DEPENDS = "libxml2 (>=2.6.27)" | 10 | DEPENDS = "libxml2 (>=2.6.27)" |
| 10 | PR = "r3" | 11 | PR = "r0" |
| 11 | 12 | ||
| 12 | SRC_URI = "ftp://xmlsoft.org/libxml2/libxslt-${PV}.tar.gz \ | 13 | SRC_URI = "ftp://xmlsoft.org/libxslt//libxslt-${PV}.tar.gz \ |
| 13 | file://pkgconfig_fix.patch;patch=1 \ | 14 | file://pkgconfig_fix.patch;patch=1" |
| 14 | file://doublefix.patch;patch=1" | ||
| 15 | S = "${WORKDIR}/libxslt-${PV}" | 15 | S = "${WORKDIR}/libxslt-${PV}" |
| 16 | 16 | ||
| 17 | inherit autotools pkgconfig | 17 | inherit autotools pkgconfig |
