diff --git a/libxml2/PKGBUILD b/libxml2/PKGBUILD index ba8ab5f1..a7496b34 100644 --- a/libxml2/PKGBUILD +++ b/libxml2/PKGBUILD @@ -1,42 +1,68 @@ # Maintainer: Alexey Pavlov pkgname=('libxml2' 'libxml2-devel' 'libxml2-python') -pkgver=2.9.2 -pkgrel=3 +pkgver=2.9.5 +pkgrel=1 pkgdesc="XML parsing library, version 2" arch=(i686 x86_64) license=('MIT') -makedepends=('python2' 'python3' 'libreadline-devel' 'ncurses-devel' 'liblzma-devel' 'zlib-devel') +makedepends=('python2' 'python3' 'icu-devel>=59.1' 'libreadline-devel' 'ncurses-devel' 'liblzma-devel' 'zlib-devel') url="http://www.xmlsoft.org/" source=(http://xmlsoft.org/sources/${pkgname}-${pkgver}.tar.gz https://www.w3.org/XML/Test/xmlts20130923.tar.gz libxml2-2.9.0-do-not-check-crc.patch libxml2-2.7.3-doc-install.patch libxml2-2.8.0_rc1-winnt.patch - libxml2-2.9.1-msys2.patch - libxml2-2.9.2-catalog-revert.patch) -sha256sums=('5178c30b151d044aefb1b08bf54c3003a0ac55c59c866763997529d60770d5bc' + libxml2-2.9.1-msys2.patch) +sha256sums=('4031c1ecee9ce7ba4f313e91ef6284164885cdb69937a123f6a83bb6a72dcd38' '9b61db9f5dbffa545f4b8d78422167083a8568c59bd1129f94138f936cf6fc1f' '5a53d640ebce5a96e35fbdf5f644c37642dfa3345a1dc4fc355728897c19b7e7' 'bff6790eadec6d7b3affd2d3a7385ce7f80cec2cf4abbd2ed83e9cb297a614a9' 'c18b2c15550b3ff4709a85cd18d16368928319b1b7fd8875dc34acd67076b134' - '3eadad15d01594b8b52e561a4ebce3dffe16a42e5ebd211ea50df92a244994ed' - 'ea2bcb58b4b39835c031aa64433c01f885533a33a1e64069633c43dc4ef8be31') + '3eadad15d01594b8b52e561a4ebce3dffe16a42e5ebd211ea50df92a244994ed') PYTHON_SITELIB=/usr/lib/python2.7/site-packages PYTHON_LIB=/usr/lib/python2.7 +# Helper macros to help make tasks easier # +apply_patch_with_msg() { + for _patch in "$@" + do + msg2 "Applying $_patch" + patch -Nbp1 -i "${srcdir}/$_patch" + done +} + +apply_patch_p2_with_msg() { + for _patch in "$@" + do + msg2 "Applying $_patch" + patch -Nbp2 -i "${srcdir}/$_patch" + done +} + +del_file_exists() { + for _fname in "$@" + do + if [ -f $_fname ] || [ -d $_fname ]; then + rm -rf $_fname + fi + done +} +# =========================================== # + + prepare() { cd ${srcdir} + del_file_exists ${pkgname}-${pkgver}/xmlconf mv xmlconf -t ${pkgname}-${pkgver} cd ${pkgname}-${pkgver} - patch -p1 -i ${srcdir}/libxml2-2.9.0-do-not-check-crc.patch - patch -p1 -i ${srcdir}/libxml2-2.7.3-doc-install.patch - patch -p1 -i ${srcdir}/libxml2-2.8.0_rc1-winnt.patch - patch -p1 -i ${srcdir}/libxml2-2.9.1-msys2.patch - patch -p1 -i ${srcdir}/libxml2-2.9.2-catalog-revert.patch + apply_patch_with_msg libxml2-2.9.0-do-not-check-crc.patch \ + libxml2-2.7.3-doc-install.patch \ + libxml2-2.8.0_rc1-winnt.patch \ + libxml2-2.9.1-msys2.patch sed -e 's|/usr/bin/python -u|/usr/bin/python2 -u|g' -e 's|/usr/bin/python$|/usr/bin/python2|g' -i python/tests/*.py @@ -54,6 +80,7 @@ build() { --target=${CHOST} \ --enable-ipv6 \ --with-history \ + --with-icu \ --with-python=/usr/bin/python2 \ --with-html-dir=/usr/share/doc \ --with-html-subdir=libxml2/html @@ -70,7 +97,7 @@ check() { } package_libxml2() { - depends=('coreutils' 'liblzma' 'libreadline' 'ncurses' 'zlib') + depends=('coreutils' 'icu>=59.1' 'liblzma' 'libreadline' 'ncurses' 'zlib') groups=('libraries') install=libxml2.install @@ -86,7 +113,7 @@ package_libxml2-devel() { pkgdesc="Libxml2 headers and libraries" groups=('development') options=('staticlibs') - depends=("libxml2=${pkgver}" 'libreadline-devel' 'ncurses-devel' 'liblzma-devel' 'zlib-devel') + depends=("libxml2=${pkgver}" 'icu-devel>=59.1' 'libreadline-devel' 'ncurses-devel' 'liblzma-devel' 'zlib-devel') mkdir -p ${pkgdir}/usr/{bin,share} cp -f ${srcdir}/dest/usr/bin/*-config ${pkgdir}/usr/bin/ diff --git a/libxml2/libxml2-2.9.2-catalog-revert.patch b/libxml2/libxml2-2.9.2-catalog-revert.patch deleted file mode 100644 index b3de0040..00000000 --- a/libxml2/libxml2-2.9.2-catalog-revert.patch +++ /dev/null @@ -1,31 +0,0 @@ -From 0e6659ec960734b0b01aad196d4bdb4a3800b493 Mon Sep 17 00:00:00 2001 -From: Lubomir Rintel -Date: Thu, 16 Oct 2014 19:10:59 +0200 -Subject: [PATCH] Revert "Missing initialization for the catalog module" - -It's not correct to always load the default catalog. -https://bugzilla.redhat.com/show_bug.cgi?id=1153753 - -This reverts commit 054c716ea1bf001544127a4ab4f4346d1b9947e7. - ---- - parser.c | 3 --- - 1 file changed, 3 deletions(-) - -diff --git a/parser.c b/parser.c -index 1d93967..67c9dfd 100644 ---- a/parser.c -+++ b/parser.c -@@ -14830,9 +14830,6 @@ xmlInitParser(void) { - #ifdef LIBXML_XPATH_ENABLED - xmlXPathInit(); - #endif --#ifdef LIBXML_CATALOG_ENABLED -- xmlInitializeCatalog(); --#endif - xmlParserInitialized = 1; - #ifdef LIBXML_THREAD_ENABLED - } --- -1.9.3 - diff --git a/libxslt/PKGBUILD b/libxslt/PKGBUILD index 0b946648..013042a0 100644 --- a/libxslt/PKGBUILD +++ b/libxslt/PKGBUILD @@ -1,7 +1,7 @@ # Maintainer: Alexey Pavlov pkgname=('libxslt' 'libxslt-devel' 'libxslt-python') -pkgver=1.1.29 +pkgver=1.1.30 pkgrel=1 pkgdesc="XML stylesheet transformation library" arch=('i686' 'x86_64') @@ -12,10 +12,10 @@ checkdepends=('docbook-xml') options=('!libtool') source=(http://xmlsoft.org/sources/${pkgname}-${pkgver}.tar.gz libxslt-1.1.29-msys2.patch - libxslt.m4-libxslt-1.1.29.patch) -sha256sums=('b5976e3857837e7617b29f2249ebb5eeac34e249208d31f1fbf7a6ba7a4090ce' - '8090fbb7ee2f2b355f3218736443876b2c77154f9a916a8da890f7a7dfa09791' - '4f060784bef5c1361a4de9d5a54ce9cb8b9761f431eaeea6a55c767561e78491') + libxslt.m4-libxslt-1.1.26.patch) +sha256sums=('ba65236116de8326d83378b2bd929879fa185195bc530b9d1aba72107910b6b3' + 'b9da65116bb9f3d6a7239a180e30be0817261eec19e1346b3f1890fee356ea4a' + 'c02cd8437064db0921c08e63245c403dad12410d2997715aa7aa36600bfaa895') PYTHON_SITELIB=/usr/lib/python2.7/site-packages PYTHON_LIB=/usr/lib/python2.7 @@ -24,7 +24,7 @@ prepare() { cd "${srcdir}/${pkgname}-${pkgver}" #patch -p1 -i ${srcdir}/libxslt-1.1.28-doc-utf8.patch - patch -p1 -i ${srcdir}/libxslt.m4-libxslt-1.1.29.patch + patch -p1 -i ${srcdir}/libxslt.m4-libxslt-1.1.26.patch patch -p1 -i ${srcdir}/libxslt-1.1.29-msys2.patch autoreconf -fi @@ -48,10 +48,10 @@ build() { make make DESTDIR=${srcdir}/dest install - mv ${srcdir}/dest${PYTHON_SITELIB}/${pkgname/lib/msys-}mod.dll ${srcdir}/dest${PYTHON_SITELIB}/${pkgname}mod.dll +# mv ${srcdir}/dest${PYTHON_SITELIB}/${pkgname/lib/msys-}mod.dll ${srcdir}/dest${PYTHON_SITELIB}/${pkgname}mod.dll sed -i -e "s:${pkgname/lib/msys-}mod:${PN}mod:g" ${srcdir}/dest${PYTHON_SITELIB}/${pkgname}mod.la - mv ${srcdir}/dest/usr/share/doc/${pkgname}-python-${pkgver} ${srcdir}/dest/usr/share/doc/python-${pkgname} +# mv ${srcdir}/dest/usr/share/doc/${pkgname}-python-${pkgver} ${srcdir}/dest/usr/share/doc/python-${pkgname} # rm -f ${srcdir}/dest/usr/lib/python*/site-packages/*.a } @@ -84,7 +84,7 @@ package_libxslt-devel() { rm -rf ${pkgdir}${PYTHON_SITELIB} cp -rf ${srcdir}/dest/usr/share/aclocal ${pkgdir}/usr/share/ cp -rf ${srcdir}/dest/usr/share/doc ${pkgdir}/usr/share/ - rm -rf ${pkgdir}/usr/share/doc/python-libxslt + rm -rf ${pkgdir}/usr/share/doc/libxslt-python-${pkgver} } package_libxslt-python() { @@ -97,5 +97,6 @@ package_libxslt-python() { mkdir -p ${pkgdir}/${PYTHON_SITELIB} mkdir -p ${pkgdir}/usr/share/doc cp -rf ${srcdir}/dest${PYTHON_SITELIB}/* ${pkgdir}${PYTHON_SITELIB}/ - cp -rf ${srcdir}/dest/usr/share/doc/python-libxslt ${pkgdir}/usr/share/doc/ + cp -rf ${srcdir}/dest/usr/share/doc/libxslt-python-${pkgver} ${pkgdir}/usr/share/doc/ + } diff --git a/libxslt/libxslt-1.1.28-msys2.patch b/libxslt/libxslt-1.1.28-msys2.patch new file mode 100644 index 00000000..0f33f5f7 --- /dev/null +++ b/libxslt/libxslt-1.1.28-msys2.patch @@ -0,0 +1,47 @@ +diff -Naur libxslt-1.1.28-orig/config.guess libxslt-1.1.28/config.guess +--- libxslt-1.1.28-orig/config.guess 2008-01-30 20:27:02.000000000 +0000 ++++ libxslt-1.1.28/config.guess 2013-04-29 06:32:13.080710900 +0000 +@@ -781,6 +781,9 @@ + i*:CYGWIN*:*) + echo ${UNAME_MACHINE}-pc-cygwin + exit ;; ++ i*:MSYS*:*) ++ echo ${UNAME_MACHINE}-pc-msys ++ exit ;; + *:MINGW*:*) + echo ${UNAME_MACHINE}-pc-mingw32 + exit ;; +@@ -815,6 +818,9 @@ + amd64:CYGWIN*:*:* | x86_64:CYGWIN*:*:*) + echo x86_64-unknown-cygwin + exit ;; ++ amd64:MSYS*:*:* | x86_64:MSYS*:*:*) ++ echo x86_64-unknown-msys ++ exit ;; + p*:CYGWIN*:*) + echo powerpcle-unknown-cygwin + exit ;; +diff -Naur libxslt-1.1.28-orig/config.sub libxslt-1.1.28/config.sub +--- libxslt-1.1.28-orig/config.sub 2008-01-30 20:27:02.000000000 +0000 ++++ libxslt-1.1.28/config.sub 2013-04-29 06:31:39.627585900 +0000 +@@ -1217,7 +1217,7 @@ + | -ptx* | -coff* | -ecoff* | -winnt* | -domain* | -vsta* \ + | -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \ + | -chorusos* | -chorusrdb* \ +- | -cygwin* | -pe* | -psos* | -moss* | -proelf* | -rtems* \ ++ | -cygwin* | -msys* | -pe* | -psos* | -moss* | -proelf* | -rtems* \ + | -mingw32* | -linux-gnu* | -linux-newlib* | -linux-uclibc* \ + | -uxpv* | -beos* | -mpeix* | -udk* \ + | -interix* | -uwin* | -mks* | -rhapsody* | -darwin* | -opened* \ +diff -Naur libxslt-1.1.28-orig/configure.in libxslt-1.1.28/configure.in +--- libxslt-1.1.28-orig/configure.in 2012-11-21 07:10:58.000000000 +0000 ++++ libxslt-1.1.28/configure.in 2013-04-29 06:36:40.971335900 +0000 +@@ -622,7 +622,7 @@ + WIN32_EXTRA_LIBADD= + WIN32_EXTRA_LDFLAGS= + case "$host" in +- *-*-cygwin*) ++ *-*-cygwin* | *-*-msys*) + WIN32_EXTRA_LDFLAGS="-no-undefined" + ;; + *-*-mingw*) diff --git a/libxslt/libxslt-1.1.29-msys2.patch b/libxslt/libxslt-1.1.29-msys2.patch index 1264e94e..64bf925c 100644 --- a/libxslt/libxslt-1.1.29-msys2.patch +++ b/libxslt/libxslt-1.1.29-msys2.patch @@ -1,17 +1,17 @@ -diff -durN libxslt-1.1.29.orig/config.guess libxslt-1.1.29/config.guess ---- libxslt-1.1.29.orig/config.guess 2017-05-11 20:29:02.515625000 +0800 -+++ libxslt-1.1.29/config.guess 2017-05-11 20:48:19.640625000 +0800 -@@ -821,6 +821,9 @@ +diff -Naur libxslt-1.1.28-orig/config.guess libxslt-1.1.28/config.guess +--- libxslt-1.1.28-orig/config.guess 2008-01-30 20:27:02.000000000 +0000 ++++ libxslt-1.1.28/config.guess 2013-04-29 06:32:13.080710900 +0000 +@@ -781,6 +781,9 @@ i*:CYGWIN*:*) echo ${UNAME_MACHINE}-pc-cygwin exit ;; + i*:MSYS*:*) + echo ${UNAME_MACHINE}-pc-msys + exit ;; - *:MINGW64*:*) - echo ${UNAME_MACHINE}-pc-mingw64 + *:MINGW*:*) + echo ${UNAME_MACHINE}-pc-mingw32 exit ;; -@@ -867,6 +870,9 @@ +@@ -815,6 +818,9 @@ amd64:CYGWIN*:*:* | x86_64:CYGWIN*:*:*) echo x86_64-unknown-cygwin exit ;; @@ -21,10 +21,10 @@ diff -durN libxslt-1.1.29.orig/config.guess libxslt-1.1.29/config.guess p*:CYGWIN*:*) echo powerpcle-unknown-cygwin exit ;; -diff -durN libxslt-1.1.29.orig/configure.in libxslt-1.1.29/configure.in ---- libxslt-1.1.29.orig/configure.in 2017-05-11 20:29:03.953125000 +0800 -+++ libxslt-1.1.29/configure.in 2017-05-11 20:50:04.625000000 +0800 -@@ -634,7 +634,7 @@ +diff -Naur libxslt-1.1.28-orig/configure.in libxslt-1.1.28/configure.in +--- libxslt-1.1.28-orig/configure.in 2012-11-21 07:10:58.000000000 +0000 ++++ libxslt-1.1.28/configure.in 2013-04-29 06:36:40.971335900 +0000 +@@ -622,7 +622,7 @@ WIN32_EXTRA_LIBADD= WIN32_EXTRA_LDFLAGS= case "$host" in diff --git a/libxslt/libxslt.m4-libxslt-1.1.29.patch b/libxslt/libxslt.m4-libxslt-1.1.26.patch similarity index 85% rename from libxslt/libxslt.m4-libxslt-1.1.29.patch rename to libxslt/libxslt.m4-libxslt-1.1.26.patch index ad2a4215..d6aaae4e 100644 --- a/libxslt/libxslt.m4-libxslt-1.1.29.patch +++ b/libxslt/libxslt.m4-libxslt-1.1.26.patch @@ -1,6 +1,6 @@ -diff -durN libxslt-1.1.29.orig/libxslt.m4 libxslt-1.1.29/libxslt.m4 ---- libxslt-1.1.29.orig/libxslt.m4 2009-05-12 14:29:34.000000000 +0800 -+++ libxslt-1.1.29/libxslt.m4 2017-05-11 20:32:00.968750000 +0800 +diff -ur libxslt-1.1.26.orig/libxslt.m4 libxslt-1.1.26/libxslt.m4 +--- libxslt-1.1.26.orig/libxslt.m4 2009-05-12 09:29:34.000000000 +0300 ++++ libxslt-1.1.26/libxslt.m4 2009-10-07 17:03:04.000000000 +0300 @@ -52,8 +52,10 @@ sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\3/'` if test "x$enable_xslttest" = "xyes" ; then