Date: Friday, September 1, 2017 @ 13:50:20 Author: jgc Revision: 304425
upgpkg: libxml2 2.9.5rc2+0+g69936b12-1 Update to git master, includes final fix for FS#54828 Modified: libxml2/trunk/PKGBUILD Deleted: libxml2/trunk/bug786267.patch -----------------+ PKGBUILD | 17 +++++------------ bug786267.patch | 15 --------------- 2 files changed, 5 insertions(+), 27 deletions(-) Modified: PKGBUILD =================================================================== --- PKGBUILD 2017-09-01 06:02:18 UTC (rev 304424) +++ PKGBUILD 2017-09-01 13:50:20 UTC (rev 304425) @@ -4,7 +4,7 @@ # Contributor: John Proctor <[email protected]> pkgname=libxml2 -pkgver=2.9.4+99+g27f310d4 +pkgver=2.9.5rc2+0+g69936b12 pkgrel=1 pkgdesc="XML parsing library, version 2" arch=(i686 x86_64) @@ -13,19 +13,17 @@ options=(!makeflags) makedepends=('python2' 'python' 'git') url="http://www.xmlsoft.org/"; -_commit=27f310d453b7e2e71847e5910a0961753aacdbd1 # master +_commit=69936b129fedcda3514fee1a0d6b39521923cbac # tags/v2.9.5-rc2^0 source=(git+https://git.gnome.org/browse/libxml2#commit=$_commit https://www.w3.org/XML/Test/xmlts20080827.tar.gz - libxml2-2.9.4-remove-pyverify_fd.patch - bug786267.patch) + libxml2-2.9.4-remove-pyverify_fd.patch) sha256sums=('SKIP' '96151685cec997e1f9f3387e3626d61e6284d4d6e66e0e440c209286c03e9cc7' - 'c9cebff010bd99c5453847e87b9fa8fdd7f744f415bf680b3650877789460ca9' - 'aca462fd71cec83cc8a98ccfc4065ab68167aab2a148cf7db39596a20f4a7ca7') + 'c9cebff010bd99c5453847e87b9fa8fdd7f744f415bf680b3650877789460ca9') pkgver() { cd $pkgname - git describe --long | sed -e 's/-/+/g' -e 's/^v//' + git describe --long | sed -e 's/-rc/rc/' -e 's/-/+/g' -e 's/^v//' } prepare() { @@ -34,11 +32,6 @@ mv xmlconf build-py2/ cd $pkgname - # https://bugs.archlinux.org/task/54828 - git revert -n 79c8a6b10593c709fd3ceea9deef35c1a3da70f0 - # https://bugs.archlinux.org/task/55134 - patch -Np1 -i ../bug786267.patch - patch -Np1 -i ../libxml2-2.9.4-remove-pyverify_fd.patch NOCONFIGURE=1 ./autogen.sh } Deleted: bug786267.patch =================================================================== --- bug786267.patch 2017-09-01 06:02:18 UTC (rev 304424) +++ bug786267.patch 2017-09-01 13:50:20 UTC (rev 304425) @@ -1,15 +0,0 @@ ---- a/parserInternals.c -+++ a/parserInternals.c -@@ -1235,7 +1235,11 @@ xmlSwitchInputEncodingInt(xmlParserCtxtPtr ctxt, xmlParserInputPtr input, - input->buf->rawconsumed += use - xmlBufUse(input->buf->raw); - } - return (0); -- } else { -+ } else if (input->length == 0) { -+ /* -+ * When parsing a static memory array one must know the -+ * size to be able to convert the buffer. -+ */ - xmlErrInternal(ctxt, "switching encoding : no input\n", NULL); - return (-1); - }
