wok-6.x rev 9674

Fixed python-pyxml. The sed way had a error unmatch /. So i'm using the real patch from archlinux.
author Christopher Rogers <slaxemulator@gmail.com>
date Tue May 03 04:53:22 2011 +0000 (2011-05-03)
parents 46940aa15a05
children a55dc7180253
files python-pyxml/receipt python-pyxml/stuff/fix-python2.6.patch
line diff
     1.1 --- a/python-pyxml/receipt	Tue May 03 10:09:20 2011 +0200
     1.2 +++ b/python-pyxml/receipt	Tue May 03 04:53:22 2011 +0000
     1.3 @@ -10,27 +10,25 @@
     1.4  WEB_SITE="http://pyxml.sourceforge.net/"
     1.5  WGET_URL="$SF_MIRROR/pyxml/$TARBALL"
     1.6  DEPENDS="python"
     1.7 -BUILD_DEPENDS="python"
     1.8  
     1.9  # Rules to configure and make the package.
    1.10  compile_rules()
    1.11  {
    1.12  	cd $src
    1.13 +	patch -Np1 -i $stuff/fix-python2.6.patch
    1.14  	python setup.py build --with-xslt
    1.15 -	python setup.py install --root=$PWD/_pkg
    1.16 +	python setup.py install --root=$DESTDIR
    1.17  }
    1.18  
    1.19  # Rules to gen a SliTaz package suitable for Tazpkg.
    1.20  genpkg_rules()
    1.21  {
    1.22  	cp -a $_pkg/usr $fs
    1.23 -	# Apply https://bugs.archlinux.org/task/14782 fix
    1.24 -	sed -i 's/as /asp /;s/as,/asp,' \
    1.25 -	  $fs/usr/lib/python*/site-packages/_xmlplus/xpath/ParsedAbbreviated*
    1.26  }
    1.27  
    1.28  # Remove old package.
    1.29  post_install()
    1.30  {
    1.31 +	[ -d $1/var/lib/tazpkg/installed/pyxml ] &&
    1.32  	rm -rf $1/var/lib/tazpkg/installed/pyxml
    1.33  }
    1.34 \ No newline at end of file
     2.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
     2.2 +++ b/python-pyxml/stuff/fix-python2.6.patch	Tue May 03 04:53:22 2011 +0000
     2.3 @@ -0,0 +1,28 @@
     2.4 +diff -ur a/xml/xpath/ParsedAbbreviatedAbsoluteLocationPath.py b/xml/xpath/ParsedAbbreviatedAbsoluteLocationPath.py
     2.5 +--- a/xml/xpath/ParsedAbbreviatedAbsoluteLocationPath.py	2003-03-11 15:01:34.000000000 +0100
     2.6 ++++ b/xml/xpath/ParsedAbbreviatedAbsoluteLocationPath.py	2009-05-25 16:32:26.000000000 +0200
     2.7 +@@ -24,8 +24,8 @@
     2.8 +         self._rel = rel
     2.9 +         nt = ParsedNodeTest.ParsedNodeTest('node', '')
    2.10 +         ppl = ParsedPredicateList.ParsedPredicateList([])
    2.11 +-        as = ParsedAxisSpecifier.ParsedAxisSpecifier('descendant-or-self')
    2.12 +-        self._step = ParsedStep.ParsedStep(as, nt, ppl)
    2.13 ++        asp = ParsedAxisSpecifier.ParsedAxisSpecifier('descendant-or-self')
    2.14 ++        self._step = ParsedStep.ParsedStep(asp, nt, ppl)
    2.15 +         return
    2.16 + 
    2.17 +     def evaluate(self, context):
    2.18 +diff -ur a/xml/xpath/ParsedAbbreviatedRelativeLocationPath.py b/xml/xpath/ParsedAbbreviatedRelativeLocationPath.py
    2.19 +--- a/xml/xpath/ParsedAbbreviatedRelativeLocationPath.py	2003-03-11 15:01:34.000000000 +0100
    2.20 ++++ b/xml/xpath/ParsedAbbreviatedRelativeLocationPath.py	2009-05-25 16:27:55.000000000 +0200
    2.21 +@@ -28,8 +28,8 @@
    2.22 +         self._right = right
    2.23 +         nt = ParsedNodeTest.ParsedNodeTest('node','')
    2.24 +         ppl = ParsedPredicateList.ParsedPredicateList([])
    2.25 +-        as = ParsedAxisSpecifier.ParsedAxisSpecifier('descendant-or-self')
    2.26 +-        self._middle = ParsedStep.ParsedStep(as, nt, ppl)
    2.27 ++        asp = ParsedAxisSpecifier.ParsedAxisSpecifier('descendant-or-self')
    2.28 ++        self._middle = ParsedStep.ParsedStep(asp, nt, ppl)
    2.29 + 
    2.30 +     def evaluate(self, context):
    2.31 +         res = []