[arch-commits] Commit in pyxml/trunk (PKGBUILD foreigncharsfix.patch)

[Ray Rashif]

    Date: Saturday, November 6, 2010 @ 10:25:36
  Author: schiv
Revision: 98285

upgpkg: pyxml 0.8.4-8
fixed for eric 4.4.9

Added:
  pyxml/trunk/foreigncharsfix.patch
Modified:
  pyxml/trunk/PKGBUILD

-----------------------+
 PKGBUILD              |   27 +++++++++++++++++++--------
 foreigncharsfix.patch |   11 +++++++++++
 2 files changed, 30 insertions(+), 8 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2010-11-06 14:24:39 UTC (rev 98284)
+++ PKGBUILD	2010-11-06 14:25:36 UTC (rev 98285)
@@ -1,21 +1,30 @@
 # $Id$
-# Maintainer: Jan de Groot <jgc at archlinux.org>
+# Maintainer:
+# Contributor: Jan de Groot <jgc at archlinux.org>
 
 pkgname=pyxml
 pkgver=0.8.4
-pkgrel=7
-pkgdesc="Python XML parsing library."
-arch=(i686 x86_64)
-url="http://pyxml.sourceforge.net/"
+pkgrel=8
+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)
-md5sums=('1f7655050cebbb664db976405fdba209' '4b652e0c866e3cca7e2386e8e383d5ba')
+        fix-python2.6.patch
+        foreigncharsfix.patch)
+md5sums=('1f7655050cebbb664db976405fdba209'
+         '4b652e0c866e3cca7e2386e8e383d5ba'
+         'c9c54fdf0f7d1515a3b7aa34b01d1c46')
 
-build() {
+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
   python2 setup.py install --prefix=/usr --root="${pkgdir}" --optimize=1
   install -D -m644 LICENCE "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
@@ -25,3 +34,5 @@
   sed -e 's|#!/usr/bin/env python|#!/usr/bin/env python2|' \
       -i ${pkgdir}/usr/lib/python2.7/site-packages/_xmlplus/dom/html/GenerateHtml.py
 }
+
+# vim:set ts=2 sw=2 et:

Added: foreigncharsfix.patch
===================================================================
--- foreigncharsfix.patch	                        (rev 0)
+++ foreigncharsfix.patch	2010-11-06 14:25:36 UTC (rev 98285)
@@ -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