December 2020 - Pacman-contrib - lists.archlinux.org

[PATCH 0/4] pacdiff: learn (M)erge mode
by Denton Liu 28 Mar '21

28 Mar '21

This series teaches pacdiff to perform 3-way merges on config files. The first commit is a cleanup that should be done regardless of whether the rest of this series is merged. The next two commits are small refactors to make final change more readable. The last patch implements the bulk of the logic. It also includes some comment requests. Denton Liu (4): pacdiff: Reindent awk script pacdiff: Implement die() pacdiff: Reduce repetition in input loop pacdiff: Learn the (M)erge mode doc/pacdiff.8.txt | 9 +++- src/pacdiff.sh.in | 102 ++++++++++++++++++++++++++++++++++++++++------ 2 files changed, 97 insertions(+), 14 deletions(-) -- 2.29.2.889.g5298b911bd

2 9

[PATCH] pacsort.8.txt: add missing colon
by Denton Liu 25 Dec '20

25 Dec '20

There is a missing colon so, as a result, the following line is rendered incorrectly as -v, --version: Display the version. instead of -v, --version Display the version. Add the missing colon so that it renders properly. Signed-off-by: Denton Liu <liu.denton(a)gmail.com> --- doc/pacsort.8.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/pacsort.8.txt b/doc/pacsort.8.txt index e0fa5d4..544404d 100644 --- a/doc/pacsort.8.txt +++ b/doc/pacsort.8.txt @@ -41,7 +41,7 @@ Options *-t, \--separator <sep>*:: Field separator. Default separator is space. -*-v, \--version*: +*-v, \--version*:: Display the version. *-z, \--null*:: -- 2.29.2.889.g5298b911bd

1 0

Update coolreader to 3.2.51
by Andy Mender 13 Dec '20

13 Dec '20

Hello, Apologies if this is not the correct way to submit non-bug related patches. coolreader was flagged as out-of-date on 2020-10-28. I just built version 3.2.51 from an updated PKGBUILD and it runs fine. Below patch against the ABS package git tree (acquired via asp checkout coolreader) applies the update: diff --git a/trunk/PKGBUILD b/trunk/PKGBUILD index d9daae5..ca576e5 100644 --- a/trunk/PKGBUILD +++ b/trunk/PKGBUILD @@ -2,7 +2,7 @@ # Contributor: Ivan Naumeiko <Ivan.Naumeiko AT gmail DOT com> pkgname=coolreader -pkgver=3.2.49 +pkgver=3.2.51 pkgrel=1 pkgdesc="Fast and small XML/CSS based eBook reader" arch=(x86_64) @@ -12,7 +12,7 @@ depends=(hicolor-icon-theme qt5-base) makedepends=(cmake qt5-tools) source=( https://github.com/buggins/coolreader/archive/cr$pkgver/$pkgname-$pkgver.ta… cr3.appdata.xml) -sha256sums=('7354bfc78d1b2899dcb35ae73b19ab7a622bedc2d6a9d62831f249537590bfc6' +sha256sums=('f5aca183855bcf4dc87b1764e15af3ba9dc5fdbe2e7c8b4c0f513b12f6b2a840' '9d868cfd61b686b5a398797819367f16d7a65f1f5420441fb34c8d39236f7382') prepare() { I'm trying to monitor upstream a little more carefully, since I opened a couple of PRs with them. Cheers, Andy

2 1