diff options
author | wiz <wiz@pkgsrc.org> | 2017-07-29 10:00:03 +0000 |
---|---|---|
committer | wiz <wiz@pkgsrc.org> | 2017-07-29 10:00:03 +0000 |
commit | 3bd702925e295aaf80df2b79e333b66f487ff04c (patch) | |
tree | 010e6e0dc023f7b84ac7a19882c4034237444caa | |
parent | 86f10ce65265aa7a0f533b12b9bbe7013db6ffee (diff) | |
download | pkgsrc-3bd702925e295aaf80df2b79e333b66f487ff04c.tar.gz |
boost-headers: do not use auto_ptr
Fixes build of gnucash-wip.
Reported upstream as
https://github.com/boostorg/locale/pull/19
Bump PKGREVISION.
5 files changed, 102 insertions, 2 deletions
diff --git a/devel/boost-headers/Makefile b/devel/boost-headers/Makefile index 8f010a6598f..16652c32111 100644 --- a/devel/boost-headers/Makefile +++ b/devel/boost-headers/Makefile @@ -1,6 +1,6 @@ -# $NetBSD: Makefile,v 1.41 2017/06/27 20:08:59 joerg Exp $ +# $NetBSD: Makefile,v 1.42 2017/07/29 10:00:03 wiz Exp $ -PKGREVISION= 2 +PKGREVISION= 3 BOOST_PACKAGE= headers BOOST_COMMENT= (build-time headers) BOOST_CONFIG= generate diff --git a/meta-pkgs/boost/patches/patch-boost_locale_format.hpp b/meta-pkgs/boost/patches/patch-boost_locale_format.hpp new file mode 100644 index 00000000000..eaeff26fe4f --- /dev/null +++ b/meta-pkgs/boost/patches/patch-boost_locale_format.hpp @@ -0,0 +1,16 @@ +$NetBSD: patch-boost_locale_format.hpp,v 1.1 2017/07/29 10:00:03 wiz Exp $ + +Avoid deprecated auto_ptr. +https://github.com/boostorg/locale/pull/19 + +--- boost/locale/format.hpp.orig 2017-04-17 02:22:21.000000000 +0000 ++++ boost/locale/format.hpp +@@ -121,7 +121,7 @@ namespace boost { + + std::ios_base &ios_; + struct data; +- std::auto_ptr<data> d; ++ std::unique_ptr<data> d; + }; + + } diff --git a/meta-pkgs/boost/patches/patch-boost_locale_generator.hpp b/meta-pkgs/boost/patches/patch-boost_locale_generator.hpp new file mode 100644 index 00000000000..8619d033ef4 --- /dev/null +++ b/meta-pkgs/boost/patches/patch-boost_locale_generator.hpp @@ -0,0 +1,16 @@ +$NetBSD: patch-boost_locale_generator.hpp,v 1.1 2017/07/29 10:00:03 wiz Exp $ + +Avoid deprecated auto_ptr. +https://github.com/boostorg/locale/pull/19 + +--- boost/locale/generator.hpp.orig 2017-04-17 02:22:21.000000000 +0000 ++++ boost/locale/generator.hpp +@@ -220,7 +220,7 @@ namespace boost { + void operator=(generator const &); + + struct data; +- std::auto_ptr<data> d; ++ std::unique_ptr<data> d; + }; + + } diff --git a/meta-pkgs/boost/patches/patch-boost_locale_localization__backend.hpp b/meta-pkgs/boost/patches/patch-boost_locale_localization__backend.hpp new file mode 100644 index 00000000000..fad39b2eaa1 --- /dev/null +++ b/meta-pkgs/boost/patches/patch-boost_locale_localization__backend.hpp @@ -0,0 +1,33 @@ +$NetBSD: patch-boost_locale_localization__backend.hpp,v 1.1 2017/07/29 10:00:03 wiz Exp $ + +Avoid deprecated auto_ptr. +https://github.com/boostorg/locale/pull/19 + +--- boost/locale/localization_backend.hpp.orig 2017-04-17 02:22:21.000000000 +0000 ++++ boost/locale/localization_backend.hpp +@@ -104,14 +104,14 @@ namespace boost { + /// + /// Create new localization backend according to current settings. + /// +- std::auto_ptr<localization_backend> get() const; ++ std::unique_ptr<localization_backend> get() const; + + /// + /// Add new backend to the manager, each backend should be uniquely defined by its name. + /// + /// This library provides: "icu", "posix", "winapi" and "std" backends. + /// +- void add_backend(std::string const &name,std::auto_ptr<localization_backend> backend); ++ void add_backend(std::string const &name,std::unique_ptr<localization_backend> backend); + + /// + /// Clear backend +@@ -143,7 +143,7 @@ namespace boost { + static localization_backend_manager global(); + private: + class impl; +- std::auto_ptr<impl> pimpl_; ++ std::unique_ptr<impl> pimpl_; + }; + + } // locale diff --git a/meta-pkgs/boost/patches/patch-boost_locale_util.hpp b/meta-pkgs/boost/patches/patch-boost_locale_util.hpp new file mode 100644 index 00000000000..25b4e4c416c --- /dev/null +++ b/meta-pkgs/boost/patches/patch-boost_locale_util.hpp @@ -0,0 +1,35 @@ +$NetBSD: patch-boost_locale_util.hpp,v 1.1 2017/07/29 10:00:03 wiz Exp $ + +Avoid deprecated auto_ptr. +https://github.com/boostorg/locale/pull/19 + +--- boost/locale/util.hpp.orig 2017-04-17 02:22:21.000000000 +0000 ++++ boost/locale/util.hpp +@@ -176,15 +176,15 @@ namespace util { + /// This function creates a \a base_converter that can be used for conversion between UTF-8 and + /// unicode code points + /// +- BOOST_LOCALE_DECL std::auto_ptr<base_converter> create_utf8_converter(); ++ BOOST_LOCALE_DECL std::unique_ptr<base_converter> create_utf8_converter(); + /// + /// This function creates a \a base_converter that can be used for conversion between single byte + /// character encodings like ISO-8859-1, koi8-r, windows-1255 and Unicode code points, + /// + /// If \a encoding is not supported, empty pointer is returned. You should check if +- /// std::auto_ptr<base_converter>::get() != 0 ++ /// std::unique_ptr<base_converter>::get() != 0 + /// +- BOOST_LOCALE_DECL std::auto_ptr<base_converter> create_simple_converter(std::string const &encoding); ++ BOOST_LOCALE_DECL std::unique_ptr<base_converter> create_simple_converter(std::string const &encoding); + + + /// +@@ -199,7 +199,7 @@ namespace util { + /// of wide encoding type + /// + BOOST_LOCALE_DECL +- std::locale create_codecvt(std::locale const &in,std::auto_ptr<base_converter> cvt,character_facet_type type); ++ std::locale create_codecvt(std::locale const &in,std::unique_ptr<base_converter> cvt,character_facet_type type); + + /// + /// Install utf8 codecvt to UTF-16 or UTF-32 into locale \a in and return |