1 files changed, 35 insertions, 3 deletions
diff --git a/core/pacman/PKGBUILD b/core/pacman/PKGBUILD
index 61a6bf13..cb69f6fb 100644
--- a/core/pacman/PKGBUILD
+++ b/core/pacman/PKGBUILD
@@ -5,13 +5,14 @@ depends+=(archlinux32-keyring)
 # fail if upstream changes makepkg.conf or pacman.conf
 for ((i=0; i<${#sha256sums[@]}; i++)); do
   # pacman.conf
-  if [ "${sha256sums[${i}]}" = '0e84952e4b8eacbb38c018608d152ddd6f98e205c4c6c7d3cdca854d4b7d4179' ]; then
+  if [ "${sha256sums[${i}]}" = 'bc80e9d0439caddd29b99a69b5060b5589cad2398c23abc5b2b8b990fae6ad8c' ]; then
     sha256sums[${i}]='3e482ca4e98386679cec02b51e32c6a13caf3dee365a850567547f616a69408f'
   fi
   # makepkg.conf
   if [ "${sha256sums[${i}]}" = 'd99c1f9608362fff9ab3a2ca0a3096a317927b42a6725bc86599da6849c9c67c' ]; then
     sha256sums[${i}]='82e963060a02c9a04cf5296bb4c5e732d3c3d0666d221ddaf2b3367989b9d894'
   fi
+  # rust.conf (for now keep the upstream one)
 done
 
 if [ ! "${CARCH}" = "i686" ]; then
@@ -58,11 +59,42 @@ fi
 #fi
 
 # gettext is linked against old ICU verison on i486, use ICU 72 stub
+#if [ "${CARCH}" = "i486" ]; then
+#  makedepends+=(icu72)
+#fi
+
+# git on i486 problem, cannot make sums of git checkout (yet?)
 if [ "${CARCH}" = "i486" ]; then
-  makedepends+=(icu72)
+  sha256sums[0]='SKIP'
 fi
 
-sha256sums[0]='SKIP'
+# use muon instead of meson, no python (and meson needs python)
+makedepends=(${makedepends[@]//meson/})
+makedepends+=(muon-meson)
+
+eval "$(
+  declare -f build | \
+    sed '
+      /meson compile/ i \
+        cd $srcdir/pacman/build
+      s/meson compile.*/muon samu -v -j1/
+      s/meson\(.* build\)/muon meson setup -D default_library=shared \1/
+    '
+  declare -f check | \
+    sed '
+      /meson test/ i \
+        cd $srcdir/pacman/build
+      s/meson.*/muon test -v/
+    '
+  declare -f package | \
+    sed '
+      /meson install/ i \
+        cd $srcdir/pacman/build
+      /meson install/ a \
+        cd ..
+      s/DESTDIR="$pkgdir" meson install -C build/muon install -d "$pkgdir"/
+    '
+)"
 
 # fails happilly at the moment, going full risk now and installing it anyway..
 unset check