Source: litecoin
Version: 0.21.2.2-1.1+b1
Followup-For: Bug #1059138

Dear Maintainer,

The upstream has fixed the issue but there are 2 test cases failed and I
have reported this to upstream:
https://github.com/litecoin-project/litecoin/issues/932

Please review the debdiff and maybe I will do a NMU one week later.


-- 
Regards,
--
  Bo YU

diff -Nru litecoin-0.21.2.2/debian/changelog litecoin-0.21.2.2/debian/changelog
--- litecoin-0.21.2.2/debian/changelog  2023-11-01 22:21:35.000000000 +0800
+++ litecoin-0.21.2.2/debian/changelog  2023-12-28 15:20:54.000000000 +0800
@@ -1,3 +1,11 @@
+litecoin (0.21.2.2-1.2) unstable; urgency=medium
+
+  * Non-maintainer upload.
+  * Add fix-ftbfs-on-boost1.83.patch to fix ftbfs. (Closes: #1059138)
+  * Add t-skip--wallet-init_tests.patch to skip tests failed.
+
+ -- Bo YU <tsu.y...@gmail.com>  Thu, 28 Dec 2023 15:20:54 +0800
+
 litecoin (0.21.2.2-1.1) unstable; urgency=medium
 
   * Non-maintainer upload.
diff -Nru litecoin-0.21.2.2/debian/patches/fix-ftbfs-on-boost1.83.patch 
litecoin-0.21.2.2/debian/patches/fix-ftbfs-on-boost1.83.patch
--- litecoin-0.21.2.2/debian/patches/fix-ftbfs-on-boost1.83.patch       
1970-01-01 07:30:00.000000000 +0730
+++ litecoin-0.21.2.2/debian/patches/fix-ftbfs-on-boost1.83.patch       
2023-12-28 10:46:35.000000000 +0800
@@ -0,0 +1,54 @@
+From acb7aad27ec8a184808aa7905887e3b2c5d54e9c Mon Sep 17 00:00:00 2001
+From: Rafael Sadowski <raf...@sizeofvoid.org>
+Date: Mon, 16 Aug 2021 06:34:02 +0200
+Subject: [PATCH] Fix build with Boost 1.77.0
+
+BOOST_FILESYSTEM_C_STR changed to accept the path as an argument
+---
+ src/fs.cpp                            | 4 ++++
+ src/wallet/test/db_tests.cpp          | 4 ++++
+ src/wallet/test/init_test_fixture.cpp | 4 ++++
+ 3 files changed, 12 insertions(+)
+
+--- a/src/fs.cpp
++++ b/src/fs.cpp
+@@ -236,7 +236,11 @@
+ }
+ #else // __GLIBCXX__
+ 
++#if BOOST_VERSION >= 107700
++static_assert(sizeof(*BOOST_FILESYSTEM_C_STR(fs::path())) == sizeof(wchar_t),
++#else
+ static_assert(sizeof(*fs::path().BOOST_FILESYSTEM_C_STR) == sizeof(wchar_t),
++#endif // BOOST_VERSION >= 107700
+     "Warning: This build is using boost::filesystem ofstream and ifstream "
+     "implementations which will fail to open paths containing multibyte "
+     "characters. You should delete this static_assert to ignore this warning, 
"
+--- a/src/wallet/test/db_tests.cpp
++++ b/src/wallet/test/db_tests.cpp
+@@ -18,7 +18,11 @@
+     std::string test_name = "test_name.dat";
+     const fs::path datadir = GetDataDir();
+     fs::path file_path = datadir / test_name;
++#if BOOST_VERSION >= 107700
++    std::ofstream f(BOOST_FILESYSTEM_C_STR(file_path));
++#else
+     std::ofstream f(file_path.BOOST_FILESYSTEM_C_STR);
++#endif // BOOST_VERSION >= 107700
+     f.close();
+ 
+     std::string filename;
+--- a/src/wallet/test/init_test_fixture.cpp
++++ b/src/wallet/test/init_test_fixture.cpp
+@@ -31,7 +31,11 @@
+     fs::create_directories(m_walletdir_path_cases["default"]);
+     fs::create_directories(m_walletdir_path_cases["custom"]);
+     fs::create_directories(m_walletdir_path_cases["relative"]);
++#if BOOST_VERSION >= 107700
++    std::ofstream f(BOOST_FILESYSTEM_C_STR(m_walletdir_path_cases["file"]));
++#else
+     std::ofstream f(m_walletdir_path_cases["file"].BOOST_FILESYSTEM_C_STR);
++#endif // BOOST_VERSION >= 107700
+     f.close();
+ }
+ 
diff -Nru litecoin-0.21.2.2/debian/patches/series 
litecoin-0.21.2.2/debian/patches/series
--- litecoin-0.21.2.2/debian/patches/series     2023-11-01 22:19:24.000000000 
+0800
+++ litecoin-0.21.2.2/debian/patches/series     2023-12-28 11:33:11.000000000 
+0800
@@ -7,3 +7,5 @@
 t-skip--libmw.patch
 t-skip--secp256k1.patch
 gcc-13.patch
+fix-ftbfs-on-boost1.83.patch
+t-skip--wallet-init_tests.patch
diff -Nru litecoin-0.21.2.2/debian/patches/t-skip--wallet-init_tests.patch 
litecoin-0.21.2.2/debian/patches/t-skip--wallet-init_tests.patch
--- litecoin-0.21.2.2/debian/patches/t-skip--wallet-init_tests.patch    
1970-01-01 07:30:00.000000000 +0730
+++ litecoin-0.21.2.2/debian/patches/t-skip--wallet-init_tests.patch    
2023-12-28 15:20:20.000000000 +0800
@@ -0,0 +1,16 @@
+Description: skip tests failed 
+Author: Bo YU <tsu.y...@gmail.com> 
+Forwarded: https://github.com/litecoin-project/litecoin/issues/932 
+Last-Update: 2023-12-28
+---
+This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
+--- a/src/Makefile.test.include
++++ b/src/Makefile.test.include
+@@ -299,7 +299,6 @@
+   wallet/test/wallet_tests.cpp \
+   wallet/test/wallet_crypto_tests.cpp \
+   wallet/test/coinselector_tests.cpp \
+-  wallet/test/init_tests.cpp \
+   wallet/test/ismine_tests.cpp \
+   wallet/test/scriptpubkeyman_tests.cpp
+ 

Attachment: signature.asc
Description: PGP signature

Reply via email to