Date: Monday, February 7, 2022 @ 11:47:10 Author: felixonmars Revision: 1127611
archrelease: copy trunk to community-any Added: python-prettytable/repos/community-any/0001-Fix-column-spacing-with-xterm-reset-escape-sequence.patch (from rev 1127610, python-prettytable/trunk/0001-Fix-column-spacing-with-xterm-reset-escape-sequence.patch) python-prettytable/repos/community-any/PKGBUILD (from rev 1127610, 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 | 86 +++++----- 2 files changed, 73 insertions(+), 73 deletions(-) Deleted: 0001-Fix-column-spacing-with-xterm-reset-escape-sequence.patch =================================================================== --- 0001-Fix-column-spacing-with-xterm-reset-escape-sequence.patch 2022-02-07 11:46:59 UTC (rev 1127610) +++ 0001-Fix-column-spacing-with-xterm-reset-escape-sequence.patch 2022-02-07 11:47:10 UTC (rev 1127611) @@ -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 -@@ -79,7 +79,7 @@ MARKDOWN = 13 - ORGMODE = 14 - RANDOM = 20 - --_re = re.compile(r"\033\[[0-9;]*m") -+_re = re.compile(r"\033(\[[0-9;]*m|\(B)") - - - def _get_size(text): --- -2.2.0.rc0.207.ga3a616c - Copied: python-prettytable/repos/community-any/0001-Fix-column-spacing-with-xterm-reset-escape-sequence.patch (from rev 1127610, 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 2022-02-07 11:47:10 UTC (rev 1127611) @@ -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 +@@ -79,7 +79,7 @@ MARKDOWN = 13 + ORGMODE = 14 + RANDOM = 20 + +-_re = re.compile(r"\033\[[0-9;]*m") ++_re = re.compile(r"\033(\[[0-9;]*m|\(B)") + + + def _get_size(text): +-- +2.2.0.rc0.207.ga3a616c + Deleted: PKGBUILD =================================================================== --- PKGBUILD 2022-02-07 11:46:59 UTC (rev 1127610) +++ PKGBUILD 2022-02-07 11:47:10 UTC (rev 1127611) @@ -1,43 +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 -pkgver=1.0.0 -pkgrel=3 -pkgdesc="A simple Python library for easily displaying tabular data" -url="https://github.com/jazzband/prettytable" -arch=('any') -license=('BSD') -depends=('python-wcwidth') -makedepends=('python-setuptools-scm') -checkdepends=('python-pytest') -source=("https://files.pythonhosted.org/packages/source/p/prettyTable/prettytable-${pkgver}.tar.gz" - '0001-Fix-column-spacing-with-xterm-reset-escape-sequence.patch') -sha512sums=('2b19d46e375fcc6f6f518d335e5d1e14eac854d0545000581496a13df03292a888ed05e7c9952afccc06706fc5258f7beb27c60291b336d586cebe432b784713' - '86cf8be475f62b0dfaa2483a37293cefd61e97bfe3c1226076cacc199da69bc5ea7e561bc311dd1b65f808f4fab202a0d38f702568ab7fbc091f285d2e52c924') - -export SETUPTOOLSA_SCM_PRETEND_VERSION=$pkgver - -prepare() { - pushd prettytable-$pkgver - patch -p1 -i "$srcdir"/0001-Fix-column-spacing-with-xterm-reset-escape-sequence.patch - popd -} - -build() { - cd prettytable-$pkgver - python setup.py build -} - -check() { - cd prettytable-$pkgver - pytest -} - -package() { - cd prettytable-$pkgver - chmod 644 -R prettytable.egg-info - python setup.py install --root="$pkgdir/" -} Copied: python-prettytable/repos/community-any/PKGBUILD (from rev 1127610, python-prettytable/trunk/PKGBUILD) =================================================================== --- PKGBUILD (rev 0) +++ PKGBUILD 2022-02-07 11:47:10 UTC (rev 1127611) @@ -0,0 +1,43 @@ +# 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=1.0.1 +pkgrel=1 +pkgdesc="A simple Python library for easily displaying tabular data" +url="https://github.com/jazzband/prettytable" +arch=('any') +license=('BSD') +depends=('python-wcwidth') +makedepends=('python-setuptools-scm') +checkdepends=('python-pytest') +source=("https://files.pythonhosted.org/packages/source/p/prettyTable/prettytable-${pkgver}.tar.gz" + '0001-Fix-column-spacing-with-xterm-reset-escape-sequence.patch') +sha512sums=('5031bc5e4b70cced9c6410dad9e9a499362322834de26ea852570b588c437ad3161afe4d3b83bc1f24f02b3c748978e3eeda24608c366e43b1434e881322bdc9' + '86cf8be475f62b0dfaa2483a37293cefd61e97bfe3c1226076cacc199da69bc5ea7e561bc311dd1b65f808f4fab202a0d38f702568ab7fbc091f285d2e52c924') + +export SETUPTOOLSA_SCM_PRETEND_VERSION=$pkgver + +prepare() { + pushd prettytable-$pkgver + patch -p1 -i "$srcdir"/0001-Fix-column-spacing-with-xterm-reset-escape-sequence.patch + popd +} + +build() { + cd prettytable-$pkgver + python setup.py build +} + +check() { + cd prettytable-$pkgver + pytest +} + +package() { + cd prettytable-$pkgver + chmod 644 -R prettytable.egg-info + python setup.py install --root="$pkgdir/" +}