Date: Sunday, August 19, 2012 @ 13:09:13 Author: jgc Revision: 165447
archrelease: copy trunk to extra-i686, extra-x86_64 Added: pyxml/repos/extra-i686/PKGBUILD (from rev 165446, pyxml/trunk/PKGBUILD) pyxml/repos/extra-i686/fix-python2.6.patch (from rev 165446, pyxml/trunk/fix-python2.6.patch) pyxml/repos/extra-i686/foreigncharsfix.patch (from rev 165446, pyxml/trunk/foreigncharsfix.patch) pyxml/repos/extra-x86_64/PKGBUILD (from rev 165446, pyxml/trunk/PKGBUILD) pyxml/repos/extra-x86_64/fix-python2.6.patch (from rev 165446, pyxml/trunk/fix-python2.6.patch) pyxml/repos/extra-x86_64/foreigncharsfix.patch (from rev 165446, pyxml/trunk/foreigncharsfix.patch) Deleted: pyxml/repos/extra-i686/PKGBUILD pyxml/repos/extra-i686/fix-python2.6.patch pyxml/repos/extra-i686/foreigncharsfix.patch pyxml/repos/extra-x86_64/PKGBUILD pyxml/repos/extra-x86_64/fix-python2.6.patch pyxml/repos/extra-x86_64/foreigncharsfix.patch ------------------------------------+ extra-i686/PKGBUILD | 80 +++++++++++++++++------------------ extra-i686/fix-python2.6.patch | 56 ++++++++++++------------ extra-i686/foreigncharsfix.patch | 22 ++++----- extra-x86_64/PKGBUILD | 80 +++++++++++++++++------------------ extra-x86_64/fix-python2.6.patch | 56 ++++++++++++------------ extra-x86_64/foreigncharsfix.patch | 22 ++++----- 6 files changed, 158 insertions(+), 158 deletions(-) Deleted: extra-i686/PKGBUILD =================================================================== --- extra-i686/PKGBUILD 2012-08-19 17:05:09 UTC (rev 165446) +++ extra-i686/PKGBUILD 2012-08-19 17:09:13 UTC (rev 165447) @@ -1,40 +0,0 @@ -# $Id$ -# Maintainer: -# Contributor: Jan de Groot <j...@archlinux.org> - -pkgname=pyxml -pkgver=0.8.4 -pkgrel=9 -pkgdesc="Python XML parsing library" -arch=('i686' 'x86_64') -url="http://sourceforge.net/projects/pyxml/" -license=('custom') -depends=('python2') -source=("http://downloads.sourceforge.net/sourceforge/pyxml/PyXML-${pkgver}.tar.gz" - 'fix-python2.6.patch' - 'foreigncharsfix.patch') -md5sums=('1f7655050cebbb664db976405fdba209' - '4b652e0c866e3cca7e2386e8e383d5ba' - 'c9c54fdf0f7d1515a3b7aa34b01d1c46') - -package() { - cd "${srcdir}/PyXML-${pkgver}" - - patch -Np1 -i "${srcdir}/fix-python2.6.patch" - - # as warranted by eric (the python IDE) - patch -Np1 -i "${srcdir}/foreigncharsfix.patch" - - python2 setup.py build -} - -package() { - cd "${srcdir}/PyXML-${pkgver}" - python2 setup.py install --prefix=/usr --root="${pkgdir}" --optimize=1 - install -D -m644 LICENCE "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE" - - sed -e 's|#! /usr/bin/env python|#!/usr/bin/env python2|' \ - -i ${pkgdir}/usr/lib/python2.7/site-packages/_xmlplus/dom/ext/c14n.py - sed -e 's|#!/usr/bin/env python|#!/usr/bin/env python2|' \ - -i ${pkgdir}/usr/lib/python2.7/site-packages/_xmlplus/dom/html/GenerateHtml.py -} Copied: pyxml/repos/extra-i686/PKGBUILD (from rev 165446, pyxml/trunk/PKGBUILD) =================================================================== --- extra-i686/PKGBUILD (rev 0) +++ extra-i686/PKGBUILD 2012-08-19 17:09:13 UTC (rev 165447) @@ -0,0 +1,40 @@ +# $Id$ +# Maintainer: +# Contributor: Jan de Groot <j...@archlinux.org> + +pkgname=pyxml +pkgver=0.8.4 +pkgrel=10 +pkgdesc="Python XML parsing library" +arch=('i686' 'x86_64') +url="http://sourceforge.net/projects/pyxml/" +license=('custom') +depends=('python2') +source=("http://downloads.sourceforge.net/sourceforge/pyxml/PyXML-${pkgver}.tar.gz" + 'fix-python2.6.patch' + 'foreigncharsfix.patch') +md5sums=('1f7655050cebbb664db976405fdba209' + '4b652e0c866e3cca7e2386e8e383d5ba' + 'c9c54fdf0f7d1515a3b7aa34b01d1c46') + +build() { + cd "${srcdir}/PyXML-${pkgver}" + + patch -Np1 -i "${srcdir}/fix-python2.6.patch" + + # as warranted by eric (the python IDE) + patch -Np1 -i "${srcdir}/foreigncharsfix.patch" + + python2 setup.py build +} + +package() { + cd "${srcdir}/PyXML-${pkgver}" + python2 setup.py install --prefix=/usr --root="${pkgdir}" --optimize=1 + install -D -m644 LICENCE "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE" + + sed -e 's|#! /usr/bin/env python|#!/usr/bin/env python2|' \ + -i ${pkgdir}/usr/lib/python2.7/site-packages/_xmlplus/dom/ext/c14n.py + sed -e 's|#!/usr/bin/env python|#!/usr/bin/env python2|' \ + -i ${pkgdir}/usr/lib/python2.7/site-packages/_xmlplus/dom/html/GenerateHtml.py +} Deleted: extra-i686/fix-python2.6.patch =================================================================== --- extra-i686/fix-python2.6.patch 2012-08-19 17:05:09 UTC (rev 165446) +++ extra-i686/fix-python2.6.patch 2012-08-19 17:09:13 UTC (rev 165447) @@ -1,28 +0,0 @@ -diff -ur a/xml/xpath/ParsedAbbreviatedAbsoluteLocationPath.py b/xml/xpath/ParsedAbbreviatedAbsoluteLocationPath.py ---- a/xml/xpath/ParsedAbbreviatedAbsoluteLocationPath.py 2003-03-11 15:01:34.000000000 +0100 -+++ b/xml/xpath/ParsedAbbreviatedAbsoluteLocationPath.py 2009-05-25 16:32:26.000000000 +0200 -@@ -24,8 +24,8 @@ - self._rel = rel - nt = ParsedNodeTest.ParsedNodeTest('node', '') - ppl = ParsedPredicateList.ParsedPredicateList([]) -- as = ParsedAxisSpecifier.ParsedAxisSpecifier('descendant-or-self') -- self._step = ParsedStep.ParsedStep(as, nt, ppl) -+ asp = ParsedAxisSpecifier.ParsedAxisSpecifier('descendant-or-self') -+ self._step = ParsedStep.ParsedStep(asp, nt, ppl) - return - - def evaluate(self, context): -diff -ur a/xml/xpath/ParsedAbbreviatedRelativeLocationPath.py b/xml/xpath/ParsedAbbreviatedRelativeLocationPath.py ---- a/xml/xpath/ParsedAbbreviatedRelativeLocationPath.py 2003-03-11 15:01:34.000000000 +0100 -+++ b/xml/xpath/ParsedAbbreviatedRelativeLocationPath.py 2009-05-25 16:27:55.000000000 +0200 -@@ -28,8 +28,8 @@ - self._right = right - nt = ParsedNodeTest.ParsedNodeTest('node','') - ppl = ParsedPredicateList.ParsedPredicateList([]) -- as = ParsedAxisSpecifier.ParsedAxisSpecifier('descendant-or-self') -- self._middle = ParsedStep.ParsedStep(as, nt, ppl) -+ asp = ParsedAxisSpecifier.ParsedAxisSpecifier('descendant-or-self') -+ self._middle = ParsedStep.ParsedStep(asp, nt, ppl) - - def evaluate(self, context): - res = [] Copied: pyxml/repos/extra-i686/fix-python2.6.patch (from rev 165446, pyxml/trunk/fix-python2.6.patch) =================================================================== --- extra-i686/fix-python2.6.patch (rev 0) +++ extra-i686/fix-python2.6.patch 2012-08-19 17:09:13 UTC (rev 165447) @@ -0,0 +1,28 @@ +diff -ur a/xml/xpath/ParsedAbbreviatedAbsoluteLocationPath.py b/xml/xpath/ParsedAbbreviatedAbsoluteLocationPath.py +--- a/xml/xpath/ParsedAbbreviatedAbsoluteLocationPath.py 2003-03-11 15:01:34.000000000 +0100 ++++ b/xml/xpath/ParsedAbbreviatedAbsoluteLocationPath.py 2009-05-25 16:32:26.000000000 +0200 +@@ -24,8 +24,8 @@ + self._rel = rel + nt = ParsedNodeTest.ParsedNodeTest('node', '') + ppl = ParsedPredicateList.ParsedPredicateList([]) +- as = ParsedAxisSpecifier.ParsedAxisSpecifier('descendant-or-self') +- self._step = ParsedStep.ParsedStep(as, nt, ppl) ++ asp = ParsedAxisSpecifier.ParsedAxisSpecifier('descendant-or-self') ++ self._step = ParsedStep.ParsedStep(asp, nt, ppl) + return + + def evaluate(self, context): +diff -ur a/xml/xpath/ParsedAbbreviatedRelativeLocationPath.py b/xml/xpath/ParsedAbbreviatedRelativeLocationPath.py +--- a/xml/xpath/ParsedAbbreviatedRelativeLocationPath.py 2003-03-11 15:01:34.000000000 +0100 ++++ b/xml/xpath/ParsedAbbreviatedRelativeLocationPath.py 2009-05-25 16:27:55.000000000 +0200 +@@ -28,8 +28,8 @@ + self._right = right + nt = ParsedNodeTest.ParsedNodeTest('node','') + ppl = ParsedPredicateList.ParsedPredicateList([]) +- as = ParsedAxisSpecifier.ParsedAxisSpecifier('descendant-or-self') +- self._middle = ParsedStep.ParsedStep(as, nt, ppl) ++ asp = ParsedAxisSpecifier.ParsedAxisSpecifier('descendant-or-self') ++ self._middle = ParsedStep.ParsedStep(asp, nt, ppl) + + def evaluate(self, context): + res = [] Deleted: extra-i686/foreigncharsfix.patch =================================================================== --- extra-i686/foreigncharsfix.patch 2012-08-19 17:05:09 UTC (rev 165446) +++ extra-i686/foreigncharsfix.patch 2012-08-19 17:09:13 UTC (rev 165447) @@ -1,11 +0,0 @@ -diff -aur PyXML-0.8.4.orig//xml/parsers/xmlproc/xmlutils.py PyXML-0.8.4/xml/parsers/xmlproc/xmlutils.py ---- PyXML-0.8.4.orig//xml/parsers/xmlproc/xmlutils.py 2010-11-06 17:27:53.936666669 +0800 -+++ PyXML-0.8.4/xml/parsers/xmlproc/xmlutils.py 2010-11-06 17:30:39.230000003 +0800 -@@ -720,6 +720,7 @@ - # to the recoding. - try: - self.data = self.charset_converter(self.data) -+ self.datasize = len(self.data) - except UnicodeError, e: - self._handle_decoding_error(self.data, e) - self.input_encoding = enc1 Copied: pyxml/repos/extra-i686/foreigncharsfix.patch (from rev 165446, pyxml/trunk/foreigncharsfix.patch) =================================================================== --- extra-i686/foreigncharsfix.patch (rev 0) +++ extra-i686/foreigncharsfix.patch 2012-08-19 17:09:13 UTC (rev 165447) @@ -0,0 +1,11 @@ +diff -aur PyXML-0.8.4.orig//xml/parsers/xmlproc/xmlutils.py PyXML-0.8.4/xml/parsers/xmlproc/xmlutils.py +--- PyXML-0.8.4.orig//xml/parsers/xmlproc/xmlutils.py 2010-11-06 17:27:53.936666669 +0800 ++++ PyXML-0.8.4/xml/parsers/xmlproc/xmlutils.py 2010-11-06 17:30:39.230000003 +0800 +@@ -720,6 +720,7 @@ + # to the recoding. + try: + self.data = self.charset_converter(self.data) ++ self.datasize = len(self.data) + except UnicodeError, e: + self._handle_decoding_error(self.data, e) + self.input_encoding = enc1 Deleted: extra-x86_64/PKGBUILD =================================================================== --- extra-x86_64/PKGBUILD 2012-08-19 17:05:09 UTC (rev 165446) +++ extra-x86_64/PKGBUILD 2012-08-19 17:09:13 UTC (rev 165447) @@ -1,40 +0,0 @@ -# $Id$ -# Maintainer: -# Contributor: Jan de Groot <j...@archlinux.org> - -pkgname=pyxml -pkgver=0.8.4 -pkgrel=9 -pkgdesc="Python XML parsing library" -arch=('i686' 'x86_64') -url="http://sourceforge.net/projects/pyxml/" -license=('custom') -depends=('python2') -source=("http://downloads.sourceforge.net/sourceforge/pyxml/PyXML-${pkgver}.tar.gz" - 'fix-python2.6.patch' - 'foreigncharsfix.patch') -md5sums=('1f7655050cebbb664db976405fdba209' - '4b652e0c866e3cca7e2386e8e383d5ba' - 'c9c54fdf0f7d1515a3b7aa34b01d1c46') - -package() { - cd "${srcdir}/PyXML-${pkgver}" - - patch -Np1 -i "${srcdir}/fix-python2.6.patch" - - # as warranted by eric (the python IDE) - patch -Np1 -i "${srcdir}/foreigncharsfix.patch" - - python2 setup.py build -} - -package() { - cd "${srcdir}/PyXML-${pkgver}" - python2 setup.py install --prefix=/usr --root="${pkgdir}" --optimize=1 - install -D -m644 LICENCE "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE" - - sed -e 's|#! /usr/bin/env python|#!/usr/bin/env python2|' \ - -i ${pkgdir}/usr/lib/python2.7/site-packages/_xmlplus/dom/ext/c14n.py - sed -e 's|#!/usr/bin/env python|#!/usr/bin/env python2|' \ - -i ${pkgdir}/usr/lib/python2.7/site-packages/_xmlplus/dom/html/GenerateHtml.py -} Copied: pyxml/repos/extra-x86_64/PKGBUILD (from rev 165446, pyxml/trunk/PKGBUILD) =================================================================== --- extra-x86_64/PKGBUILD (rev 0) +++ extra-x86_64/PKGBUILD 2012-08-19 17:09:13 UTC (rev 165447) @@ -0,0 +1,40 @@ +# $Id$ +# Maintainer: +# Contributor: Jan de Groot <j...@archlinux.org> + +pkgname=pyxml +pkgver=0.8.4 +pkgrel=10 +pkgdesc="Python XML parsing library" +arch=('i686' 'x86_64') +url="http://sourceforge.net/projects/pyxml/" +license=('custom') +depends=('python2') +source=("http://downloads.sourceforge.net/sourceforge/pyxml/PyXML-${pkgver}.tar.gz" + 'fix-python2.6.patch' + 'foreigncharsfix.patch') +md5sums=('1f7655050cebbb664db976405fdba209' + '4b652e0c866e3cca7e2386e8e383d5ba' + 'c9c54fdf0f7d1515a3b7aa34b01d1c46') + +build() { + cd "${srcdir}/PyXML-${pkgver}" + + patch -Np1 -i "${srcdir}/fix-python2.6.patch" + + # as warranted by eric (the python IDE) + patch -Np1 -i "${srcdir}/foreigncharsfix.patch" + + python2 setup.py build +} + +package() { + cd "${srcdir}/PyXML-${pkgver}" + python2 setup.py install --prefix=/usr --root="${pkgdir}" --optimize=1 + install -D -m644 LICENCE "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE" + + sed -e 's|#! /usr/bin/env python|#!/usr/bin/env python2|' \ + -i ${pkgdir}/usr/lib/python2.7/site-packages/_xmlplus/dom/ext/c14n.py + sed -e 's|#!/usr/bin/env python|#!/usr/bin/env python2|' \ + -i ${pkgdir}/usr/lib/python2.7/site-packages/_xmlplus/dom/html/GenerateHtml.py +} Deleted: extra-x86_64/fix-python2.6.patch =================================================================== --- extra-x86_64/fix-python2.6.patch 2012-08-19 17:05:09 UTC (rev 165446) +++ extra-x86_64/fix-python2.6.patch 2012-08-19 17:09:13 UTC (rev 165447) @@ -1,28 +0,0 @@ -diff -ur a/xml/xpath/ParsedAbbreviatedAbsoluteLocationPath.py b/xml/xpath/ParsedAbbreviatedAbsoluteLocationPath.py ---- a/xml/xpath/ParsedAbbreviatedAbsoluteLocationPath.py 2003-03-11 15:01:34.000000000 +0100 -+++ b/xml/xpath/ParsedAbbreviatedAbsoluteLocationPath.py 2009-05-25 16:32:26.000000000 +0200 -@@ -24,8 +24,8 @@ - self._rel = rel - nt = ParsedNodeTest.ParsedNodeTest('node', '') - ppl = ParsedPredicateList.ParsedPredicateList([]) -- as = ParsedAxisSpecifier.ParsedAxisSpecifier('descendant-or-self') -- self._step = ParsedStep.ParsedStep(as, nt, ppl) -+ asp = ParsedAxisSpecifier.ParsedAxisSpecifier('descendant-or-self') -+ self._step = ParsedStep.ParsedStep(asp, nt, ppl) - return - - def evaluate(self, context): -diff -ur a/xml/xpath/ParsedAbbreviatedRelativeLocationPath.py b/xml/xpath/ParsedAbbreviatedRelativeLocationPath.py ---- a/xml/xpath/ParsedAbbreviatedRelativeLocationPath.py 2003-03-11 15:01:34.000000000 +0100 -+++ b/xml/xpath/ParsedAbbreviatedRelativeLocationPath.py 2009-05-25 16:27:55.000000000 +0200 -@@ -28,8 +28,8 @@ - self._right = right - nt = ParsedNodeTest.ParsedNodeTest('node','') - ppl = ParsedPredicateList.ParsedPredicateList([]) -- as = ParsedAxisSpecifier.ParsedAxisSpecifier('descendant-or-self') -- self._middle = ParsedStep.ParsedStep(as, nt, ppl) -+ asp = ParsedAxisSpecifier.ParsedAxisSpecifier('descendant-or-self') -+ self._middle = ParsedStep.ParsedStep(asp, nt, ppl) - - def evaluate(self, context): - res = [] Copied: pyxml/repos/extra-x86_64/fix-python2.6.patch (from rev 165446, pyxml/trunk/fix-python2.6.patch) =================================================================== --- extra-x86_64/fix-python2.6.patch (rev 0) +++ extra-x86_64/fix-python2.6.patch 2012-08-19 17:09:13 UTC (rev 165447) @@ -0,0 +1,28 @@ +diff -ur a/xml/xpath/ParsedAbbreviatedAbsoluteLocationPath.py b/xml/xpath/ParsedAbbreviatedAbsoluteLocationPath.py +--- a/xml/xpath/ParsedAbbreviatedAbsoluteLocationPath.py 2003-03-11 15:01:34.000000000 +0100 ++++ b/xml/xpath/ParsedAbbreviatedAbsoluteLocationPath.py 2009-05-25 16:32:26.000000000 +0200 +@@ -24,8 +24,8 @@ + self._rel = rel + nt = ParsedNodeTest.ParsedNodeTest('node', '') + ppl = ParsedPredicateList.ParsedPredicateList([]) +- as = ParsedAxisSpecifier.ParsedAxisSpecifier('descendant-or-self') +- self._step = ParsedStep.ParsedStep(as, nt, ppl) ++ asp = ParsedAxisSpecifier.ParsedAxisSpecifier('descendant-or-self') ++ self._step = ParsedStep.ParsedStep(asp, nt, ppl) + return + + def evaluate(self, context): +diff -ur a/xml/xpath/ParsedAbbreviatedRelativeLocationPath.py b/xml/xpath/ParsedAbbreviatedRelativeLocationPath.py +--- a/xml/xpath/ParsedAbbreviatedRelativeLocationPath.py 2003-03-11 15:01:34.000000000 +0100 ++++ b/xml/xpath/ParsedAbbreviatedRelativeLocationPath.py 2009-05-25 16:27:55.000000000 +0200 +@@ -28,8 +28,8 @@ + self._right = right + nt = ParsedNodeTest.ParsedNodeTest('node','') + ppl = ParsedPredicateList.ParsedPredicateList([]) +- as = ParsedAxisSpecifier.ParsedAxisSpecifier('descendant-or-self') +- self._middle = ParsedStep.ParsedStep(as, nt, ppl) ++ asp = ParsedAxisSpecifier.ParsedAxisSpecifier('descendant-or-self') ++ self._middle = ParsedStep.ParsedStep(asp, nt, ppl) + + def evaluate(self, context): + res = [] Deleted: extra-x86_64/foreigncharsfix.patch =================================================================== --- extra-x86_64/foreigncharsfix.patch 2012-08-19 17:05:09 UTC (rev 165446) +++ extra-x86_64/foreigncharsfix.patch 2012-08-19 17:09:13 UTC (rev 165447) @@ -1,11 +0,0 @@ -diff -aur PyXML-0.8.4.orig//xml/parsers/xmlproc/xmlutils.py PyXML-0.8.4/xml/parsers/xmlproc/xmlutils.py ---- PyXML-0.8.4.orig//xml/parsers/xmlproc/xmlutils.py 2010-11-06 17:27:53.936666669 +0800 -+++ PyXML-0.8.4/xml/parsers/xmlproc/xmlutils.py 2010-11-06 17:30:39.230000003 +0800 -@@ -720,6 +720,7 @@ - # to the recoding. - try: - self.data = self.charset_converter(self.data) -+ self.datasize = len(self.data) - except UnicodeError, e: - self._handle_decoding_error(self.data, e) - self.input_encoding = enc1 Copied: pyxml/repos/extra-x86_64/foreigncharsfix.patch (from rev 165446, pyxml/trunk/foreigncharsfix.patch) =================================================================== --- extra-x86_64/foreigncharsfix.patch (rev 0) +++ extra-x86_64/foreigncharsfix.patch 2012-08-19 17:09:13 UTC (rev 165447) @@ -0,0 +1,11 @@ +diff -aur PyXML-0.8.4.orig//xml/parsers/xmlproc/xmlutils.py PyXML-0.8.4/xml/parsers/xmlproc/xmlutils.py +--- PyXML-0.8.4.orig//xml/parsers/xmlproc/xmlutils.py 2010-11-06 17:27:53.936666669 +0800 ++++ PyXML-0.8.4/xml/parsers/xmlproc/xmlutils.py 2010-11-06 17:30:39.230000003 +0800 +@@ -720,6 +720,7 @@ + # to the recoding. + try: + self.data = self.charset_converter(self.data) ++ self.datasize = len(self.data) + except UnicodeError, e: + self._handle_decoding_error(self.data, e) + self.input_encoding = enc1