From: Andreas Tille Date: Fri, 14 Apr 2023 17:18:06 +0000 (+0200) Subject: libcereal (1.3.2+dfsg-5) unstable; urgency=medium X-Git-Tag: archive/raspbian/1.3.2+dfsg-5+rpi1^2~4 X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=aad0016f43fd2839cd1a47c31089546d85c76d9e;p=libcereal.git libcereal (1.3.2+dfsg-5) unstable; urgency=medium * Team upload. [ Aaron M. Ucko ] * Fix autopkgtest regression on non x86: cc1plus: all warnings being treated as errors Closes: #1034369 [dgit import unpatched libcereal 1.3.2+dfsg-5] --- aad0016f43fd2839cd1a47c31089546d85c76d9e diff --cc debian/README.test index 0000000,0000000..90657cf new file mode 100644 --- /dev/null +++ b/debian/README.test @@@ -1,0 -1,0 +1,8 @@@ ++Notes on how this package can be tested. ++──────────────────────────────────────── ++ ++This package can be tested by running the provided test: ++ ++ sh run-unit-test ++ ++in order to confirm its integrity. diff --cc debian/changelog index 0000000,0000000..25f584e new file mode 100644 --- /dev/null +++ b/debian/changelog @@@ -1,0 -1,0 +1,185 @@@ ++libcereal (1.3.2+dfsg-5) unstable; urgency=medium ++ ++ * Team upload. ++ ++ [ Aaron M. Ucko ] ++ * Fix autopkgtest regression on non x86: cc1plus: all warnings being ++ treated as errors ++ Closes: #1034369 ++ ++ -- Andreas Tille Fri, 14 Apr 2023 19:18:06 +0200 ++ ++libcereal (1.3.2+dfsg-4) unstable; urgency=medium ++ ++ * Team upload. ++ * Disable -Werror to fix FTBFS on arm, ppc, s390x (Closes: #1021394) ++ ++ -- Scott Talbert Thu, 13 Oct 2022 13:31:58 -0400 ++ ++libcereal (1.3.2+dfsg-3) unstable; urgency=medium ++ ++ * Team upload. ++ * Fix watch file ++ * libcereal-dev Architecture: any since the cmake files are not ++ Architecture independent ++ Closes: #1020779 ++ * Standards-Version: 4.6.1 (routine-update) ++ * Lintian-overrides for flase positive ++ ++ -- Andreas Tille Thu, 06 Oct 2022 09:36:11 +0200 ++ ++libcereal (1.3.2+dfsg-2) unstable; urgency=medium ++ ++ * Team upload. ++ * d/t/run-unit-test: Copy sandbox dir ++ for autopkgtests (Closes: #1016742) ++ ++ -- Nilesh Patra Sun, 07 Aug 2022 13:17:06 +0530 ++ ++libcereal (1.3.2+dfsg-1) unstable; urgency=medium ++ ++ * Team upload. ++ * New upstream version ++ * Add BUILD_SANDBOX to autopkgtest ++ ++ -- Andreas Tille Tue, 03 May 2022 11:17:25 +0200 ++ ++libcereal (1.3.1+dfsg-1) unstable; urgency=medium ++ ++ * New upstream version ++ * Refresh patches. Sent add-only-tests-target upstream. ++ * Adjust to changes in cmake locations ++ * Don't install another copy of the rapidxml license ++ ++ -- Michael R. Crusoe Mon, 17 Jan 2022 09:22:46 +0100 ++ ++libcereal (1.3.0+dfsg-2) unstable; urgency=medium ++ ++ * Team upload. ++ * Fix watch file ++ * Standards-Version: 4.6.0 (routine-update) ++ ++ -- Andreas Tille Thu, 30 Sep 2021 11:40:31 +0200 ++ ++libcereal (1.3.0+dfsg-1) unstable; urgency=medium ++ ++ [ Andreas Tille ] ++ * Team upload. ++ * Standards-Version: 4.5.1 (routine-update) ++ * debhelper-compat 13 (routine-update) ++ * Add salsa-ci file (routine-update) ++ * Rules-Requires-Root: no (routine-update) ++ * watch file standard 4 (routine-update) ++ * install from debian/tmp to enable dh_missing --fail-missing ++ * install cmake file ++ * Remove code copy of rapidjson and use Debian packaged code instead ++ Closes: #976585 ++ ++ [ Michael R. Crusoe ] ++ * debian/patches/{reproducible-doxygen,drop-google-analytics}: ++ doesn't need forwarding upstream. ++ ++ -- Michael R. Crusoe Wed, 13 Jan 2021 10:20:13 +0100 ++ ++libcereal (1.3.0-3) unstable; urgency=medium ++ ++ * libcereal-dev: Convert to Architecture: all, saves space and eases ++ cross-building ++ * Mark -dev and -doc as Multi-Arch: foreign ++ * Tweak the doxygen patch to make the build reproducible ++ * Standards-Version: 4.5.0 (routine-update) ++ * Use secure URI in Homepage field. ++ * Set upstream metadata fields: Bug-Database, Bug-Submit, Repository, ++ Repository-Browse. ++ ++ -- Michael R. Crusoe Fri, 28 Feb 2020 17:26:41 +0100 ++ ++libcereal (1.3.0-2) unstable; urgency=medium ++ ++ * debian/ruiles: Work around build failures on platforms without processor ++ intrinsics for atomic operations ++ ++ -- Michael R. Crusoe Mon, 28 Oct 2019 14:19:21 +0100 ++ ++libcereal (1.3.0-1) unstable; urgency=medium ++ ++ * New upstream version ++ * debhelper-compat 12 ++ * Standards-Version: 4.4.0 ++ ++ -- Michael R. Crusoe Sun, 27 Oct 2019 17:23:31 +0100 ++ ++libcereal (1.2.2-3) unstable; urgency=medium ++ ++ * Team upload. ++ * Do not try to change non-existing files in binary all builds ++ Closes: #916969 ++ ++ -- Andreas Tille Thu, 20 Dec 2018 22:34:59 +0100 ++ ++libcereal (1.2.2-2) unstable; urgency=medium ++ ++ * Team upload. ++ * Fix autopkgtest ++ Closes: #911261 ++ * Normalise autopkgtest (as in other Debian Med packages) ++ * debhelper 11 ++ * Remove trailing whitespace in debian/changelog ++ ++ -- Andreas Tille Thu, 20 Dec 2018 15:07:17 +0100 ++ ++libcereal (1.2.2-1) unstable; urgency=medium ++ ++ * New upstream release. ++ ++ -- Michael R. Crusoe Wed, 17 Oct 2018 02:06:26 -0700 ++ ++libcereal (1.2.1-3) unstable; urgency=medium ++ ++ * Team upload ++ * Do not set -Werror which makes build fail when using gcc-7 ++ Closes: #853486 ++ * debhelper 10 ++ * Standards-Version: 4.1.0 (no changes needed) ++ ++ -- Andreas Tille Thu, 31 Aug 2017 23:28:27 +0200 ++ ++libcereal (1.2.1-2) unstable; urgency=medium ++ ++ * Make Doxygen docs reproducible. ++ ++ -- Michael R. Crusoe Thu, 10 Nov 2016 04:01:18 -0800 ++ ++libcereal (1.2.1-1) unstable; urgency=medium ++ ++ * New upstream release with support for g++ 6 (Closes: #834187) ++ * Drop arm compatibility patch as it was incorporated upstream ++ ++ -- Michael R. Crusoe Sun, 14 Aug 2016 02:11:45 -0700 ++ ++libcereal (1.1.2-4) unstable; urgency=medium ++ ++ * Drop multilib builddeb (Closes: #814530) ++ ++ -- Michael R. Crusoe Fri, 12 Feb 2016 16:27:13 -0800 ++ ++libcereal (1.1.2-3) unstable; urgency=medium ++ ++ * Applied patch from upstream, try building on all archs again. ++ ++ -- Michael R. Crusoe Thu, 11 Feb 2016 14:04:10 -0800 ++ ++libcereal (1.1.2-2) unstable; urgency=medium ++ ++ * Only build for *-amd64, sparc64 until upstream fixes their code. ++ (Closes: # 813280, #813281, #813282) ++ * Added autopkgtest ++ * Fix Vcs-Git URL. ++ ++ -- Michael R. Crusoe Sun, 31 Jan 2016 00:19:40 -0800 ++ ++libcereal (1.1.2-1) unstable; urgency=low ++ ++ * Initial release (Closes: #800335) ++ ++ -- Michael R. Crusoe Fri, 18 Sep 2015 19:13:43 -0700 diff --cc debian/control index 0000000,0000000..6c7ad70 new file mode 100644 --- /dev/null +++ b/debian/control @@@ -1,0 -1,0 +1,41 @@@ ++Source: libcereal ++Maintainer: Debian Med Packaging Team ++Uploaders: Michael R. Crusoe ++Section: libdevel ++Priority: optional ++Build-Depends: debhelper-compat (= 13), ++ libboost-serialization-dev, ++ libboost-test-dev, ++ rapidjson-dev, ++ cmake, ++ doxygen ++Standards-Version: 4.6.1 ++Vcs-Browser: https://salsa.debian.org/med-team/libcereal ++Vcs-Git: https://salsa.debian.org/med-team/libcereal.git ++Homepage: https://uscilab.github.io/cereal/ ++Rules-Requires-Root: no ++ ++Package: libcereal-dev ++Architecture: any ++Depends: ${misc:Depends}, ++ rapidjson-dev ++Description: C++11 library for serialization ++ cereal is a header-only C++11 serialization library. cereal takes arbitrary ++ data types and reversibly turns them into different representations, such as ++ compact binary encodings, XML, or JSON. cereal was designed to be fast, ++ light-weight, and easy to extend - it has no external dependencies and can be ++ easily bundled with other code or used standalone. ++ ++Package: libcereal-doc ++Architecture: all ++Multi-Arch: foreign ++Section: doc ++Depends: ${misc:Depends} ++Description: C++11 library for serialization HTML documentation ++ cereal is a header-only C++11 serialization library. cereal takes arbitrary ++ data types and reversibly turns them into different representations, such as ++ compact binary encodings, XML, or JSON. cereal was designed to be fast, ++ light-weight, and easy to extend - it has no external dependencies and can be ++ easily bundled with other code or used standalone. ++ . ++ This package contains the HTML documentation. diff --cc debian/copyright index 0000000,0000000..4abb0c8 new file mode 100644 --- /dev/null +++ b/debian/copyright @@@ -1,0 -1,0 +1,104 @@@ ++Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ ++Upstream-Name: cereal ++Source: https://github.com/USCiLab/cereal ++Files-Excluded: include/cereal/external/rapidjson ++ ++Files: * ++Copyright: (c) 2014, Randolph Voorhies, Shane Grant ++License: bsd-3-clause ++ ++Files: include/cereal/external/base64.hpp ++Copyright: (C) 2004-2008 René Nyffenegger ++License: other ++ This source code is provided 'as-is', without any express or implied ++ warranty. In no event will the author be held liable for any damages ++ arising from the use of this software. ++ . ++ Permission is granted to anyone to use this software for any purpose, ++ including commercial applications, and to alter it and redistribute it ++ freely, subject to the following restrictions: ++ . ++ 1. The origin of this source code must not be misrepresented; you must not ++ claim that you wrote the original source code. If you use this source code ++ in a product, an acknowledgment in the product documentation would be ++ appreciated but is not required. ++ . ++ 2. Altered source versions must be plainly marked as such, and must not be ++ misrepresented as being the original source code. ++ . ++ 3. This notice may not be removed or altered from any source distribution. ++ . ++ René Nyffenegger rene.nyffenegger@adp-gmbh.ch ++ ++Files: include/cereal/external/rapidxml/* ++Copyright: Copyright (c) 2006, 2007, 2009 Marcin Kalicinski ++License: BSL-1.0 or Expat ++ ++Files: debian/* ++Copyright: © 2015 Michael R. Crusoe ++License: bsd-3-clause ++ ++License: BSL-1.0 ++ Permission is hereby granted, free of charge, to any person or organization ++ obtaining a copy of the software and accompanying documentation covered by ++ this license (the "Software") to use, reproduce, display, distribute, ++ execute, and transmit the Software, and to prepare derivative works of the ++ Software, and to permit third-parties to whom the Software is furnished to ++ do so, all subject to the following: ++ . ++ The copyright notices in the Software and this entire statement, including ++ the above license grant, this restriction and the following disclaimer, ++ must be included in all copies of the Software, in whole or in part, and ++ all derivative works of the Software, unless such copies or derivative ++ works are solely in the form of machine-executable object code generated by ++ a source language processor. ++ . ++ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR ++ IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, ++ FITNESS FOR A PARTICULAR PURPOSE, TITLE AND NON-INFRINGEMENT. IN NO EVENT ++ SHALL THE COPYRIGHT HOLDERS OR ANYONE DISTRIBUTING THE SOFTWARE BE LIABLE ++ FOR ANY DAMAGES OR OTHER LIABILITY, WHETHER IN CONTRACT, TORT OR OTHERWISE, ++ ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER ++ DEALINGS IN THE SOFTWARE. ++ ++License: Expat ++ Permission is hereby granted, free of charge, to any person obtaining a copy ++ of this software and associated documentation files (the "Software"), to deal ++ in the Software without restriction, including without limitation the rights ++ to use, copy, modify, merge, publish, distribute, sublicense, and/or sell ++ copies of the Software, and to permit persons to whom the Software is ++ furnished to do so, subject to the following conditions: ++ . ++ The above copyright notice and this permission notice shall be included in ++ all copies or substantial portions of the Software. ++ . ++ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR ++ IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, ++ FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE ++ AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER ++ LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, ++ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN ++ THE SOFTWARE. ++ ++License: bsd-3-clause ++ Redistribution and use in source and binary forms, with or without ++ modification, are permitted provided that the following conditions are met: ++ * Redistributions of source code must retain the above copyright ++ notice, this list of conditions and the following disclaimer. ++ * Redistributions in binary form must reproduce the above copyright ++ notice, this list of conditions and the following disclaimer in the ++ documentation and/or other materials provided with the distribution. ++ * Neither the name of cereal nor the ++ names of its contributors may be used to endorse or promote products ++ derived from this software without specific prior written permission. ++ . ++ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ++ ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED ++ WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE ++ DISCLAIMED. IN NO EVENT SHALL RANDOLPH VOORHIES OR SHANE GRANT BE LIABLE FOR ANY ++ DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES ++ (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; ++ LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ++ ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT ++ (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS ++ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. diff --cc debian/libcereal-dev.docs index 0000000,0000000..4456dc1 new file mode 100644 --- /dev/null +++ b/debian/libcereal-dev.docs @@@ -1,0 -1,0 +1,2 @@@ ++debian/tests/run-unit-test ++debian/README.test diff --cc debian/libcereal-dev.install index 0000000,0000000..62e3936 new file mode 100644 --- /dev/null +++ b/debian/libcereal-dev.install @@@ -1,0 -1,0 +1,5 @@@ ++usr/include ++CMakeLists.txt usr/share/doc/libcereal-dev/tests/ ++Config.cmake.in usr/share/doc/libcereal-dev/tests/ ++unittests usr/share/doc/libcereal-dev/tests/ ++usr/lib/*/cmake/cereal diff --cc debian/libcereal-doc.doc-base index 0000000,0000000..6884491 new file mode 100644 --- /dev/null +++ b/debian/libcereal-doc.doc-base @@@ -1,0 -1,0 +1,13 @@@ ++Document: libcereal ++Title: cereal - C++11 library for serialization ++Author: Randolph Voorhies, Shane Grant ++Abstract: cereal is a header-only C++11 serialization library. cereal takes ++ arbitrary data types and reversibly turns them into different representations, ++ such as compact binary encodings, XML, or JSON. cereal was designed to be ++ fast, light-weight, and easy to extend - it has no external dependencies and ++ can be easily bundled with other code or used standalone. ++Section: Programming/C++ ++ ++Format: html ++Files: /usr/share/doc/libcereal-dev/html/* ++Index: /usr/share/doc/libcereal-dev/html/index.html diff --cc debian/libcereal-doc.install index 0000000,0000000..68a9786 new file mode 100644 --- /dev/null +++ b/debian/libcereal-doc.install @@@ -1,0 -1,0 +1,1 @@@ ++obj-*/doc/html usr/share/doc/libcereal-dev/ diff --cc debian/patches/allow_unsigned_char.patch index 0000000,0000000..40fa1c2 new file mode 100644 --- /dev/null +++ b/debian/patches/allow_unsigned_char.patch @@@ -1,0 -1,0 +1,57 @@@ ++Author: "Aaron M. Ucko" ++Last-Update: Fri, 14 Apr 2023 09:37:59 -0400 ++Bug-Debian: https://bugs.debian.org/1034369 ++Description: Fix autopkgtest regression on non x86: cc1plus: all warnings being treated as errors ++ ++Index: b/unittests/map.hpp ++=================================================================== ++--- a/unittests/map.hpp +++++ b/unittests/map.hpp ++@@ -62,7 +62,7 @@ void test_map() ++ ++ std::map o_esplmap; ++ for(int j=0; j<100; ++j) ++- o_esplmap.insert({random_value(gen), { random_value(gen), random_value(gen) }}); +++ o_esplmap.insert({random_value(gen), { random_value(gen), random_value(gen) }}); ++ ++ std::ostringstream os; ++ { ++Index: b/unittests/multimap.hpp ++=================================================================== ++--- a/unittests/multimap.hpp +++++ b/unittests/multimap.hpp ++@@ -71,7 +71,7 @@ void test_multimap() ++ std::multimap o_esplmultimap; ++ for(int j=0; j<100; ++j) ++ { ++- auto key = random_value(gen); +++ auto key = random_value(gen); ++ o_esplmultimap.insert({key, { random_value(gen), random_value(gen) }}); ++ o_esplmultimap.insert({key, { random_value(gen), random_value(gen) }}); ++ } ++Index: b/unittests/unordered_map.hpp ++=================================================================== ++--- a/unittests/unordered_map.hpp +++++ b/unittests/unordered_map.hpp ++@@ -54,7 +54,7 @@ void test_unordered_map() ++ ++ std::unordered_map o_esplunordered_map; ++ for(int j=0; j<100; ++j) ++- o_esplunordered_map.insert({random_value(gen), { random_value(gen), random_value(gen) }}); +++ o_esplunordered_map.insert({random_value(gen), { random_value(gen), random_value(gen) }}); ++ ++ std::ostringstream os; ++ { ++Index: b/unittests/unordered_multimap.hpp ++=================================================================== ++--- a/unittests/unordered_multimap.hpp +++++ b/unittests/unordered_multimap.hpp ++@@ -71,7 +71,7 @@ void test_unordered_multimap() ++ std::unordered_multimap o_esplunordered_multimap; ++ for(int j=0; j<100; ++j) ++ { ++- auto key = random_value(gen); +++ auto key = random_value(gen); ++ o_esplunordered_multimap.insert({key, { random_value(gen), random_value(gen) }}); ++ o_esplunordered_multimap.insert({key, { random_value(gen), random_value(gen) }}); ++ } diff --cc debian/patches/drop-google-analytics index 0000000,0000000..cdc08d7 new file mode 100644 --- /dev/null +++ b/debian/patches/drop-google-analytics @@@ -1,0 -1,0 +1,21 @@@ ++Description: Drop google analytics ++Author: Michael R. Crusoe ++Forwarded: not-needed ++--- libcereal.orig/doc/footer.html +++++ libcereal/doc/footer.html ++@@ -17,15 +17,5 @@ ++ $doxygenversion ++ ++ ++- ++ ++ diff --cc debian/patches/series index 0000000,0000000..27ecd42 new file mode 100644 --- /dev/null +++ b/debian/patches/series @@@ -1,0 -1,0 +1,3 @@@ ++drop-google-analytics ++use_debian_packaged_rapidjson.patch ++allow_unsigned_char.patch diff --cc debian/patches/use_debian_packaged_rapidjson.patch index 0000000,0000000..d0981ac new file mode 100644 --- /dev/null +++ b/debian/patches/use_debian_packaged_rapidjson.patch @@@ -1,0 -1,0 +1,104 @@@ ++Author: Andreas Tille ++Last-Update: Sat, 05 Dec 2020 17:12:21 +0100 ++Bug-Debian: https://bugs.debian.org/976585 ++Description: Include Debian packaged rapidjson ++Forwarded: not-needed ++--- libcereal.orig/include/cereal/archives/json.hpp +++++ libcereal/include/cereal/archives/json.hpp ++@@ -41,30 +41,30 @@ ++ } ++ ++ // Inform rapidjson that assert will throw ++-#ifndef CEREAL_RAPIDJSON_ASSERT_THROWS ++-#define CEREAL_RAPIDJSON_ASSERT_THROWS ++-#endif // CEREAL_RAPIDJSON_ASSERT_THROWS +++#ifndef RAPIDJSON_ASSERT_THROWS +++#define RAPIDJSON_ASSERT_THROWS +++#endif // RAPIDJSON_ASSERT_THROWS ++ ++ // Override rapidjson assertions to throw exceptions by default ++-#ifndef CEREAL_RAPIDJSON_ASSERT ++-#define CEREAL_RAPIDJSON_ASSERT(x) if(!(x)){ \ +++#ifndef RAPIDJSON_ASSERT +++#define RAPIDJSON_ASSERT(x) if(!(x)){ \ ++ throw ::cereal::RapidJSONException("rapidjson internal assertion failure: " #x); } ++ #endif // RAPIDJSON_ASSERT ++ ++ // Enable support for parsing of nan, inf, -inf ++-#ifndef CEREAL_RAPIDJSON_WRITE_DEFAULT_FLAGS ++-#define CEREAL_RAPIDJSON_WRITE_DEFAULT_FLAGS kWriteNanAndInfFlag +++#ifndef RAPIDJSON_WRITE_DEFAULT_FLAGS +++#define RAPIDJSON_WRITE_DEFAULT_FLAGS kWriteNanAndInfFlag ++ #endif ++ ++ // Enable support for parsing of nan, inf, -inf ++-#ifndef CEREAL_RAPIDJSON_PARSE_DEFAULT_FLAGS ++-#define CEREAL_RAPIDJSON_PARSE_DEFAULT_FLAGS kParseFullPrecisionFlag | kParseNanAndInfFlag +++#ifndef RAPIDJSON_PARSE_DEFAULT_FLAGS +++#define RAPIDJSON_PARSE_DEFAULT_FLAGS kParseFullPrecisionFlag | kParseNanAndInfFlag ++ #endif ++ ++-#include "cereal/external/rapidjson/prettywriter.h" ++-#include "cereal/external/rapidjson/ostreamwrapper.h" ++-#include "cereal/external/rapidjson/istreamwrapper.h" ++-#include "cereal/external/rapidjson/document.h" +++#include "rapidjson/prettywriter.h" +++#include "rapidjson/ostreamwrapper.h" +++#include "rapidjson/istreamwrapper.h" +++#include "rapidjson/document.h" ++ #include "cereal/external/base64.hpp" ++ ++ #include ++@@ -107,8 +107,8 @@ ++ { ++ enum class NodeType { StartObject, InObject, StartArray, InArray }; ++ ++- using WriteStream = CEREAL_RAPIDJSON_NAMESPACE::OStreamWrapper; ++- using JSONWriter = CEREAL_RAPIDJSON_NAMESPACE::PrettyWriter; +++ using WriteStream = RAPIDJSON_NAMESPACE::OStreamWrapper; +++ using JSONWriter = RAPIDJSON_NAMESPACE::PrettyWriter; ++ ++ public: ++ /*! @name Common Functionality ++@@ -255,7 +255,7 @@ ++ //! Saves a double to the current node ++ void saveValue(double d) { itsWriter.Double(d); } ++ //! Saves a string to the current node ++- void saveValue(std::string const & s) { itsWriter.String(s.c_str(), static_cast( s.size() )); } +++ void saveValue(std::string const & s) { itsWriter.String(s.c_str(), static_cast( s.size() )); } ++ //! Saves a const char * to the current node ++ void saveValue(char const * s) { itsWriter.String(s); } ++ //! Saves a nullptr to the current node ++@@ -419,11 +419,11 @@ ++ class JSONInputArchive : public InputArchive, public traits::TextArchive ++ { ++ private: ++- using ReadStream = CEREAL_RAPIDJSON_NAMESPACE::IStreamWrapper; ++- typedef CEREAL_RAPIDJSON_NAMESPACE::GenericValue> JSONValue; +++ using ReadStream = RAPIDJSON_NAMESPACE::IStreamWrapper; +++ typedef RAPIDJSON_NAMESPACE::GenericValue> JSONValue; ++ typedef JSONValue::ConstMemberIterator MemberIterator; ++ typedef JSONValue::ConstValueIterator ValueIterator; ++- typedef CEREAL_RAPIDJSON_NAMESPACE::Document::GenericValue GenericValue; +++ typedef RAPIDJSON_NAMESPACE::Document::GenericValue GenericValue; ++ ++ public: ++ /*! @name Common Functionality ++@@ -657,7 +657,7 @@ ++ //! Loads a value from the current node - string overload ++ void loadValue(std::string & val) { search(); val = itsIteratorStack.back().value().GetString(); ++itsIteratorStack.back(); } ++ //! Loads a nullptr from the current node ++- void loadValue(std::nullptr_t&) { search(); CEREAL_RAPIDJSON_ASSERT(itsIteratorStack.back().value().IsNull()); ++itsIteratorStack.back(); } +++ void loadValue(std::nullptr_t&) { search(); RAPIDJSON_ASSERT(itsIteratorStack.back().value().IsNull()); ++itsIteratorStack.back(); } ++ ++ // Special cases to handle various flavors of long, which tend to conflict with ++ // the int32_t or int64_t on various compiler/OS combinations. MSVC doesn't need any of this. ++@@ -737,7 +737,7 @@ ++ const char * itsNextName; //!< Next name set by NVP ++ ReadStream itsReadStream; //!< Rapidjson write stream ++ std::vector itsIteratorStack; //!< 'Stack' of rapidJSON iterators ++- CEREAL_RAPIDJSON_NAMESPACE::Document itsDocument; //!< Rapidjson document +++ RAPIDJSON_NAMESPACE::Document itsDocument; //!< Rapidjson document ++ }; ++ ++ // ###################################################################### diff --cc debian/rules index 0000000,0000000..708c42c new file mode 100755 --- /dev/null +++ b/debian/rules @@@ -1,0 -1,0 +1,19 @@@ ++#!/usr/bin/make -f ++ ++ifneq (,$(filter $(DEB_HOST_ARCH),armel m68k mips mipsel powerpc sh4)) ++ EXTRA=-DCMAKE_CXX_STANDARD_LIBRARIES=-latomic ++endif ++ ++%: ++ dh $@ ++ ++override_dh_auto_configure: ++ dh_auto_configure -- -DSKIP_PORTABILITY_TEST=on -DWITH_WERROR=OFF $(EXTRA) ++ ++override_dh_auto_build: ++ dh_auto_build -- all doc ++ ++override_dh_install: ++ dh_install --exclude license ++ find debian/*/usr/share/doc -name CMakeLists.txt -exec sed -i '/add_subdirectory(doc)/d' \{\} \; ++ find debian/ -name LICENSE -delete diff --cc debian/salsa-ci.yml index 0000000,0000000..33c3a64 new file mode 100644 --- /dev/null +++ b/debian/salsa-ci.yml @@@ -1,0 -1,0 +1,4 @@@ ++--- ++include: ++ - https://salsa.debian.org/salsa-ci-team/pipeline/raw/master/salsa-ci.yml ++ - https://salsa.debian.org/salsa-ci-team/pipeline/raw/master/pipeline-jobs.yml diff --cc debian/source/format index 0000000,0000000..163aaf8 new file mode 100644 --- /dev/null +++ b/debian/source/format @@@ -1,0 -1,0 +1,1 @@@ ++3.0 (quilt) diff --cc debian/source/lintian-overrides index 0000000,0000000..0d3515b new file mode 100644 --- /dev/null +++ b/debian/source/lintian-overrides @@@ -1,0 -1,0 +1,2 @@@ ++# False positive ++libcereal source: source-is-missing [include/cereal/external/rapidxml/manual.html] diff --cc debian/tests/control index 0000000,0000000..199fb5e new file mode 100644 --- /dev/null +++ b/debian/tests/control @@@ -1,0 -1,0 +1,3 @@@ ++Tests: run-unit-test ++Depends: @, @builddeps@ ++Restrictions: allow-stderr diff --cc debian/tests/run-unit-test index 0000000,0000000..22cd452 new file mode 100755 --- /dev/null +++ b/debian/tests/run-unit-test @@@ -1,0 -1,0 +1,19 @@@ ++#!/bin/sh ++ ++pkg=libcereal-dev ++CUR_DIR=`pwd` ++ ++if [ "$AUTOPKGTEST_TMP" = "" ] ; then ++ AUTOPKGTEST_TMP=`mktemp -d /tmp/${pkg}-test.XXXXXX` ++ trap "rm -rf $AUTOPKGTEST_TMP" 0 INT QUIT ABRT PIPE TERM ++fi ++ ++cd $AUTOPKGTEST_TMP ++ ++# Copy relevant files ++cp -a $CUR_DIR/sandbox . ++cp -rs /usr/share/doc/${pkg}/tests/* . ++ ++for file in `find . -name "*.gz"`; do gunzip < ${file} > ${file%%.gz}; done ++cmake -DONLY_TEST=on -DSKIP_PORTABILITY_TEST=on -DBUILD_SANDBOX=True . ++make diff --cc debian/upstream/metadata index 0000000,0000000..5b7b9b2 new file mode 100644 --- /dev/null +++ b/debian/upstream/metadata @@@ -1,0 -1,0 +1,4 @@@ ++Bug-Database: https://github.com/USCiLab/cereal/issues ++Bug-Submit: https://github.com/USCiLab/cereal/issues/new ++Repository: https://github.com/USCiLab/cereal.git ++Repository-Browse: https://github.com/USCiLab/cereal diff --cc debian/watch index 0000000,0000000..2f20e95 new file mode 100644 --- /dev/null +++ b/debian/watch @@@ -1,0 -1,0 +1,4 @@@ ++version=4 ++ ++opts="repacksuffix=+dfsg,dversionmangle=auto,repack,compression=xz,filenamemangle=s/.+\/v?(\d\S*)\.tar\.gz/libcereal-$1\.tar\.gz/" \ ++ https://github.com/USCiLab/cereal/tags .*/v(\d[\d.-]+)\.(?:tar(?:\.gz|\.bz2)?|tgz)