From 4cbed8923936ed4f81e062aba43b562012fd9c07 Mon Sep 17 00:00:00 2001
From: TomZ <tom@flowee.org>
Date: Sat, 12 Oct 2024 22:17:08 +0200
Subject: [PATCH] Update to 2024.10.0

---
 .SRCINFO                             |  8 +++----
 0001-Backport-uPNP-compile-fix.patch | 32 ----------------------------
 PKGBUILD                             | 15 ++++---------
 3 files changed, 7 insertions(+), 48 deletions(-)
 delete mode 100644 0001-Backport-uPNP-compile-fix.patch

diff --git a/.SRCINFO b/.SRCINFO
index 2b605ee..67ed750 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = flowee
 	pkgdesc = Flowee provides the shortest path to Bitcoin Cash
-	pkgver = 2024.07.0
+	pkgver = 2024.10.0
 	pkgrel = 1
 	url = https://flowee.org/
 	install = flowee.install
@@ -20,12 +20,10 @@ pkgbase = flowee
 	options = !lto
 	backup = etc/flowee/flowee.conf
 	backup = etc/flowee/rest-service.conf
-	source = https://codeberg.org/Flowee/thehub/archive/2024.07.0.tar.gz
-	source = 0001-Backport-uPNP-compile-fix.patch
+	source = https://codeberg.org/Flowee/thehub/archive/2024.10.0.tar.gz
 	source = flowee.logrotate
 	source = flowee.conf
-	sha256sums = 508f9290f5a4017a53db292e9860d1c2e03dc490e9966ec7c599e1d141aaa35f
-	sha256sums = 28c452aa03034ec6593954eb1c4afcd4275ae163069779b77f0eef537497f715
+	sha256sums = a92a69926a1e9a065e78ddcbb1d3189d0b42bf57582d87e3fa7a1becd95fb062
 	sha256sums = 0438e1a44523aeb3bbecd60fd920ca7b2aacd267b5cf988ab77a44eb7c03929e
 	sha256sums = 59c1928ddb33fed1d4bf35df8fecd1dbdda0b308eac943503a2e3afb8c64bc89
 
diff --git a/0001-Backport-uPNP-compile-fix.patch b/0001-Backport-uPNP-compile-fix.patch
deleted file mode 100644
index 59be560..0000000
--- a/0001-Backport-uPNP-compile-fix.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-From e9f89556ebbc1e281d7bdb51da7d3c8e13c6c379 Mon Sep 17 00:00:00 2001
-From: TomZ <tom@flowee.org>
-Date: Fri, 26 Jul 2024 11:49:46 +0200
-Subject: [PATCH] Backport uPNP compile fix
-
-This comes from Bitcoin Core commit: 8acdf6654
-
-upnp: add compatibility for miniupnpc 2.2.8
-original patch by: Cory Fields
----
- hub/server/net.cpp | 4 ++++
- 1 file changed, 4 insertions(+)
-
-diff --git a/hub/server/net.cpp b/hub/server/net.cpp
-index c524be2a9..bed48b483 100644
---- a/hub/server/net.cpp
-+++ b/hub/server/net.cpp
-@@ -1356,7 +1356,11 @@ void ThreadMapPort()
-     struct IGDdatas data;
-     int r;
- 
-+#if MINIUPNPC_API_VERSION <= 17
-     r = UPNP_GetValidIGD(devlist, &urls, &data, lanaddr, sizeof(lanaddr));
-+#else
-+    r = UPNP_GetValidIGD(devlist, &urls, &data, lanaddr, sizeof(lanaddr), nullptr, 0);
-+#endif
-     if (r == 1)
-     {
-         if (fDiscover) {
--- 
-2.45.2
-
diff --git a/PKGBUILD b/PKGBUILD
index 63a55c2..51b6642 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,7 +1,7 @@
 # Maintainer: Tom Zander
 
 pkgname=flowee
-pkgver=2024.07.0
+pkgver=2024.10.0
 options=(!lto)
 pkgrel=1
 pkgdesc="Flowee provides the shortest path to Bitcoin Cash"
@@ -16,26 +16,19 @@ provides=('flowee-hub' 'flowee-libs')
 backup=("etc/flowee/flowee.conf" "etc/flowee/rest-service.conf")
 install=flowee.install
 source=("https://codeberg.org/Flowee/thehub/archive/$pkgver.tar.gz"
-    "0001-Backport-uPNP-compile-fix.patch"
     "flowee.logrotate"
     "flowee.conf")
 
-sha256sums=("508f9290f5a4017a53db292e9860d1c2e03dc490e9966ec7c599e1d141aaa35f"
-    "28c452aa03034ec6593954eb1c4afcd4275ae163069779b77f0eef537497f715"
+sha256sums=("a92a69926a1e9a065e78ddcbb1d3189d0b42bf57582d87e3fa7a1becd95fb062"
     "0438e1a44523aeb3bbecd60fd920ca7b2aacd267b5cf988ab77a44eb7c03929e"
     "59c1928ddb33fed1d4bf35df8fecd1dbdda0b308eac943503a2e3afb8c64bc89")
 
-prepare() {
-    cd "$srcdir/thehub"
-    patch -Np1 -i ../0001-Backport-uPNP-compile-fix.patch
-}
-
 build() {
   mkdir -p build
   cd build
   cmake -DCMAKE_BUILD_TYPE=Release -Dbuild_apps=ON -DCMAKE_INSTALL_PREFIX=$pkgdir/usr/ ../thehub
-  echo '#define GIT_COMMIT_ID "9008b4a3"' > include/build.h
-  echo '#define BUILD_DATE "2024-06-29 20:18:35 +0200"' >> include/build.h
+  echo '#define GIT_COMMIT_ID "e9915cbc"' > include/build.h
+  echo '#define BUILD_DATE "2024-10-11 19:44:54 +0200"' >> include/build.h
   make
 }