From d75580e37de51e85555381374c9d4f6948654b22 Mon Sep 17 00:00:00 2001 From: TomZ Date: Fri, 26 Jul 2024 12:04:06 +0200 Subject: [PATCH] Add patch to build with API change of miniupnp228 --- .SRCINFO | 2 ++ 0001-Backport-uPNP-compile-fix.patch | 32 ++++++++++++++++++++++++++++ PKGBUILD | 7 ++++++ 3 files changed, 41 insertions(+) create mode 100644 0001-Backport-uPNP-compile-fix.patch diff --git a/.SRCINFO b/.SRCINFO index 9b25866..2b605ee 100644 --- a/.SRCINFO +++ b/.SRCINFO @@ -21,9 +21,11 @@ pkgbase = flowee 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 = flowee.logrotate source = flowee.conf sha256sums = 508f9290f5a4017a53db292e9860d1c2e03dc490e9966ec7c599e1d141aaa35f + sha256sums = 28c452aa03034ec6593954eb1c4afcd4275ae163069779b77f0eef537497f715 sha256sums = 0438e1a44523aeb3bbecd60fd920ca7b2aacd267b5cf988ab77a44eb7c03929e sha256sums = 59c1928ddb33fed1d4bf35df8fecd1dbdda0b308eac943503a2e3afb8c64bc89 diff --git a/0001-Backport-uPNP-compile-fix.patch b/0001-Backport-uPNP-compile-fix.patch new file mode 100644 index 0000000..59be560 --- /dev/null +++ b/0001-Backport-uPNP-compile-fix.patch @@ -0,0 +1,32 @@ +From e9f89556ebbc1e281d7bdb51da7d3c8e13c6c379 Mon Sep 17 00:00:00 2001 +From: TomZ +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 d04588e..63a55c2 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -16,13 +16,20 @@ 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" "0438e1a44523aeb3bbecd60fd920ca7b2aacd267b5cf988ab77a44eb7c03929e" "59c1928ddb33fed1d4bf35df8fecd1dbdda0b308eac943503a2e3afb8c64bc89") +prepare() { + cd "$srcdir/thehub" + patch -Np1 -i ../0001-Backport-uPNP-compile-fix.patch +} + build() { mkdir -p build cd build