Source: rlvm Version: 0.14-5.1 Followup-For: Bug #1056017 Tags: patch Dear Maintainer,
I cost some time to fix the issue and patch attached. Please review it. In order to fix the RC bug ASAP, I may do a NMU to mentor and find a sponsor to upload it. Please feel free to break the process if there is any issue. -- Regards, -- Bo YU
diff -Nru rlvm-0.14/debian/changelog rlvm-0.14/debian/changelog --- rlvm-0.14/debian/changelog 2021-10-04 03:16:33.000000000 +0800 +++ rlvm-0.14/debian/changelog 2023-12-25 15:40:26.000000000 +0800 @@ -1,3 +1,11 @@ +rlvm (0.14-5.2) UNRELEASED; urgency=medium + + * Non-maintainer upload. + * Fix ftbfs on boost1.83. (Closes: #1056017) + * Use libboost-timer-dev instead of libboost-date-time-dev. + + -- Bo YU <tsu.y...@gmail.com> Mon, 25 Dec 2023 15:40:26 +0800 + rlvm (0.14-5.1) unstable; urgency=medium * Non-maintainer upload. diff -Nru rlvm-0.14/debian/control rlvm-0.14/debian/control --- rlvm-0.14/debian/control 2021-10-04 03:16:13.000000000 +0800 +++ rlvm-0.14/debian/control 2023-12-25 15:40:26.000000000 +0800 @@ -4,7 +4,6 @@ Maintainer: Ying-Chun Liu (PaulLiu) <paul...@debian.org> Build-Depends: debhelper (>= 10), google-mock, - libboost-date-time-dev, libboost-dev, libboost-filesystem-dev, libboost-iostreams-dev, @@ -12,6 +11,7 @@ libboost-python-dev, libboost-serialization-dev, libboost-thread-dev, + libboost-timer-dev, libfreetype6-dev, libgl1-mesa-dev, libglew-dev, diff -Nru rlvm-0.14/debian/patches/005_fix_boost_ftbfs.patch rlvm-0.14/debian/patches/005_fix_boost_ftbfs.patch --- rlvm-0.14/debian/patches/005_fix_boost_ftbfs.patch 1970-01-01 07:30:00.000000000 +0730 +++ rlvm-0.14/debian/patches/005_fix_boost_ftbfs.patch 2023-12-25 15:40:26.000000000 +0800 @@ -0,0 +1,65 @@ +Description: fix ftbfs on boost1.83 +Author: Bo YU <tsu.y...@gmail.com> +Bug: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=1056017 +Last-Update: 2023-12-25 +--- +This patch header follows DEP-3: http://dep.debian.net/deps/dep3/ +--- a/vendor/wxInclude.cpp ++++ b/vendor/wxInclude.cpp +@@ -18,7 +18,7 @@ + #include <boost/algorithm/string.hpp> + #include <boost/format.hpp> + #include <boost/foreach.hpp> +-#include <boost/timer.hpp> ++#include <boost/timer/timer.hpp> + + namespace po = boost::program_options; + namespace fs = boost::filesystem; +@@ -207,7 +207,7 @@ + if ( opt.count( "input-file" ) || opt.count( "input-type" ) ) { + if ( opt.count( "output-file" ) ) { + /* Create timer */ +- boost::timer timer; ++ boost::timer::cpu_timer timer; + + /* Create output file */ + std::string headername( opt[ "output-file" ].as<std::string>() ); +@@ -361,7 +361,7 @@ + + /* Show status */ + if (!silent) +- std::cout << "Build : " << timer.elapsed() << "s needed for conversion of " << list.size() << " files." << std::endl; ++ std::cout << "Build : " << timer.elapsed().user<< "s needed for conversion of " << list.size() << " files." << std::endl; + } else { + throw std::invalid_argument( "No output defined!" ); + } +--- a/SConstruct ++++ b/SConstruct +@@ -81,6 +81,7 @@ + "boost_iostreams", + "boost_filesystem", + "boost_date_time", ++ "boost_timer", + "boost_thread", + "boost_system"]) + +--- a/src/systems/base/system.h ++++ b/src/systems/base/system.h +@@ -33,6 +33,7 @@ + #include <boost/filesystem/path.hpp> + + #include <map> ++#include <memory> + #include <sstream> + #include <string> + #include <utility> +--- a/src/utilities/file.h ++++ b/src/utilities/file.h +@@ -31,6 +31,7 @@ + #include <boost/filesystem.hpp> + + #include <iosfwd> ++#include <memory> + #include <string> + #include <vector> + diff -Nru rlvm-0.14/debian/patches/series rlvm-0.14/debian/patches/series --- rlvm-0.14/debian/patches/series 2020-02-01 10:20:05.000000000 +0800 +++ rlvm-0.14/debian/patches/series 2023-12-25 15:37:58.000000000 +0800 @@ -2,3 +2,4 @@ 002_include-iostream.patch 003_use_pkg-config_for_freetype2.patch 004_port_to_python3.patch +005_fix_boost_ftbfs.patch
signature.asc
Description: PGP signature