Control: tags 960379 + patch
Control: tags 960379 + pending
Dear maintainer,
I've prepared an NMU for bitcoin (versioned as 0.18.1~dfsg-1.1) and
uploaded it to DELAYED/02. Please feel free to tell me if I
should delay it longer.
Regards.
--
Giovanni Mascellani <g.mascell...@gmail.com>
Postdoc researcher - Université Libre de Bruxelles
diff -Nru bitcoin-0.18.1~dfsg/debian/changelog bitcoin-0.18.1~dfsg/debian/changelog
--- bitcoin-0.18.1~dfsg/debian/changelog 2019-08-19 11:50:52.000000000 +0200
+++ bitcoin-0.18.1~dfsg/debian/changelog 2020-06-19 18:20:38.000000000 +0200
@@ -1,3 +1,10 @@
+bitcoin (0.18.1~dfsg-1.1) unstable; urgency=medium
+
+ * Non-maintainer upload.
+ * Fix FTBFS with new Univalue interface (closes: #960379).
+
+ -- Giovanni Mascellani <g...@debian.org> Fri, 19 Jun 2020 18:20:38 +0200
+
bitcoin (0.18.1~dfsg-1) unstable; urgency=medium
[ upstream ]
diff -Nru bitcoin-0.18.1~dfsg/debian/patches/0006-Fix-FTBFS-with-new-Univalue-Interface.patch bitcoin-0.18.1~dfsg/debian/patches/0006-Fix-FTBFS-with-new-Univalue-Interface.patch
--- bitcoin-0.18.1~dfsg/debian/patches/0006-Fix-FTBFS-with-new-Univalue-Interface.patch 1970-01-01 01:00:00.000000000 +0100
+++ bitcoin-0.18.1~dfsg/debian/patches/0006-Fix-FTBFS-with-new-Univalue-Interface.patch 2020-06-19 18:20:38.000000000 +0200
@@ -0,0 +1,21 @@
+From: Giovanni Mascellani <g...@debian.org>
+Date: Wed, 17 Jun 2020 19:05:43 +0200
+Subject: Fix FTBFS with new Univalue Interface.
+
+---
+ src/rpc/blockchain.cpp | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/rpc/blockchain.cpp b/src/rpc/blockchain.cpp
+index bd35163..52fcd3c 100644
+--- a/src/rpc/blockchain.cpp
++++ b/src/rpc/blockchain.cpp
+@@ -2198,7 +2198,7 @@ UniValue scantxoutset(const JSONRPCRequest& request)
+ // no scan in progress
+ return NullUniValue;
+ }
+- result.pushKV("progress", g_scan_progress);
++ result.pushKV("progress", int(g_scan_progress));
+ return result;
+ } else if (request.params[0].get_str() == "abort") {
+ CoinsViewScanReserver reserver;
diff -Nru bitcoin-0.18.1~dfsg/debian/patches/series bitcoin-0.18.1~dfsg/debian/patches/series
--- bitcoin-0.18.1~dfsg/debian/patches/series 2019-08-19 11:50:52.000000000 +0200
+++ bitcoin-0.18.1~dfsg/debian/patches/series 2020-06-19 18:20:38.000000000 +0200
@@ -3,3 +3,4 @@
1003_man_proper_header.patch
2001_avoid_embedded_libs.patch
2002_avoid_network_tests.patch
+0006-Fix-FTBFS-with-new-Univalue-Interface.patch
