Date: Saturday, August 30, 2014 @ 01:27:42 Author: seblu Revision: 118081
Move opensc to aur Modified: docutils/trunk/PKGBUILD Deleted: docutils/trunk/01-rst2odt_prepstyles-elementtree.patch opensc/ -----------------------------------------+ 01-rst2odt_prepstyles-elementtree.patch | 68 ------------------------------ PKGBUILD | 12 +---- 2 files changed, 3 insertions(+), 77 deletions(-) Deleted: docutils/trunk/01-rst2odt_prepstyles-elementtree.patch =================================================================== --- docutils/trunk/01-rst2odt_prepstyles-elementtree.patch 2014-08-29 23:24:51 UTC (rev 118080) +++ docutils/trunk/01-rst2odt_prepstyles-elementtree.patch 2014-08-29 23:27:42 UTC (rev 118081) @@ -1,68 +0,0 @@ ---- a/tools/rst2odt_prepstyles.py -+++ b/tools/rst2odt_prepstyles.py -@@ -12,7 +12,15 @@ - # - # Author: Michael Schutte <[email protected]> - --from lxml import etree -+try: -+ from xml.etree import ElementTree as etree -+except ImportError: -+ try: -+ from elementtree import ElementTree as etree -+ except ImportError: -+ raise ImportError('Missing an implementation of ElementTree. ' \ -+ 'Please install either Python >= 2.5 or ElementTree.') -+ - import sys - import zipfile - from tempfile import mkstemp -@@ -27,12 +35,22 @@ - def prepstyle(filename): - - zin = zipfile.ZipFile(filename) -- styles = zin.read("styles.xml") -- -- root = etree.fromstring(styles) -- for el in root.xpath("//style:page-layout-properties", -- namespaces=NAMESPACES): -- for attr in el.attrib: -+ styles = zin.open("styles.xml") -+ -+ root = None -+ # some extra effort to preserve namespace prefixes -+ for event, elem in etree.iterparse(styles, events=("start", "start-ns")): -+ if event == "start-ns": -+ etree.register_namespace(elem[0], elem[1]) -+ elif event == "start": -+ if root is None: -+ root = elem -+ -+ styles.close() -+ -+ for el in root.findall(".//style:page-layout-properties", -+ namespaces=NAMESPACES): -+ for attr in el.attrib.keys(): - if attr.startswith("{%s}" % NAMESPACES["fo"]): - del el.attrib[attr] - -@@ -42,7 +60,7 @@ - - for item in zin.infolist(): - if item.filename == "styles.xml": -- zout.writestr(item, etree.tostring(root)) -+ zout.writestr(item, etree.tostring(root, encoding="UTF-8")) - else: - zout.writestr(item, zin.read(item.filename)) - -@@ -54,8 +72,8 @@ - def main(): - args = sys.argv[1:] - if len(args) != 1: -- print >> sys.stderr, __doc__ -- print >> sys.stderr, "Usage: %s STYLE_FILE.odt\n" % sys.argv[0] -+ sys.stderr.write(__doc__) -+ sys.stderr.write("\nUsage: %s STYLE_FILE.odt\n" % sys.argv[0]) - sys.exit(1) - filename = args[0] - prepstyle(filename) Modified: docutils/trunk/PKGBUILD =================================================================== --- docutils/trunk/PKGBUILD 2014-08-29 23:24:51 UTC (rev 118080) +++ docutils/trunk/PKGBUILD 2014-08-29 23:27:42 UTC (rev 118081) @@ -6,23 +6,17 @@ pkgbase=docutils pkgname=('python-docutils' 'python2-docutils') pkgver=0.12 -pkgrel=1 +pkgrel=2 pkgdesc='Set of tools for processing plaintext docs into formats such as HTML, XML, or LaTeX' arch=('any') url='http://docutils.sourceforge.net' license=('custom') makedepends=('python' 'python2') -source=("http://downloads.sourceforge.net/$pkgbase/$pkgbase-$pkgver.tar.gz"; - '01-rst2odt_prepstyles-elementtree.patch') -md5sums=('4622263b62c5c771c03502afa3157768' - '34952e8a50692b628a8aa2dde3072f07') +source=("http://downloads.sourceforge.net/$pkgbase/$pkgbase-$pkgver.tar.gz";) +md5sums=('4622263b62c5c771c03502afa3157768') build() { cd $pkgbase-$pkgver - for _p in "$srcdir"/*.patch; do - msg2 "${_p##*/}" - patch -p1 -i "$_p" - done msg2 python3 python3 setup.py build --build-lib=build/python find build/python -type f -exec \
