Flavien Bridault pushed to branch master at Debian Med / sight
Commits: 9bcb213b by Flavien Bridault at 2023-12-21T17:29:22+01:00 Fix FTBFS - - - - - 3 changed files: - debian/changelog - debian/copyright - debian/patches/gcc13.patch Changes: ===================================== debian/changelog ===================================== @@ -1,10 +1,17 @@ +sight (23.1.0-2) UNRELEASED; urgency=medium + + * d/p/gcc13.patch: Update patch (Closes: #1059140) + * Updated minizip copyright entry + + -- Flavien BRIDAULT <[email protected]> Thu, 21 Dec 2023 14:22:47 +0100 + sight (23.1.0-1) unstable; urgency=medium [ Flavien BRIDAULT ] * New upstream version * d/p/: Remove patches applied upstream Add patch to build with gcc13 - Closes: #1037858, #1039529 + Closes: #1037858, #1039529 [ Andreas Tille ] * Remove trailing whitespace in debian/changelog (routine-update) ===================================== debian/copyright ===================================== @@ -37,7 +37,7 @@ License: LGPL-3+ On Debian systems, the complete text of the GNU Library General Public License can be found in `/usr/share/common-licenses/LGPL-3'. -Files: libs/io/zip/minizip/* +Files: 3rd-party/minizip/* Copyright: 1998-2010 Gilles Vollant 2009-2010 Mathias Svensson 2007-2008 Even Rouault ===================================== debian/patches/gcc13.patch ===================================== @@ -94,3 +94,48 @@ distance2 += realDim * realDim; } +--- sight.orig/libs/core/core/com/SlotBase.hpp ++++ sight/libs/core/core/com/SlotBase.hpp +@@ -32,6 +32,7 @@ + #include <core/mt/types.hpp> + #include <core/spyLog.hpp> + ++#include <format> + #include <future> + #include <queue> + #include <set> +@@ -224,7 +225,7 @@ + template<typename F> + std::string getTypeName() const + { +- return std::string("function_type(") + std::string(typeid(F).name()) + std::string(")"); ++ return std::format("function_type({})", typeid(F).name()); + } + + SlotBase(unsigned int arity) : +--- sight.orig/libs/io/session/detail/core/SessionSerializer.cpp ++++ sight/libs/io/session/detail/core/SessionSerializer.cpp +@@ -28,6 +28,7 @@ + #include <boost/property_tree/json_parser.hpp> + + #include <atomic> ++#include <format> + #include <shared_mutex> + + namespace sight::io::session::detail +@@ -249,13 +250,8 @@ + // Throw an exception in debug, but just report an error in release when encryption is not supported, but asked + if(!password.empty()) + { +- const std::string& message = +- "Archive format '" +- + std::string(Archive::archiveFormatToString(archiveFormat)) +- + "' doesn't support encryption."; +- +- SIGHT_ASSERT(message, false); +- SIGHT_ERROR(message); ++ SIGHT_ERROR(std::format("Archive format '{}' doesn't support encryption.", ++ Archive::archiveFormatToString(archiveFormat))); + } + + // Create the archive that will hold all binary files View it on GitLab: https://salsa.debian.org/med-team/sight/-/commit/9bcb213b1d1a9458e583239c0fc78e929de13a97 -- View it on GitLab: https://salsa.debian.org/med-team/sight/-/commit/9bcb213b1d1a9458e583239c0fc78e929de13a97 You're receiving this email because of your account on salsa.debian.org.
_______________________________________________ debian-med-commit mailing list [email protected] https://alioth-lists.debian.net/cgi-bin/mailman/listinfo/debian-med-commit
