Date: Sunday, October 25, 2015 @ 20:18:35 Author: bpiotrowski Revision: 144973
upgpkg: python-prettytable 0.7.2-7 Add patch to fix column spacing after fiddling with terminal colors. Added: python-prettytable/trunk/0001-Fix-column-spacing-with-xterm-reset-escape-sequence.patch Modified: python-prettytable/trunk/PKGBUILD ----------------------------------------------------------------+ 0001-Fix-column-spacing-with-xterm-reset-escape-sequence.patch | 30 ++++++++++ PKGBUILD | 21 ++++--- 2 files changed, 43 insertions(+), 8 deletions(-) Added: 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 2015-10-25 19:18:35 UTC (rev 144973) @@ -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 + Modified: PKGBUILD =================================================================== --- PKGBUILD 2015-10-25 19:11:55 UTC (rev 144972) +++ PKGBUILD 2015-10-25 19:18:35 UTC (rev 144973) @@ -3,22 +3,27 @@ # Contributor: Sebastien Leduc <sebast...@sleduc.fr> # Contributor: Emmanuel Gil Peyrot <linkma...@linkmauve.fr> -pkgbase=python-prettytable _pkgname=prettytable -pkgname=( python-prettytable python2-prettytable) +pkgname=(python-prettytable python2-prettytable) pkgver=0.7.2 -pkgrel=6 -pkgdesc="A simple Python library for easily displaying tabular data in a visually appealing ASCII table format" +pkgrel=7 +pkgdesc="A simple Python library for easily displaying tabular data" url="http://pypi.python.org/pypi/PrettyTable" arch=('any') license=('BSD') makedepends=('python2-setuptools' python-setuptools) -source=("http://pypi.python.org/packages/source/P/PrettyTable/prettytable-${pkgver}.tar.gz") -md5sums=('a6b80afeef286ce66733d54a0296b13b') +source=("http://pypi.python.org/packages/source/P/PrettyTable/prettytable-${pkgver}.tar.gz" + '0001-Fix-column-spacing-with-xterm-reset-escape-sequence.patch') +md5sums=('a6b80afeef286ce66733d54a0296b13b' + '62c2acf4a81ba9e6ac60ba06ff282068') prepare() { - cp -a $srcdir/$_pkgname-$pkgver $srcdir/$_pkgname-$pkgver-2 - find $_pkgname-$pkgver-2 -name \*.py -exec sed -i '1s/python$/&2/' {} + + 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() {