[arch-commits] Commit in pacman-contrib/trunk (2 files)

[Daniel M. Capella]

    Date: Friday, May 21, 2021 @ 05:03:39
  Author: polyzen
Revision: 940218

upgpkg: pacman-contrib 1.4.0-2: pacman 6.0 rebuild

Added:
  pacman-contrib/trunk/0001-pactree-fix-compilation-with-pacman-6.patch
Modified:
  pacman-contrib/trunk/PKGBUILD

--------------------------------------------------+
 0001-pactree-fix-compilation-with-pacman-6.patch |   44 +++++++++++++++++++++
 PKGBUILD                                         |    9 ++--
 2 files changed, 50 insertions(+), 3 deletions(-)

Added: 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-05-21 05:03:39 UTC (rev 940218)
@@ -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
+

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2021-05-21 05:03:29 UTC (rev 940217)
+++ PKGBUILD	2021-05-21 05:03:39 UTC (rev 940218)
@@ -3,7 +3,7 @@
 
 pkgname=pacman-contrib
 pkgver=1.4.0
-pkgrel=1
+pkgrel=2
 
 pkgdesc="Contributed scripts and tools for pacman systems"
 url="https://git.archlinux.org/pacman-contrib.git/about/"
@@ -17,9 +17,11 @@
             '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})
+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')
+            'SKIP'
+            '774d27532a91e2fe490ccc8d21c2d1d4d2a2dbfc8678a8406abb8bb8f9e6626c')
 validpgpkeys=('5134EF9EAF65F95B6BB1608E50FB9B273A9D0BB5'  # Johannes Löthberg <johannes at kyriasis.com>
               '04DC3FB1445FECA813C27EFAEA4F7B321A906AD9') # Daniel M. Capella <polyzen at archlinux.org>
 
@@ -26,6 +28,7 @@
 prepare() {
   cd pacman-contrib-$pkgver
 
+  patch --forward --strip=1 --input=../0001-pactree-fix-compilation-with-pacman-6.patch
   ./autogen.sh
 }