Merge pull request #4584 from lazka/pacman-6.1.0

pacman: Update to 6.1.0

pacman/0001-makepkg-clean-up-more-things.patch

@@ -1,4 +1,4 @@
-From bf8bd9828cf3e4efedbaa9a367e94de0e3361d30 Mon Sep 17 00:00:00 2001
+From 2c898ec90c926510f23350c2780de99a7fad53b6 Mon Sep 17 00:00:00 2001
 From: Christoph Reiter <reiter.christoph@gmail.com>
 Date: Tue, 28 Feb 2023 20:24:16 +0100
 Subject: [PATCH 01/N] makepkg: clean up more things
@@ -8,7 +8,7 @@ Subject: [PATCH 01/N] makepkg: clean up more things
  1 file changed, 6 insertions(+), 1 deletion(-)
 
 diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in
-index f799c8f..fca9b2c 100644
+index 2c36681..44025e6 100644
 --- a/scripts/makepkg.sh.in
 +++ b/scripts/makepkg.sh.in
 @@ -137,7 +137,7 @@ clean_up() {
@@ -20,7 +20,7 @@ index f799c8f..fca9b2c 100644
  		if [[ -n $pkgbase ]]; then
  			local fullver=$(get_full_version)
  			# Can't do this unless the BUILDSCRIPT has been sourced.
-@@ -939,6 +939,11 @@ restore_package_variables() {
+@@ -846,6 +846,11 @@ restore_package_variables() {
 
  run_single_packaging() {
  	local pkgdir="$pkgdirbase/$pkgname"

pacman/0004-makepkg-build-env-export.patch → pacman/0002-makepkg-build-env-export.patch

@@ -1,20 +1,20 @@
-From c8025392f733b5b28687a8b468191354cd037415 Mon Sep 17 00:00:00 2001
+From a4a50b45d8e599c966a0f257cad5cf88ea010c5d Mon Sep 17 00:00:00 2001
 From: Christoph Reiter <reiter.christoph@gmail.com>
 Date: Tue, 28 Feb 2023 20:30:09 +0100
-Subject: [PATCH 04/N] makepkg: build env export
+Subject: [PATCH 02/N] makepkg: build env export
 
 this should be moved to the other exports really..
 ---
  scripts/makepkg.sh.in | 3 +++
  1 file changed, 3 insertions(+)
 
 diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in
-index 048d90d..2a85702 100644
+index 44025e6..6d65902 100644
 --- a/scripts/makepkg.sh.in
 +++ b/scripts/makepkg.sh.in
-@@ -1425,6 +1425,9 @@ mkdir -p "$srcdir"
+@@ -1343,6 +1343,9 @@ fi
+ mkdir -p "$srcdir"
  chmod a-s "$srcdir"
- cd_safe "$srcdir"
 
 +export MINGW_CHOST MINGW_PREFIX MINGW_PACKAGE_PREFIX
 +export DXSDK_DIR ACLOCAL_PATH PKG_CONFIG_PATH

pacman/0006-fill_progress.patch → pacman/0003-fill_progress.patch

@@ -1,19 +1,19 @@
-From 6a848dc26eb97a74ce01694d066dcb6eab335aa3 Mon Sep 17 00:00:00 2001
+From 2e757c243eef7f6a8c4befdbbb38b2737f35abad Mon Sep 17 00:00:00 2001
 From: Christoph Reiter <reiter.christoph@gmail.com>
 Date: Tue, 28 Feb 2023 20:30:40 +0100
-Subject: [PATCH 06/N] fill_progress
+Subject: [PATCH 03/N] fill_progress
 
 ---
  src/pacman/callback.c | 7 +++++--
  1 file changed, 5 insertions(+), 2 deletions(-)
 
 diff --git a/src/pacman/callback.c b/src/pacman/callback.c
-index 75c74f8..2f07512 100644
+index 76527e4..5d2de3f 100644
 --- a/src/pacman/callback.c
 +++ b/src/pacman/callback.c
-@@ -153,8 +153,11 @@ static int64_t get_update_timediff(int first_call)
- static void fill_progress(const int bar_percent, const int disp_percent,
- 		const int proglen)
+@@ -152,8 +152,11 @@ static int64_t get_update_timediff(int first_call)
+ /* refactored from cb_trans_progress */
+ static void fill_progress(const int percent, const int proglen)
  {
 -	/* 8 = 1 space + 1 [ + 1 ] + 5 for percent */
 -	const int hashlen = proglen > 8 ? proglen - 8 : 0;
@@ -22,6 +22,6 @@ index 75c74f8..2f07512 100644
 +	 * work properly on most windows terminals.
 +	 */
 +	const int hashlen = proglen > 9 ? proglen - 9 : 0;
- 	const int hash = bar_percent * hashlen / 100;
- 	static int lasthash = 0, mouth = 0;
+ 	const int hash = percent * hashlen / 100;
  	int i;
+

pacman/0007-test-fixes.patch → pacman/0004-test-fixes.patch

@@ -1,17 +1,17 @@
-From 4c61f9081840055b4c0ca1840e6a45d287b9a21d Mon Sep 17 00:00:00 2001
+From 0d6fcafb95f85d7c40b0127840a1a6736fd14d9e Mon Sep 17 00:00:00 2001
 From: Christoph Reiter <reiter.christoph@gmail.com>
 Date: Tue, 28 Feb 2023 20:30:50 +0100
-Subject: [PATCH 07/N] test fixes
+Subject: [PATCH 04/N] test fixes
 
 ---
  test/pacman/pmtest.py | 6 ++++--
  1 file changed, 4 insertions(+), 2 deletions(-)
 
 diff --git a/test/pacman/pmtest.py b/test/pacman/pmtest.py
-index 94b0930..bc4f2e3 100644
+index f5f033f..da2041b 100644
 --- a/test/pacman/pmtest.py
 +++ b/test/pacman/pmtest.py
-@@ -294,8 +294,10 @@ def run(self, pacman):
+@@ -297,8 +297,10 @@ def run(self, pacman):
          # Change to the tmp dir before running pacman, so that local package
          # archives are made available more easily.
          time_start = time.time()