# HG changeset patch # User Christopher Rogers # Date 1304398402 0 # Node ID 1f1bb923a1995f378e8ca275639afb8d338859f7 # Parent 46940aa15a05d280df491f6d9c93af0e3dc79402 Fixed python-pyxml. The sed way had a error unmatch /. So i'm using the real patch from archlinux. diff -r 46940aa15a05 -r 1f1bb923a199 python-pyxml/receipt --- a/python-pyxml/receipt Tue May 03 10:09:20 2011 +0200 +++ b/python-pyxml/receipt Tue May 03 04:53:22 2011 +0000 @@ -10,27 +10,25 @@ WEB_SITE="http://pyxml.sourceforge.net/" WGET_URL="$SF_MIRROR/pyxml/$TARBALL" DEPENDS="python" -BUILD_DEPENDS="python" # Rules to configure and make the package. compile_rules() { cd $src + patch -Np1 -i $stuff/fix-python2.6.patch python setup.py build --with-xslt - python setup.py install --root=$PWD/_pkg + python setup.py install --root=$DESTDIR } # Rules to gen a SliTaz package suitable for Tazpkg. genpkg_rules() { cp -a $_pkg/usr $fs - # Apply https://bugs.archlinux.org/task/14782 fix - sed -i 's/as /asp /;s/as,/asp,' \ - $fs/usr/lib/python*/site-packages/_xmlplus/xpath/ParsedAbbreviated* } # Remove old package. post_install() { + [ -d $1/var/lib/tazpkg/installed/pyxml ] && rm -rf $1/var/lib/tazpkg/installed/pyxml } \ No newline at end of file diff -r 46940aa15a05 -r 1f1bb923a199 python-pyxml/stuff/fix-python2.6.patch --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/python-pyxml/stuff/fix-python2.6.patch Tue May 03 04:53:22 2011 +0000 @@ -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 = []