From fc5f6b094ef63da65dceea8abd360e6230e6cb16 Mon Sep 17 00:00:00 2001 From: Paul Ripke Date: Tue, 13 Oct 2020 00:34:06 +1100 Subject: [PATCH] wip/cereal: Upgrade from 1.2.2 to 1.3.0. Tested as a dependency of wip/PrusaSlicer. From https://github.com/USCiLab/cereal/releases/tag/v1.3.0 This is a feature and bug fix release for cereal. This release contains a few new features, numerous quality of life improvements, and bug fixes. Many of these come from community contributions. With this release, the develop branch is being removed in favor of a single default branch. This means that tagged releases should be used in favor of trusting the master branch as being stable. The development branch for documentation, gh-pages-develop, is also being removed. This change comes with two small side benefits: pull requests will always be against the correct branch, and it will be easy to see development activity at a glance. New features include: - Deferred serialization for smart pointers (#185) - Initial support for C++17 standard library variant and optional (thanks to @arximboldi, #448) - Support for std::atomic (thanks to @bluescarni, #277) Fixes and enhancements include: - Vastly improved continuous integration testing (#568, #569) - Fixed several issues related to compilation on newer compilers (#579, #587, #515) - Fixed warnings with -Wconversion and -Wdocumentation (thanks to @WSoptics, #423) - Performance improvements for polymorphic serialization (#354) Minor fixes and enhancements include: - Fixed a bug related to CEREAL_REGISTER_DYNAMIC_INIT with shared libraries (thanks to @M2tM, #523) - Avoid unnecessary undefined behavior with StaticObject (thanks to @erichkeane, #470) - New version.hpp file describes cereal version (#444) - Ability to disable size=dynamic attribute in the XML archive (thanks to @hoensr, #401) Other Notes - The static checking for minimal serialization has been relaxed as there were many legitimate cases it was interfering with (thanks to @h-2, #565) --- cereal/Makefile | 16 +++++----------- cereal/PLIST | 11 ++++++----- cereal/distinfo | 8 ++++---- 3 files changed, 15 insertions(+), 20 deletions(-) diff --git a/cereal/Makefile b/cereal/Makefile index 64cfa8454b..0dd5b366a2 100644 --- a/cereal/Makefile +++ b/cereal/Makefile @@ -1,15 +1,10 @@ # $NetBSD$ -# -########################################################### -# Generated by fbsd2pkg # -# Thu Sep 13 10:57:41 CDT 2018 # -########################################################### -DISTNAME= cereal-${PV} -CATEGORIES= biology +DISTNAME= cereal-1.3.0 +CATEGORIES= math MASTER_SITES= ${MASTER_SITE_GITHUB:=USCiLab/} GITHUB_PROJECT= cereal -GITHUB_TAG= v${PV} +GITHUB_TAG= v${PKGVERSION_NOREV} MAINTAINER= bacon@NetBSD.org HOMEPAGE= https://github.com/USCiLab/cereal @@ -22,9 +17,8 @@ USE_CMAKE= yes # Requires stubs-32.h on CentOS, not provided by pkgsrc CMAKE_ARGS+= -DSKIP_PORTABILITY_TEST=ON -CFLAGS+= -Wno-unused-private-field - -PV= 1.2.2 +# Required for boost as of pkgsrc-2020Q1. +CFLAGS+= -Wno-old-style-cast .include "../../devel/boost-libs/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/cereal/PLIST b/cereal/PLIST index 859a676cd8..7570f16b31 100644 --- a/cereal/PLIST +++ b/cereal/PLIST @@ -14,6 +14,7 @@ include/cereal/details/traits.hpp include/cereal/details/util.hpp include/cereal/external/base64.hpp include/cereal/external/rapidjson/allocators.h +include/cereal/external/rapidjson/cursorstreamwrapper.h include/cereal/external/rapidjson/document.h include/cereal/external/rapidjson/encodedstream.h include/cereal/external/rapidjson/encodings.h @@ -55,7 +56,9 @@ include/cereal/external/rapidxml/rapidxml_iterators.hpp include/cereal/external/rapidxml/rapidxml_print.hpp include/cereal/external/rapidxml/rapidxml_utils.hpp include/cereal/macros.hpp +include/cereal/specialize.hpp include/cereal/types/array.hpp +include/cereal/types/atomic.hpp include/cereal/types/base_class.hpp include/cereal/types/bitset.hpp include/cereal/types/boost_variant.hpp @@ -69,6 +72,7 @@ include/cereal/types/functional.hpp include/cereal/types/list.hpp include/cereal/types/map.hpp include/cereal/types/memory.hpp +include/cereal/types/optional.hpp include/cereal/types/polymorphic.hpp include/cereal/types/queue.hpp include/cereal/types/set.hpp @@ -79,10 +83,7 @@ include/cereal/types/unordered_map.hpp include/cereal/types/unordered_set.hpp include/cereal/types/utility.hpp include/cereal/types/valarray.hpp +include/cereal/types/variant.hpp include/cereal/types/vector.hpp +include/cereal/version.hpp share/cmake/cereal/cereal-config.cmake -@pkgdir share/examples -@pkgdir share/doc -@pkgdir man/man1 -@pkgdir lib -@pkgdir bin diff --git a/cereal/distinfo b/cereal/distinfo index afa22f4489..30f3aa55f2 100644 --- a/cereal/distinfo +++ b/cereal/distinfo @@ -1,6 +1,6 @@ $NetBSD$ -SHA1 (cereal-1.2.2.tar.gz) = ffddf5fc5313cfbb893e07823ca8c473084eebca -RMD160 (cereal-1.2.2.tar.gz) = 9ccc6dcc4df8acfccb5bf50417961649601949a6 -SHA512 (cereal-1.2.2.tar.gz) = 9567b2e19add9446b24f8afd122eea09ba6ecd1a090335cf0ab31fdc8f64c6c97daa3d9eaf0801c36a770737488e0eebf81d96d7b7a65deed30da6130f2d47eb -Size (cereal-1.2.2.tar.gz) = 335759 bytes +SHA1 (cereal-1.3.0.tar.gz) = e37634e0ee4063ac4694a65f5ae4742d164f5764 +RMD160 (cereal-1.3.0.tar.gz) = 2d5b038481f696f680cbb48246a7c81a74998da3 +SHA512 (cereal-1.3.0.tar.gz) = 2bb640a222d4efe7c624c6ec3e755fecae00ef59e91c4db462e233546c5afe73c065ba1d16d9600f7cd3cc185593109148008b0b2b870208e2f1d6984fd40c72 +Size (cereal-1.3.0.tar.gz) = 374585 bytes