pin-dependencies.PKGBUILDpatch: use bash array (again)

2 files changed, 10 insertions, 25 deletions

diff --git a/openttd-git/PKGBUILD b/openttd-git/PKGBUILD
index 3583c144d..eaeb47caa 100644
--- a/openttd-git/PKGBUILD
+++ b/openttd-git/PKGBUILD
@@ -8,23 +8,24 @@ arch=('x86_64' 'i686' 'pentium4')
 url="http://www.openttd.org"
 license=('GPL2')
 groups=()
-depends=(
-  'fluidsynth'
-  'fontconfig'
-  'hicolor-icon-theme'
-# _pinned_dependencies
+_pinned_dependencies=(
   'fluidsynth=2.1.3'
   'fontconfig=2:2.13.91+24+g75eadca'
   'freetype2=2.10.2'
   'gcc-libs=10.1.0'
-  'glibc=2.31'
+  'glibc>=2.31'
   'icu=67.1'
   'libpng=1.6.37'
   'lzo=2.10'
   'sdl2=2.0.12'
   'xz=5.2.5'
   'zlib=1:1.2.11'
-# _pinned_dependencies.end
+)
+depends=(
+  'fluidsynth'
+  'fontconfig'
+  'hicolor-icon-theme'
+  "${_pinned_dependencies[@]}"
 )
 makedepends=('git')
 checkdepends=(
diff --git a/pin-dependencies.PKGBUILDpatch b/pin-dependencies.PKGBUILDpatch
index 4d5540699..6d5d5cb65 100644
--- a/pin-dependencies.PKGBUILDpatch
+++ b/pin-dependencies.PKGBUILDpatch
@@ -45,24 +45,8 @@ if printf '%s\n' "${arch[@]}" | grep -qvxF any; then
       | sed 's/[<>]\?=.*$//' \
       | sort -u
     ) <(
-      {
-        eval 'printf '"'"'%s\n'"'"' "${depends[@]}" "${depends_'"${CARCH}"'[@]}"' \
-        | sed 's/=.*$//' \
-        | sort -u
-        sed -n '
-          /^\s*# _pinned_dependencies$/,/^\s*# _pinned_dependencies\.end$/ p
-        ' "${OLDPWD}/PKGBUILD" \
-        | sed '
-          /^\s*#/d
-          s/^\s\+//
-          s/\s\+$//
-          s/^\(["'"'"']\)\(\S\+\)\1$/\2/
-          s/[<>]\?=.*$//
-        ' \
-        | sort -u
-      } \
-      | sort \
-      | uniq -d
+      eval 'printf '"'"'%s\n'"'"' "${_pinned_dependencies[@]}" "${_pinned_dependencies_'"${CARCH}"'[@]}"' \
+      | sort -u
     )
   ); then
     printf 'There are discrepancies between the _pinned_dependencies and the linked libraries in %s'"'"'s %s:\n' \