Merge pull request msys2#4594 from lazka/pacman-contrib-1.10.6

pacman-contrib: Update to 1.10.6
stahta01 · May 14, 2024 · 8d91007 · 8d91007
2 parents e5e126d + b546218
commit 8d91007
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 12 deletions.
diff --git a/pacman-contrib/0100-contrib.patch b/pacman-contrib/0100-contrib.patch
@@ -89,18 +89,18 @@
  	# unlikely that this will fail, but better make sure
  	pushd "$cachedir" &>/dev/null || die "failed to chdir to '%s'" "$cachedir"
 
---- pacman-contrib-v1.10.1/src/pacscripts.sh.in.orig	2024-01-04 03:28:56.000000000 +0100
-+++ pacman-contrib-v1.10.1/src/pacscripts.sh.in	2024-01-05 12:13:48.814196300 +0100
-@@ -29,7 +29,7 @@
-
+--- pacman-contrib-v1.10.6/src/pacscripts.sh.in.orig	2024-05-10 22:46:19.000000000 +0200
++++ pacman-contrib-v1.10.6/src/pacscripts.sh.in	2024-05-14 08:06:17.143324200 +0200
+@@ -30,7 +30,7 @@
  error() {
  	local mesg=$1; shift
--	printf "==> $(gettext "ERROR:") %s\n ${mesg}" "$@" >&2
-+	printf "==> $(/usr/bin/gettext "ERROR:") %s\n ${mesg}" "$@" >&2
+ 	# shellcheck disable=SC2059
+-	printf "==> $(gettext "ERROR:") ${mesg}\n" "$@" >&2
++	printf "==> $(/usr/bin/gettext "ERROR:") ${mesg}\n" "$@" >&2
  }
 
  usage() {
-@@ -63,17 +63,7 @@
+@@ -64,17 +64,7 @@
  }
 
  spacman() {
@@ -119,7 +119,7 @@
  }
 
  print_db() {
-@@ -92,7 +82,7 @@
+@@ -93,7 +83,7 @@
  }
 
  print_pkg() {
@@ -128,7 +128,7 @@
  		error "Package $1 does not include any .INSTALL script"
  		return 1
  	fi
-@@ -101,7 +91,7 @@
+@@ -102,7 +92,7 @@
 
  print_scriptlet() {
  	if [ -f "$1" ]; then

diff --git a/pacman-contrib/PKGBUILD b/pacman-contrib/PKGBUILD
@@ -3,7 +3,7 @@
 # Contributor: Ray Donnelly <mingw.android@gmail.com>
 
 pkgname=pacman-contrib
-pkgver=1.10.5
+pkgver=1.10.6
 pkgrel=1
 pkgdesc="Contributed scripts and tools for pacman systems (MSYS2 port)"
 arch=('i686' 'x86_64')
@@ -22,8 +22,8 @@ makedepends=('asciidoc'
              )
 source=(https://gitlab.archlinux.org/pacman/pacman-contrib/-/archive/v$pkgver/$pkgname-v$pkgver.tar.gz
         "0100-contrib.patch")
-sha256sums=('70efee8d5174fe8a1bbf218f33e1e992cf19357d2785932863c37649ae6e1527'
-            'ead76f91b3142b81e672c8e69d869c74f85f0e1c484a46913e6e68216775b99b')
+sha256sums=('fe8456638444ee6bead13ed526e047f8d251188582c085551afb29774ec468a8'
+            '6eb0e2c966a474b57bd30ebd615eeaea050c4036e875b619cbb77b64e9480a7b')
 
 prepare() {
   cd ${srcdir}/${pkgname}-v${pkgver}