From c35d481f2497c14515296cba3ed1e27d2c49f677 Mon Sep 17 00:00:00 2001
From: Kevin Mihelich <kevin@archlinuxarm.org>
Date: Fri, 1 Sep 2023 17:53:26 +0000
Subject: [PATCH] extra/bitcoin to 25.0-3

---
 extra/bitcoin/PKGBUILD | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/extra/bitcoin/PKGBUILD b/extra/bitcoin/PKGBUILD
index 4f1d897fd..f0255fae2 100644
--- a/extra/bitcoin/PKGBUILD
+++ b/extra/bitcoin/PKGBUILD
@@ -10,10 +10,10 @@
 pkgbase=bitcoin
 pkgname=('bitcoin-daemon' 'bitcoin-qt' 'bitcoin-tx')
 pkgver=25.0
-pkgrel=2
+pkgrel=3
 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')
+makedepends=('boost' 'libevent' 'qt5-base' 'qt5-tools' 'qrencode' 'miniupnpc' 'zeromq' 'db5.3')
 license=('MIT')
 source=("$pkgbase-$pkgver.tar.gz::https://bitcoincore.org/bin/bitcoin-core-$pkgver/bitcoin-$pkgver.tar.gz"
         "$pkgbase-$pkgver.SHA256SUMS::https://bitcoincore.org/bin/bitcoin-core-$pkgver/SHA256SUMS"
@@ -50,13 +50,15 @@ prepare() {
 build() {
   cd $pkgbase-$pkgver
   [[ $CARCH == "aarch64" ]] && CFLAGS=`echo $CFLAGS | sed -e 's/-march=armv8-a/-march=armv8-a+crc+crypto/'` && CXXFLAGS="$CFLAGS"
+  #remove _FORTIFY_SOURCE from CXXFLAGS to prevent a duplicate definition warning as configure adds _FORTIFY_SOURCE itself
+  CXXFLAGS=${CXXFLAGS/-Wp,-D_FORTIFY_SOURCE=?/}
   ./configure --prefix=/usr --with-gui=qt5 --with-incompatible-bdb BDB_LIBS="-ldb_cxx-5.3" BDB_CFLAGS="-I/usr/include/db5.3"
   make
 }
 
 package_bitcoin-qt() {
   pkgdesc="Bitcoin is a peer-to-peer network based digital currency - Qt"
-  depends=(boost-libs libevent qt5-base miniupnpc libminiupnpc.so qrencode protobuf zeromq hicolor-icon-theme db5.3)
+  depends=(libevent qt5-base miniupnpc libminiupnpc.so qrencode zeromq hicolor-icon-theme db5.3)
 
   cd $pkgbase-$pkgver
   install -Dm755 src/qt/bitcoin-qt "$pkgdir"/usr/bin/bitcoin-qt
@@ -81,7 +83,7 @@ package_bitcoin-qt() {
 
 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)
+  depends=(db5.3 libevent miniupnpc libminiupnpc.so sqlite zeromq)
   backup=('etc/bitcoin/bitcoin.conf')
   provides=('bitcoin-cli')
   replaces=('bitcoin-cli')
@@ -118,7 +120,7 @@ package_bitcoin-daemon() {
 
 package_bitcoin-tx() {
   pkgdesc="Bitcoin is a peer-to-peer network based digital currency - commandline tools"
-  depends=(boost-libs)
+  depends=(db5.3 sqlite)
 
   cd $pkgbase-$pkgver
   for tool in bitcoin-tx bitcoin-util bitcoin-wallet; do