Date: Thursday, February 13, 2020 @ 17:28:41 Author: jelle Revision: 570658
archrelease: copy trunk to community-any Added: python-prettytable/repos/community-any/0001-Fix-column-spacing-with-xterm-reset-escape-sequence.patch (from rev 570657, python-prettytable/trunk/0001-Fix-column-spacing-with-xterm-reset-escape-sequence.patch) python-prettytable/repos/community-any/PKGBUILD (from rev 570657, python-prettytable/trunk/PKGBUILD) Deleted: python-prettytable/repos/community-any/0001-Fix-column-spacing-with-xterm-reset-escape-sequence.patch python-prettytable/repos/community-any/PKGBUILD ----------------------------------------------------------------+ 0001-Fix-column-spacing-with-xterm-reset-escape-sequence.patch | 60 +++---- PKGBUILD | 81 ++++------ 2 files changed, 65 insertions(+), 76 deletions(-) Deleted: 0001-Fix-column-spacing-with-xterm-reset-escape-sequence.patch =================================================================== --- 0001-Fix-column-spacing-with-xterm-reset-escape-sequence.patch 2020-02-13 17:28:33 UTC (rev 570657) +++ 0001-Fix-column-spacing-with-xterm-reset-escape-sequence.patch 2020-02-13 17:28:41 UTC (rev 570658) @@ -1,30 +0,0 @@ -From 9e291735c8e89879451c2feebda8f851dfa6e32c Mon Sep 17 00:00:00 2001 -From: Daniel Albers <dan...@lbe.rs> -Date: Tue, 9 Dec 2014 17:47:50 +0100 -Subject: [PATCH] Fix column spacing with xterm reset escape sequence - -Change _re to also match \E(B\E[m as defined by terminfo for xterm: - -$ TERM=xterm tput sgr0 | od -xa -0000000 281b 1b42 6d5b - esc ( B esc [ m ---- - prettytable.py | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/prettytable.py b/prettytable.py -index a619659..3f6fb99 100644 ---- a/prettytable.py -+++ b/prettytable.py -@@ -73,7 +73,7 @@ MSWORD_FRIENDLY = 11 - PLAIN_COLUMNS = 12 - RANDOM = 20 - --_re = re.compile("\033\[[0-9;]*m") -+_re = re.compile("\033(\[[0-9;]*m|\(B)") - - def _get_size(text): - lines = text.split("\n") --- -2.2.0.rc0.207.ga3a616c - Copied: python-prettytable/repos/community-any/0001-Fix-column-spacing-with-xterm-reset-escape-sequence.patch (from rev 570657, python-prettytable/trunk/0001-Fix-column-spacing-with-xterm-reset-escape-sequence.patch) =================================================================== --- 0001-Fix-column-spacing-with-xterm-reset-escape-sequence.patch (rev 0) +++ 0001-Fix-column-spacing-with-xterm-reset-escape-sequence.patch 2020-02-13 17:28:41 UTC (rev 570658) @@ -0,0 +1,30 @@ +From 9e291735c8e89879451c2feebda8f851dfa6e32c Mon Sep 17 00:00:00 2001 +From: Daniel Albers <dan...@lbe.rs> +Date: Tue, 9 Dec 2014 17:47:50 +0100 +Subject: [PATCH] Fix column spacing with xterm reset escape sequence + +Change _re to also match \E(B\E[m as defined by terminfo for xterm: + +$ TERM=xterm tput sgr0 | od -xa +0000000 281b 1b42 6d5b + esc ( B esc [ m +--- + prettytable.py | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/prettytable.py b/prettytable.py +index a619659..3f6fb99 100644 +--- a/prettytable.py ++++ b/prettytable.py +@@ -73,7 +73,7 @@ MSWORD_FRIENDLY = 11 + PLAIN_COLUMNS = 12 + RANDOM = 20 + +-_re = re.compile("\033\[[0-9;]*m") ++_re = re.compile("\033(\[[0-9;]*m|\(B)") + + def _get_size(text): + lines = text.split("\n") +-- +2.2.0.rc0.207.ga3a616c + Deleted: PKGBUILD =================================================================== --- PKGBUILD 2020-02-13 17:28:33 UTC (rev 570657) +++ PKGBUILD 2020-02-13 17:28:41 UTC (rev 570658) @@ -1,46 +0,0 @@ -# Maintainer: Daniel Wallace <danielwallace at gtmanfred dot com> -# Contributor: Sebastien Leduc <sebast...@sleduc.fr> -# Contributor: Emmanuel Gil Peyrot <linkma...@linkmauve.fr> - -_pkgname=prettytable -pkgname=(python-prettytable python2-prettytable) -pkgver=0.7.2 -pkgrel=11 -pkgdesc="A simple Python library for easily displaying tabular data" -url="https://pypi.python.org/pypi/PrettyTable" -arch=('any') -license=('BSD') -makedepends=('python2-setuptools' python-setuptools) -source=("https://files.pythonhosted.org/packages/source/P/PrettyTable/prettytable-${pkgver}.tar.gz" - '0001-Fix-column-spacing-with-xterm-reset-escape-sequence.patch') -md5sums=('a6b80afeef286ce66733d54a0296b13b' - '62c2acf4a81ba9e6ac60ba06ff282068') - -prepare() { - pushd $_pkgname-$pkgver - patch -p1 -i "$srcdir"/0001-Fix-column-spacing-with-xterm-reset-escape-sequence.patch - popd - - cp -a "$srcdir"/$_pkgname-$pkgver "$srcdir"/$_pkgname-$pkgver-2 - find $_pkgname-$pkgver-2 -name \*.py -exec sed -i '1s/python$/&2/' {} + -} - -build() { - cd "$srcdir/$_pkgname-$pkgver" - python setup.py build - cd "$srcdir"/$_pkgname-$pkgver-2 - python2 setup.py build -} - -package_python-prettytable() { - cd "$srcdir/$_pkgname-$pkgver" - chmod 644 -R prettytable.egg-info - depends=(python) - python setup.py install --root="$pkgdir/" -} -package_python2-prettytable() { - cd "$srcdir/$_pkgname-$pkgver-2" - chmod 644 -R prettytable.egg-info - depends=(python2) - python2 setup.py install --root="$pkgdir/" -} Copied: python-prettytable/repos/community-any/PKGBUILD (from rev 570657, python-prettytable/trunk/PKGBUILD) =================================================================== --- PKGBUILD (rev 0) +++ PKGBUILD 2020-02-13 17:28:41 UTC (rev 570658) @@ -0,0 +1,35 @@ +# Maintainer: Daniel Wallace <danielwallace at gtmanfred dot com> +# Contributor: Sebastien Leduc <sebast...@sleduc.fr> +# Contributor: Emmanuel Gil Peyrot <linkma...@linkmauve.fr> + +_pkgname=prettytable +pkgname=python-prettytable +pkgver=0.7.2 +pkgrel=12 +pkgdesc="A simple Python library for easily displaying tabular data" +url="https://pypi.python.org/pypi/PrettyTable" +arch=('any') +license=('BSD') +depends=(python) +makedepends=(python-setuptools) +source=("https://files.pythonhosted.org/packages/source/P/PrettyTable/prettytable-${pkgver}.tar.gz" + '0001-Fix-column-spacing-with-xterm-reset-escape-sequence.patch') +md5sums=('a6b80afeef286ce66733d54a0296b13b' + '62c2acf4a81ba9e6ac60ba06ff282068') + +prepare() { + pushd $_pkgname-$pkgver + patch -p1 -i "$srcdir"/0001-Fix-column-spacing-with-xterm-reset-escape-sequence.patch + popd +} + +build() { + cd "$_pkgname-$pkgver" + python setup.py build +} + +package() { + cd "$_pkgname-$pkgver" + chmod 644 -R prettytable.egg-info + python setup.py install --root="$pkgdir/" +}