[arch-commits] Commit in pacman-contrib/repos/community-x86_64 (4 files)
Daniel M. Capella
polyzen at archlinux.org
Tue Jun 29 22:15:49 UTC 2021
Date: Tuesday, June 29, 2021 @ 22:15:49
Author: polyzen
Revision: 967880
archrelease: copy trunk to community-x86_64
Added:
pacman-contrib/repos/community-x86_64/0001-pactree-fix-compilation-with-pacman-6.patch
(from rev 967879, pacman-contrib/trunk/0001-pactree-fix-compilation-with-pacman-6.patch)
pacman-contrib/repos/community-x86_64/PKGBUILD
(from rev 967879, pacman-contrib/trunk/PKGBUILD)
Deleted:
pacman-contrib/repos/community-x86_64/0001-pactree-fix-compilation-with-pacman-6.patch
pacman-contrib/repos/community-x86_64/PKGBUILD
--------------------------------------------------+
0001-pactree-fix-compilation-with-pacman-6.patch | 88 ++++++++--------
PKGBUILD | 111 ++++++++++-----------
2 files changed, 99 insertions(+), 100 deletions(-)
Deleted: 0001-pactree-fix-compilation-with-pacman-6.patch
===================================================================
--- 0001-pactree-fix-compilation-with-pacman-6.patch 2021-06-29 22:15:23 UTC (rev 967879)
+++ 0001-pactree-fix-compilation-with-pacman-6.patch 2021-06-29 22:15:49 UTC (rev 967880)
@@ -1,44 +0,0 @@
-From fd21ee241c85856be941e41942d6c179ca713c41 Mon Sep 17 00:00:00 2001
-From: Eli Schwartz via pacman-contrib <pacman-contrib at lists.archlinux.org>
-Date: Fri, 21 May 2021 00:30:07 -0400
-Subject: [PATCH] pactree: fix compilation with pacman 6
-
-In "add front-end provided context to callbacks", libalpm gained a new
-argument to callbacks which we don't use and is only needed by some
-frontends wishing to do stuff with the callback state. NULL it and move
-on with life, just like pacman itself did.
-
-Signed-off-by: Eli Schwartz <eschwartz at archlinux.org>
-Signed-off-by: Daniel M. Capella <polyzen at archlinux.org>
----
- src/pactree.c | 6 ++++--
- 1 file changed, 4 insertions(+), 2 deletions(-)
-
-diff --git a/src/pactree.c b/src/pactree.c
-index e8f5086..9e6ac1b 100644
---- a/src/pactree.c
-+++ b/src/pactree.c
-@@ -135,8 +135,10 @@ static const char *dbpath = DBPATH;
- static const char *configfile = CONFFILE;
- static const char *gpgdir = GPGDIR;
-
--void cb_log(alpm_loglevel_t level, const char *fmt, va_list args)
-+void cb_log(void *ctx, alpm_loglevel_t level, const char *fmt, va_list args)
- {
-+ (void)ctx;
-+
- switch(level) {
- case ALPM_LOG_ERROR:
- fprintf(stderr, "%s%s%s", color->error, "error: ",
-@@ -621,7 +623,7 @@ int main(int argc, char *argv[])
- }
-
- if(debug) {
-- alpm_option_set_logcb(handle, cb_log);
-+ alpm_option_set_logcb(handle, cb_log, NULL);
- }
-
- /* no need to fail on error here */
---
-2.31.1
-
Copied: pacman-contrib/repos/community-x86_64/0001-pactree-fix-compilation-with-pacman-6.patch (from rev 967879, pacman-contrib/trunk/0001-pactree-fix-compilation-with-pacman-6.patch)
===================================================================
--- 0001-pactree-fix-compilation-with-pacman-6.patch (rev 0)
+++ 0001-pactree-fix-compilation-with-pacman-6.patch 2021-06-29 22:15:49 UTC (rev 967880)
@@ -0,0 +1,44 @@
+From fd21ee241c85856be941e41942d6c179ca713c41 Mon Sep 17 00:00:00 2001
+From: Eli Schwartz via pacman-contrib <pacman-contrib at lists.archlinux.org>
+Date: Fri, 21 May 2021 00:30:07 -0400
+Subject: [PATCH] pactree: fix compilation with pacman 6
+
+In "add front-end provided context to callbacks", libalpm gained a new
+argument to callbacks which we don't use and is only needed by some
+frontends wishing to do stuff with the callback state. NULL it and move
+on with life, just like pacman itself did.
+
+Signed-off-by: Eli Schwartz <eschwartz at archlinux.org>
+Signed-off-by: Daniel M. Capella <polyzen at archlinux.org>
+---
+ src/pactree.c | 6 ++++--
+ 1 file changed, 4 insertions(+), 2 deletions(-)
+
+diff --git a/src/pactree.c b/src/pactree.c
+index e8f5086..9e6ac1b 100644
+--- a/src/pactree.c
++++ b/src/pactree.c
+@@ -135,8 +135,10 @@ static const char *dbpath = DBPATH;
+ static const char *configfile = CONFFILE;
+ static const char *gpgdir = GPGDIR;
+
+-void cb_log(alpm_loglevel_t level, const char *fmt, va_list args)
++void cb_log(void *ctx, alpm_loglevel_t level, const char *fmt, va_list args)
+ {
++ (void)ctx;
++
+ switch(level) {
+ case ALPM_LOG_ERROR:
+ fprintf(stderr, "%s%s%s", color->error, "error: ",
+@@ -621,7 +623,7 @@ int main(int argc, char *argv[])
+ }
+
+ if(debug) {
+- alpm_option_set_logcb(handle, cb_log);
++ alpm_option_set_logcb(handle, cb_log, NULL);
+ }
+
+ /* no need to fail on error here */
+--
+2.31.1
+
Deleted: PKGBUILD
===================================================================
--- PKGBUILD 2021-06-29 22:15:23 UTC (rev 967879)
+++ PKGBUILD 2021-06-29 22:15:49 UTC (rev 967880)
@@ -1,56 +0,0 @@
-# Maintainer: Johannes Löthberg <johannes at kyriasis.com>
-# Maintainer: Daniel M. Capella <polyzen at archlinux.org>
-
-pkgname=pacman-contrib
-pkgver=1.4.0
-pkgrel=3
-
-pkgdesc="Contributed scripts and tools for pacman systems"
-url="https://git.archlinux.org/pacman-contrib.git/about/"
-arch=('x86_64')
-license=('GPL')
-
-depends=('fakeroot' 'pacman' 'perl')
-makedepends=('asciidoc')
-optdepends=('diffutils: for pacdiff'
- 'findutils: for pacdiff --find'
- 'mlocate: for pacdiff --locate'
- 'sudo: privilege elevation for several scripts'
- 'vim: default merge program for pacdiff')
-
-source=("https://git.archlinux.org/pacman-contrib.git/snapshot/pacman-contrib-$pkgver.tar".{gz,asc}
- '0001-pactree-fix-compilation-with-pacman-6.patch')
-sha256sums=('8746f1352aaad990fe633be34f925d5ab8bd8a19a5f1274e72dbde426deb86bd'
- 'SKIP'
- '774d27532a91e2fe490ccc8d21c2d1d4d2a2dbfc8678a8406abb8bb8f9e6626c')
-validpgpkeys=('5134EF9EAF65F95B6BB1608E50FB9B273A9D0BB5' # Johannes Löthberg <johannes at kyriasis.com>
- '04DC3FB1445FECA813C27EFAEA4F7B321A906AD9') # Daniel M. Capella <polyzen at archlinux.org>
-
-prepare() {
- cd pacman-contrib-$pkgver
-
- patch --forward --strip=1 --input=../0001-pactree-fix-compilation-with-pacman-6.patch
- ./autogen.sh
-}
-
-build() {
- cd pacman-contrib-$pkgver
-
- ./configure \
- --prefix=/usr \
- --sysconfdir=/etc \
- --localstatedir=/var
- make
-}
-
-check() {
- make -C pacman-contrib-$pkgver check
-}
-
-package() {
- cd pacman-contrib-$pkgver
-
- make DESTDIR="$pkgdir" install
-}
-
-# vim:set ts=2 sw=2 et:
Copied: pacman-contrib/repos/community-x86_64/PKGBUILD (from rev 967879, pacman-contrib/trunk/PKGBUILD)
===================================================================
--- PKGBUILD (rev 0)
+++ PKGBUILD 2021-06-29 22:15:49 UTC (rev 967880)
@@ -0,0 +1,55 @@
+# Maintainer: Johannes Löthberg <johannes at kyriasis.com>
+# Maintainer: Daniel M. Capella <polyzen at archlinux.org>
+
+pkgname=pacman-contrib
+pkgver=1.4.0
+pkgrel=4
+
+pkgdesc="Contributed scripts and tools for pacman systems"
+url="https://gitlab.archlinux.org/pacman/pacman-contrib"
+arch=('x86_64')
+license=('GPL')
+
+depends=('fakeroot' 'pacman' 'perl')
+makedepends=('asciidoc')
+optdepends=('diffutils: for pacdiff'
+ 'findutils: for pacdiff --find'
+ 'mlocate: for pacdiff --locate'
+ 'sudo: privilege elevation for several scripts'
+ 'vim: default merge program for pacdiff')
+
+source=("$url/-/archive/v$pkgver/$pkgname-v$pkgver.tar.gz"
+ '0001-pactree-fix-compilation-with-pacman-6.patch')
+sha256sums=('c97b2889ab012feaa1882865af9cfeb2406c9045757d2e73b5903277472ce6a2'
+ '774d27532a91e2fe490ccc8d21c2d1d4d2a2dbfc8678a8406abb8bb8f9e6626c')
+#validpgpkeys=('5134EF9EAF65F95B6BB1608E50FB9B273A9D0BB5' # Johannes Löthberg <johannes at kyriasis.com>
+# '04DC3FB1445FECA813C27EFAEA4F7B321A906AD9') # Daniel M. Capella <polyzen at archlinux.org>
+
+prepare() {
+ cd pacman-contrib-v$pkgver
+
+ patch --forward --strip=1 --input=../0001-pactree-fix-compilation-with-pacman-6.patch
+ ./autogen.sh
+}
+
+build() {
+ cd pacman-contrib-v$pkgver
+
+ ./configure \
+ --prefix=/usr \
+ --sysconfdir=/etc \
+ --localstatedir=/var
+ make
+}
+
+check() {
+ make -C pacman-contrib-v$pkgver check
+}
+
+package() {
+ cd pacman-contrib-v$pkgver
+
+ make DESTDIR="$pkgdir" install
+}
+
+# vim:set ts=2 sw=2 et:
More information about the arch-commits
mailing list