- Pacman-contrib - lists.archlinux.org

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

[GIT] branch master updated (ec49f0f -> ca89bb6)
by Johannes Löthberg 25 Nov '20

25 Nov '20

This is an automated email from the git hooks/post-receive script. demize pushed a change to branch master in repository pacman-contrib. from ec49f0f paccache: Normalize single quote usage new ca89bb6 checkupdates: Do not use sudo when run as root The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Graph of new commits: * ca89bb6 (HEAD -> master) checkupdates: Do not use sudo when run as root Detailed log of new commits: commit ca89bb69b702222da7f699dda3ac61ae98c01d6b Author: Daniel M. Capella <polyzen(a)archlinux.org> Date: Wed Sep 2 21:36:55 2020 -0400 checkupdates: Do not use sudo when run as root runcmd() taken from paccache. Fixes FS#64328 Signed-off-by: Daniel M. Capella <polyzen(a)archlinux.org> Message-Id: <20200903013655.92224-3-polyzen(a)archlinux.org> Signed-off-by: Johannes Löthberg <johannes(a)kyriasis.com> Summary of changes: src/checkupdates.sh.in | 26 +++++++++++++++++++++----- 1 file changed, 21 insertions(+), 5 deletions(-) -- To stop receiving notification emails like this one, please contact the administrator of this repository.

1 0

[PATCH 1/3] paccache: Clarify sudo usage
by Daniel M. Capella 25 Nov '20

25 Nov '20

"Privilege escalation required" sounds more like an error. Signed-off-by: Daniel M. Capella <polyzen(a)archlinux.org> --- src/paccache.sh.in | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/paccache.sh.in b/src/paccache.sh.in index 1311fd7..fa53d58 100644 --- a/src/paccache.sh.in +++ b/src/paccache.sh.in @@ -138,11 +138,11 @@ m4_include(../lib/size_to_human.sh) runcmd() { if (( needsroot && EUID != 0 )); then - msg "Privilege escalation required" + msg 'Escalating privileges using sudo' if sudo -v &>/dev/null && sudo -l &>/dev/null; then sudo "$@" else - die 'Unable to escalate privileges using sudo' + die 'Failed to escalate' fi else "$@" -- 2.28.0

2 6

[GIT] branch master updated (3528b32 -> ec49f0f)
by Johannes Löthberg 23 Oct '20

23 Oct '20

This is an automated email from the git hooks/post-receive script. demize pushed a change to branch master in repository pacman-contrib. from 3528b32 pacdiff: automatically delete pacfile after viewing if identical new 4e94a68 paccache: Clarify sudo usage new ec49f0f paccache: Normalize single quote usage The 2 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Graph of new commits: * ec49f0f (HEAD -> master) paccache: Normalize single quote usage * 4e94a68 paccache: Clarify sudo usage Detailed log of new commits: commit ec49f0f514def807b5918efd0451a397c5cd7f02 Author: Daniel M. Capella <polyzen(a)archlinux.org> Date: Wed Sep 2 21:36:54 2020 -0400 paccache: Normalize single quote usage Signed-off-by: Daniel M. Capella <polyzen(a)archlinux.org> Message-Id: <20200903013655.92224-2-polyzen(a)archlinux.org> Signed-off-by: Johannes Löthberg <johannes(a)kyriasis.com> commit 4e94a68fae1e76458115b857c14f9f4a7ecfca53 Author: Daniel M. Capella <polyzen(a)archlinux.org> Date: Wed Sep 2 21:36:53 2020 -0400 paccache: Clarify sudo usage "Privilege escalation required" sounds more like an error. Signed-off-by: Daniel M. Capella <polyzen(a)archlinux.org> Message-Id: <20200903013655.92224-1-polyzen(a)archlinux.org> Signed-off-by: Johannes Löthberg <johannes(a)kyriasis.com> Summary of changes: src/paccache.sh.in | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) -- To stop receiving notification emails like this one, please contact the administrator of this repository.

1 0

[GIT] branch master updated (bc82ef5 -> 3528b32)
by Johannes Löthberg 23 Oct '20

23 Oct '20

This is an automated email from the git hooks/post-receive script. demize pushed a change to branch master in repository pacman-contrib. from bc82ef5 pactree: Hide dependency satisfiers in more cases new 3528b32 pacdiff: automatically delete pacfile after viewing if identical The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Graph of new commits: * 3528b32 (HEAD -> master) pacdiff: automatically delete pacfile after viewing if identical Detailed log of new commits: commit 3528b32c3b59599844f296d44c3881098a2b099b Author: John A. Leuenhagen <john(a)zlima12.com> Date: Mon Oct 5 14:24:47 2020 -0400 pacdiff: automatically delete pacfile after viewing if identical Signed-off-by: John A. Leuenhagen <john(a)zlima12.com> Message-Id: <66d7ee9e-459b-679e-8df9-c7019b9514f2(a)zlima12.com> Signed-off-by: Johannes Löthberg <johannes(a)kyriasis.com> Summary of changes: src/pacdiff.sh.in | 5 +++++ 1 file changed, 5 insertions(+) -- To stop receiving notification emails like this one, please contact the administrator of this repository.

1 0

[PATCH] pacdiff: automatically delete pacfile after viewing if identical
by John A. Leuenhagen 23 Oct '20

23 Oct '20

Signed-off-by: John A. Leuenhagen <john(a)zlima12.com> --- src/pacdiff.sh.in | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/src/pacdiff.sh.in b/src/pacdiff.sh.in index e3b8f8c..af85abb 100644 --- a/src/pacdiff.sh.in +++ b/src/pacdiff.sh.in @@ -184,6 +184,11 @@ while IFS= read -u 3 -r -d '' pacfile; do o|O) mv -v "$pacfile" "$file"; break ;; v|V) $diffprog "$pacfile" "$file" + if cmp -s "$pacfile" "$file"; then + msg2 "Files are identical, removing..." + rm -v "$pacfile" + break + fi ask "(V)iew, (S)kip, (R)emove %s, (O)verwrite with %s, (Q)uit: [v/s/r/o/q] " "$file_type" "$file_type"; continue ;; s|S) break ;; -- 2.28.0

2 1

Ideas for new functionality in pacdiff
by John A. Leuenhagen 05 Oct '20

05 Oct '20

Hello, I recently discovered pacdiff, which has proved to be an simple, excellent tool for taking care of pacfiles. There are a couple minor improvements I thought of, and would like to hear opinions on them before writing a patch. Currently, before pacdiff asks for the user's choice of action, it will compare the original file to the pacfile. If the files are identical, it will delete the pacfile. My idea is to perform this check after the user views the diff. This way, the user may merge all changes with their DIFFPROG, and the pacfile will automatically be deleted when they close their editor. If the files still differ, functionality would remain the same as it is currently. The second idea is simply a way to swap the sides that the files appear on in DIFFPROG. Personally, I would prefer having the pacfile on the right, but it is currently on the left. Having an argument for this seems reasonable to me. These would both be very simple changes, but would make the program a lot nicer, for me at least. Thanks, John Leuenhagen

2 2

[PATCH] pactree: Compress self-provided optional dependencies
by Sebastian Jakubiak 02 Sep '20

02 Sep '20

Remove `provides X` from `X provides X: ...` lines describing optional dependencies to make the output more compact. Signed-off-by: Sebastian Jakubiak <jakseb.dev(a)gmail.com> --- I noticed that most optional dependencies in the output of `pactree --optional` have this unneeded repetition. With this patch the following: vim-runtime ├─bash provides sh: support for some tools and macros (optional) ├─python provides python: demoserver example tool (optional) └─gawk provides gawk: mve tools upport (optional) will change to: vim-runtime ├─bash provides sh: support for some tools and macros (optional) ├─python: demoserver example tool (optional) └─gawk: mve tools upport (optional) src/pactree.c | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/src/pactree.c b/src/pactree.c index e34ecc8..4bd4601 100644 --- a/src/pactree.c +++ b/src/pactree.c @@ -383,6 +383,14 @@ static int parse_options(int argc, char *argv[]) return 0; } +int pkg_provides_itself(const char *pkg, const char *depstring) +{ + size_t pkglen = strlen(pkg); + return (strncmp(pkg, depstring, pkglen) == 0 && + (depstring[pkglen] == '\0' || + strncmp(": ", depstring + pkglen, 2) == 0)); +} + /* pkg provides provision */ static void print_text(const char *pkg, const char *provision, tdepth *depth, int last, int opt_dep) @@ -419,12 +427,12 @@ static void print_text(const char *pkg, const char *provision, if(!pkg && provision) { printf("%s%s%s%s [unresolvable]%s%s\n", tip, color->leaf1, provision, color->branch1, opt_str, color->off); - } else if(provision && strcmp(pkg, provision) != 0 && *(style->provides) != '\0') { + } else if(provision && *(style->provides) != '\0' && !pkg_provides_itself(pkg, provision)) { printf("%s%s%s%s%s %s%s%s%s\n", tip, color->leaf1, pkg, color->leaf2, style->provides, color->leaf1, provision, opt_str, color->off); } else { - printf("%s%s%s%s%s\n", tip, color->leaf1, pkg, opt_str, color->off); + printf("%s%s%s%s%s\n", tip, color->leaf1, (provision ? provision : pkg), opt_str, color->off); } } -- 2.27.0

3 3

[PATCH] doc: Fix minor mistakes in manpages
by Sebastian Jakubiak 02 Sep '20

02 Sep '20

Signed-off-by: Sebastian Jakubiak <jakseb.dev(a)gmail.com> --- doc/checkupdates.8.txt | 2 +- doc/pacsort.8.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/doc/checkupdates.8.txt b/doc/checkupdates.8.txt index b1a94d8..14cecc4 100644 --- a/doc/checkupdates.8.txt +++ b/doc/checkupdates.8.txt @@ -41,7 +41,7 @@ Environment Errors ------ -On exit, checkpkg will return one of the following error codes. +On exit, checkupdates will return one of the following error codes. 0:: Normal exit condition. diff --git a/doc/pacsort.8.txt b/doc/pacsort.8.txt index 357664d..e0fa5d4 100644 --- a/doc/pacsort.8.txt +++ b/doc/pacsort.8.txt @@ -27,7 +27,7 @@ By default the lines are treated as lists of plain version strings. Options ------- *-f, \--files*:: - If the input lists are in the format '\*-*.pkg.tar*', sort lines by pkgname and pkgver. + If the input lists are in the format '\*-\*.pkg.tar*', sort lines by pkgname and pkgver. *-h, \--help*:: Display syntax and command line options. -- 2.27.0

2 1

[PATCH] pactree: Fix vertical limbs for --optional
by Sebastian Jakubiak 02 Sep '20

02 Sep '20

When pactree was run with -o/--optional turned on, limbs were sometimes not properly cut off for the last children of packages that had no optional dependencies. Example: $ pactree -a -d2 -o libluv libluv |-luajit | `-gcc-libs `-libuv | |-glibc | `-libnsl Signed-off-by: Sebastian Jakubiak <jakseb.dev(a)gmail.com> --- src/pactree.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/pactree.c b/src/pactree.c index e34ecc8..cf05519 100644 --- a/src/pactree.c +++ b/src/pactree.c @@ -540,7 +540,7 @@ static void print_dep_list(alpm_list_t *deps, alpm_list_t *dblist, alpm_pkg_t *p }; depth->next = &d; /* last dep, cut off the limb here */ - if((last && optional && opt_dep) || (last && !optional)) { + if(last) { if(depth->prev) { depth->prev->next = &d; d.prev = depth->prev; -- 2.27.0

2 1