Merge branch 'master' of 192.168.60.2:archgitrepo

Author: lilacbot

alarmcn/bcachefs-tools-git/PKGBUILD

@@ -2,7 +2,7 @@
 
 pkgname=bcachefs-tools-git
 _pkgname=${pkgname%-git}
-pkgver=1.37.5.r11.g7514504
+pkgver=1.37.5.r13.gb7ddcb5
 pkgrel=1
 epoch=1
 pkgdesc="BCacheFS filesystem utilities"

alarmcn/herdtools7-git/PKGBUILD

@@ -4,7 +4,7 @@ _pkgbase='herdtools7'
 pkgname=('herdtools7-git')
 provides=('herdtools7')
 conflicts=('herdtools7')
-pkgver=7.58+1.r1569.g0f5101391
+pkgver=7.58+1.r1571.g549a89dbb
 pkgrel=1
 pkgdesc="The Herd toolsuite to deal with .cat memory models"
 arch=(armv7h aarch64 i686 x86_64)

alarmcn/neovim-git/PKGBUILD

@@ -4,7 +4,7 @@
 
 pkgname=neovim-git
 _pkgname=${pkgname%-git}
-pkgver=0.12.0.r254.g5b0ad4a060
+pkgver=0.12.0.r261.gbc6d946cca
 pkgrel=1
 pkgdesc="Fork of Vim aiming to improve user experience, plugins, and GUIs."
 arch=('i686' 'x86_64' 'armv7h' 'armv6h' 'aarch64')

alarmcn/openblas-git/PKGBUILD

@@ -6,7 +6,7 @@
 pkgbase=openblas-git
 pkgname=(openblas-git openblas64-git)
 _pkgname=OpenBLAS
-pkgver=0.3.32.1dev.0.110.gfe23eadd1
+pkgver=0.3.32.1dev.0.118.gb8bb6d08f
 pkgrel=1
 pkgdesc="An optimized BLAS library based on GotoBLAS2 1.13 BSD"
 arch=('aarch64' 'x86_64')

alarmcn/qemu/PKGBUILD

@@ -27,7 +27,7 @@ pkgname=(
   qemu-{base,desktop,emulators-full,full}
 )
 pkgver=10.2.2
-pkgrel=3
+pkgrel=4
 pkgdesc="A generic and open source machine emulator and virtualizer"
 arch=(aarch64 x86_64)
 url="https://www.qemu.org/"
@@ -446,10 +446,6 @@ package_qemu-common() {
   # remove files provided by seabios
   rm -fv "$pkgdir/usr/share/$pkgbase/"{bios,vgabios}*
 
-  # remove files provided by edk2-{aarch64,arm,ovmf}
-  rm -fv "$pkgdir/usr/share/$pkgbase/"edk2-*
-  rm -frv "$pkgdir/usr/share/$pkgbase/firmware"
-
   (
     # create man page symlinks for all system emulators
     cd "$pkgdir/usr/share/man/man1"
@@ -525,6 +521,10 @@ package_qemu-common() {
     _pick qemu-system-arm usr/share/man/man1/qemu-system-arm.1*
 
     _pick qemu-system-arm-firmware usr/share/qemu/{ast27x0,npcm{7,8}xx}_bootrom.bin
+    # NOTE: These used to belong to edk2-arm, but upstream edk2 removed support for 32bit ARM.
+    # We will track them here for as long as QEMU upstream provides them prebuilt.
+    _pick qemu-system-arm-firmware usr/share/qemu/edk2-arm-{code,vars}.fd
+    _pick qemu-system-arm-firmware usr/share/qemu/firmware/60-edk2-arm.json
 
     _pick qemu-system-avr usr/bin/qemu-system-avr
     _pick qemu-system-avr usr/share/man/man1/qemu-system-avr.1*
@@ -627,6 +627,11 @@ package_qemu-common() {
       _pick qemu-vmsr-helper usr/bin/qemu-vmsr-helper
     fi
   )
+
+  # remove files provided by edk2-{aarch64,arm,ovmf}
+  rm -fv "$pkgdir/usr/share/$pkgbase/"edk2-*
+  rm -frv "$pkgdir/usr/share/$pkgbase/firmware"
+
 }
 
 package_qemu-audio-alsa() {
@@ -864,13 +869,15 @@ package_qemu-system-alpha-firmware() {
 
 package_qemu-system-arm() {
   pkgdesc="QEMU system emulator for ARM"
-  depends=("${_qemu_system_deps[@]}" dtc edk2-arm qemu-system-arm-firmware=$pkgver-$pkgrel systemd-libs libudev.so)
+  depends=("${_qemu_system_deps[@]}" dtc qemu-system-arm-firmware=$pkgver-$pkgrel systemd-libs libudev.so)
   mv -v $pkgname/* "$pkgdir"
   _install_licenses
 }
 
 package_qemu-system-arm-firmware() {
   pkgdesc="Firmware for QEMU system emulator for ARM"
+  conflicts=(edk2-arm)
+  replaces=(edk2-arm)
   options=(!strip)
   mv -v $pkgname/* "$pkgdir"
   _install_licenses
@@ -955,7 +962,7 @@ package_qemu-system-ppc-firmware() {
 
 package_qemu-system-riscv() {
   pkgdesc="QEMU system emulator for RISC-V"
-  depends=("${_qemu_system_deps[@]}" dtc qemu-system-riscv-firmware=$pkgver-$pkgrel systemd-libs libudev.so)
+  depends=("${_qemu_system_deps[@]}" dtc edk2-riscv64 qemu-system-riscv-firmware=$pkgver-$pkgrel systemd-libs libudev.so)
   mv -v $pkgname/* "$pkgdir"
   _install_licenses
 }

alarmcn/rr-git/PKGBUILD

@@ -2,7 +2,7 @@
 # Previous maintainer: Joel Teichroeb <joel@teichroeb.net>
 
 pkgname=rr-git
-pkgver=5.9.0.r140.g9e6dfa89
+pkgver=5.9.0.r141.gcb603175
 pkgrel=1
 pkgdesc='a nondeterministic debugger'
 arch=(i686 x86_64 aarch64)

alarmcn/yazi-git/PKGBUILD

@@ -3,7 +3,7 @@
 
 pkgname=yazi-git
 _pkgname=yazi
-pkgver=26.1.22.r83.g4631508
+pkgver=26.1.22.r84.gae4c138
 pkgrel=1
 pkgdesc="Blazing fast terminal file manager written in Rust, based on async I/O."
 url="https://github.com/sxyazi/${_pkgname}"