From 5e864a75129c3595d040de2a2fe9d06f093083e3 Mon Sep 17 00:00:00 2001
From: Kevin Mihelich <kevin@archlinuxarm.org>
Date: Sat, 3 Jun 2023 18:04:50 +0000
Subject: [PATCH] extra/bitcoin to 25.0-2

---
 extra/bitcoin/PKGBUILD | 74 +++++++++++++++++++++++-------------------
 1 file changed, 41 insertions(+), 33 deletions(-)

diff --git a/extra/bitcoin/PKGBUILD b/extra/bitcoin/PKGBUILD
index d542a2548..4f1d897fd 100644
--- a/extra/bitcoin/PKGBUILD
+++ b/extra/bitcoin/PKGBUILD
@@ -8,9 +8,9 @@
 #  - build aarch64 with crc+crypto
 
 pkgbase=bitcoin
-pkgname=('bitcoin-daemon' 'bitcoin-cli' 'bitcoin-qt' 'bitcoin-tx')
-pkgver=24.0.1
-pkgrel=4
+pkgname=('bitcoin-daemon' 'bitcoin-qt' 'bitcoin-tx')
+pkgver=25.0
+pkgrel=2
 arch=('x86_64')
 url="https://bitcoin.org/en/wallets/desktop/linux/bitcoincore/"
 makedepends=('boost' 'libevent' 'qt5-base' 'qt5-tools' 'qrencode' 'miniupnpc' 'protobuf' 'zeromq' 'db5.3')
@@ -22,15 +22,15 @@ source=("$pkgbase-$pkgver.tar.gz::https://bitcoincore.org/bin/bitcoin-core-$pkgv
         "bitcoin.tmpfiles"
         "bitcoin-qt.desktop"
         "bitcoin-qt.appdata.xml")
-sha256sums=('12d4ad6dfab4767d460d73307e56d13c72997e114fad4f274650f95560f5f2ff'
-            '2f2aa5a87b74319bac9d41c811437a9d05720e0914489bce357de794034f7313'
+sha256sums=('5df67cf42ca3b9a0c38cdafec5bbb517da5b58d251f32c8d2a47511f9be1ebc2'
+            '74ae008c8c0a60c4b8a773b73d743a74d162ff2c53108be99015c82e33b8d0d4'
             'SKIP'
             '7a77112fb094b9b2e6dd873e24c9a6bacb1f1c453d811a024f271f4b78f2a704'
             'ba83570b4671b18c230f23d8d93cd8faa73179a546655448c14d1644d9b49f35'
             'a020897651c03690eae3411fe401100fd1a2ffaa799247165eb71124609b7959'
             '71b125555451e9bc60b54a6658d886bad63bd18c58b5d6e3bd8977b82a70da7a')
-b2sums=('2a8c83aecd12d8d40305d78ede1f389884ee62cfe4af39a9b416b8887a595f3393d599ebe9ddeb576bba5896923feb7ee45ba32d7d4cb0ce9e6d0ef39ecf83c7'
-        'da76bb9c69ae9e894e68261716cf209d646dc0935baa56d427577c2376ffd23adc1a131bb44c0e5175e673284b62e55997deb71fc0bc6e6f6ab248709e21f430'
+b2sums=('34f725e8c69ee3eb25d2a0c796f7688b3727603a4a34eb7ef4dd140c9b2995ecf28c60bfa45ad22614dcd445c9ddfdadd8dbb45dfbb9327c4b5dbe50c7ae9a11'
+        'a9842873e0aa2082a58bf90bae3caffd029028f48a7fae43e8829a3b27d06beffafa5bb697ee71db6644e4fd4d127e668cd3b32aa442d7c1b81a1a2bb890ec5e'
         'SKIP'
         '25166f5726b43c531b7ba5f58aaf1c0242d26b96d2057da156024a8f9fc53702ea9ef0c67290cf8d302b9fb473cb16435dc2fe4489ebc5d0eae516635fd81c0e'
         '45d4703b78476cb1c5748f62863914e5397858c835e43cee2f4895608dbabf383993b840bb3ec2d4d2c64ca02152881ad4b495b28f94451f706687b83e99d2af'
@@ -60,6 +60,8 @@ package_bitcoin-qt() {
 
   cd $pkgbase-$pkgver
   install -Dm755 src/qt/bitcoin-qt "$pkgdir"/usr/bin/bitcoin-qt
+  install -Dm644 contrib/completions/fish/bitcoin-qt.fish \
+    -t "$pkgdir/usr/share/fish/vendor_completions.d/"
   install -Dm644 doc/man/bitcoin-qt.1 \
     "$pkgdir"/usr/share/man/man1/bitcoin-qt.1
   install -Dm644 ../bitcoin-qt.desktop \
@@ -81,13 +83,27 @@ package_bitcoin-daemon() {
   pkgdesc="Bitcoin is a peer-to-peer network based digital currency - daemon"
   depends=(boost-libs db5.3 libevent miniupnpc libminiupnpc.so sqlite zeromq)
   backup=('etc/bitcoin/bitcoin.conf')
+  provides=('bitcoin-cli')
+  replaces=('bitcoin-cli')
 
   cd $pkgbase-$pkgver
-  install -Dm755 src/bitcoind "$pkgdir"/usr/bin/bitcoind
-  install -Dm644 contrib/bitcoind.bash-completion \
-    "$pkgdir"/usr/share/bash-completion/completions/bitcoind
-  install -Dm644 doc/man/bitcoind.1 \
-    "$pkgdir"/usr/share/man/man1/bitcoind.1
+  install -Dm755 -t "$pkgdir/usr/bin" \
+    src/bitcoind \
+    src/bitcoin-cli
+
+  install -Dm644 contrib/completions/bash/bitcoind.bash-completion \
+    "$pkgdir/usr/share/bash-completion/completions/bitcoind"
+  install -Dm644 contrib/completions/bash/bitcoin-cli.bash-completion \
+    "$pkgdir/usr/share/bash-completion/completions/bitcoin-cli"
+
+  install -Dm644 -t "$pkgdir/usr/share/fish/vendor_completions.d/" \
+    contrib/completions/fish/bitcoind.fish \
+    contrib/completions/fish/bitcoin-cli.fish
+
+  install -Dm644 -t "$pkgdir"/usr/share/man/man1/ \
+    doc/man/bitcoind.1 \
+    doc/man/bitcoin-cli.1
+
   install -Dm644 contrib/init/bitcoind.service \
     "$pkgdir/usr/lib/systemd/system/bitcoind.service"
   install -Dm644 "$srcdir/bitcoin.sysusers" \
@@ -100,30 +116,22 @@ package_bitcoin-daemon() {
   install -Dm644 COPYING "$pkgdir/usr/share/licenses/$pkgname/COPYING"
 }
 
-package_bitcoin-cli() {
-  pkgdesc="Bitcoin is a peer-to-peer network based digital currency - RPC client"
-  depends=(boost-libs libevent)
-
-  cd $pkgbase-$pkgver
-  install -Dm755 src/bitcoin-cli "$pkgdir"/usr/bin/bitcoin-cli
-  install -Dm644 contrib/bitcoin-cli.bash-completion \
-    "$pkgdir"/usr/share/bash-completion/completions/bitcoin-cli
-  install -Dm644 doc/man/bitcoin-cli.1 \
-    "$pkgdir"/usr/share/man/man1/bitcoin-cli.1
-
-  install -Dm644 COPYING "$pkgdir/usr/share/licenses/$pkgname/COPYING"
-}
-
 package_bitcoin-tx() {
-  pkgdesc="Bitcoin is a peer-to-peer network based digital currency - Transaction tool"
-  depends=(boost-libs openssl)
+  pkgdesc="Bitcoin is a peer-to-peer network based digital currency - commandline tools"
+  depends=(boost-libs)
 
   cd $pkgbase-$pkgver
-  install -Dm755 src/bitcoin-tx "$pkgdir"/usr/bin/bitcoin-tx
-  install -Dm644 contrib/bitcoin-tx.bash-completion \
-    "$pkgdir"/usr/share/bash-completion/completions/bitcoin-tx
-  install -Dm644 doc/man/bitcoin-tx.1 \
-    "$pkgdir"/usr/share/man/man1/bitcoin-tx.1
+  for tool in bitcoin-tx bitcoin-util bitcoin-wallet; do
+    install -Dm755 "src/$tool" -t "$pkgdir/usr/bin"
+    if [ -f "contrib/completions/bash/$tool.bash-completion" ]; then
+      install -Dm644 "contrib/completions/bash/$tool.bash-completion" \
+        "$pkgdir/usr/share/bash-completion/completions/$tool"
+    fi
+    install -Dm644 contrib/completions/fish/$tool.fish \
+      -t "$pkgdir/usr/share/fish/vendor_completions.d/"
+    install -Dm644 "doc/man/$tool.1" \
+      "$pkgdir/usr/share/man/man1/$tool.1"
+  done
 
   install -Dm644 COPYING "$pkgdir/usr/share/licenses/$pkgname/COPYING"
 }