diff options
author | Sergey Popov <pinkbyte@gentoo.org> | 2016-01-27 09:14:58 +0300 |
---|---|---|
committer | Sergey Popov <pinkbyte@gentoo.org> | 2016-01-27 09:14:58 +0300 |
commit | 02d60f710015005b938d501e5f4f0615c1667fda (patch) | |
tree | 262fcc2d67608d9b1923e3611a00cb95b42299aa /dev-libs/boost/files | |
parent | dev-libs/xmlwrapp: drop old versions (diff) | |
download | gentoo-02d60f710015005b938d501e5f4f0615c1667fda.tar.gz gentoo-02d60f710015005b938d501e5f4f0615c1667fda.tar.bz2 gentoo-02d60f710015005b938d501e5f4f0615c1667fda.zip |
dev-libs/boost: drop old masked versions
Package-Manager: portage-2.2.26
Diffstat (limited to 'dev-libs/boost/files')
-rw-r--r-- | dev-libs/boost/files/boost-1.48.0-mpi_python3.patch | 95 | ||||
-rw-r--r-- | dev-libs/boost/files/boost-1.52.0-locale-utf.patch | 52 | ||||
-rw-r--r-- | dev-libs/boost/files/boost-1.52.0-tuple.patch | 11 | ||||
-rw-r--r-- | dev-libs/boost/files/boost-1.53.0-glibc-2.18-compat.patch | 18 | ||||
-rw-r--r-- | dev-libs/boost/files/boost-1.53.0-library_status.patch | 57 | ||||
-rw-r--r-- | dev-libs/boost/files/remove-toolset-1.48.0.patch | 11 |
6 files changed, 0 insertions, 244 deletions
diff --git a/dev-libs/boost/files/boost-1.48.0-mpi_python3.patch b/dev-libs/boost/files/boost-1.48.0-mpi_python3.patch deleted file mode 100644 index a32eca94b90b..000000000000 --- a/dev-libs/boost/files/boost-1.48.0-mpi_python3.patch +++ /dev/null @@ -1,95 +0,0 @@ -https://svn.boost.org/trac/boost/ticket/4657 -https://svn.boost.org/trac/boost/changeset/76290 - ---- libs/mpi/src/python/datatypes.cpp -+++ libs/mpi/src/python/datatypes.cpp -@@ -17,7 +17,9 @@ - - void export_datatypes() - { -+#if PY_MAJOR_VERSION < 3 - register_serialized(long(0), &PyInt_Type); -+#endif - register_serialized(false, &PyBool_Type); - register_serialized(double(0.0), &PyFloat_Type); - } ---- libs/mpi/src/python/py_environment.cpp -+++ libs/mpi/src/python/py_environment.cpp -@@ -11,6 +11,9 @@ - * This file reflects the Boost.MPI "environment" class into Python - * methods at module level. - */ -+ -+#include <locale> -+#include <string> - #include <boost/python.hpp> - #include <boost/mpi.hpp> - -@@ -50,11 +53,64 @@ - - // If anything changed, convert C-style argc/argv into Python argv - if (mpi_argv != my_argv) -+ { -+#if PY_MAJOR_VERSION >= 3 -+ -+ wchar_t **argv_copy = (wchar_t **)PyMem_Malloc(sizeof(wchar_t*)*mpi_argc); -+ /* We need a second copy, as Python might modify the first one. */ -+ wchar_t **argv_copy2 = (wchar_t **)PyMem_Malloc(sizeof(wchar_t*)*mpi_argc); -+ -+ if (!argv_copy || !argv_copy2) { -+ fprintf(stderr, "out of memory\n"); -+ return false; -+ } -+ -+ std::locale mylocale; -+ mbstate_t mystate; -+ -+ const std::codecvt<char, wchar_t, mbstate_t>& myfacet = -+ std::use_facet<std::codecvt<char, wchar_t, mbstate_t> >(mylocale); -+ -+ for (int i = 0; i < mpi_argc; i++) -+ { -+ size_t length = strlen(mpi_argv[i]); -+ -+ wchar_t *dest = (wchar_t *) PyMem_Malloc(sizeof(wchar_t) * (length + 1)); -+ -+ const char *from_next; -+ wchar_t *to_next; -+ -+ std::codecvt<wchar_t,char,mbstate_t>::result myresult = -+ myfacet.out(mystate, -+ mpi_argv[i], mpi_argv[i] + length + 1, from_next, -+ dest, dest+length+1, to_next); -+ -+ if (myresult != std::codecvt<wchar_t,char,mbstate_t>::ok ) -+ { -+ fprintf(stderr, "failure translating argv\n"); -+ return 1; -+ } -+ -+ argv_copy2[i] = argv_copy[i] = dest; -+ if (!argv_copy[i]) -+ return false; -+ } -+ -+ PySys_SetArgv(mpi_argc, argv_copy); -+ -+ for (int i = 0; i < mpi_argc; i++) { -+ PyMem_Free(argv_copy2[i]); -+ } -+ PyMem_Free(argv_copy); -+ PyMem_Free(argv_copy2); -+#else - PySys_SetArgv(mpi_argc, mpi_argv); -+#endif -+ } - -- for (int arg = 0; arg < my_argc; ++arg) -- free(my_argv[arg]); -- delete [] my_argv; -+ for (int arg = 0; arg < mpi_argc; ++arg) -+ free(mpi_argv[arg]); -+ delete [] mpi_argv; - - return true; - } diff --git a/dev-libs/boost/files/boost-1.52.0-locale-utf.patch b/dev-libs/boost/files/boost-1.52.0-locale-utf.patch deleted file mode 100644 index 7ef51e94797b..000000000000 --- a/dev-libs/boost/files/boost-1.52.0-locale-utf.patch +++ /dev/null @@ -1,52 +0,0 @@ -Index: boost/locale/utf.hpp -=================================================================== ---- boost/locale/utf.hpp (revision 81589) -+++ boost/locale/utf.hpp (revision 81590) -@@ -219,16 +219,22 @@ - if(BOOST_LOCALE_UNLIKELY(p==e)) - return incomplete; - tmp = *p++; -+ if (!is_trail(tmp)) -+ return illegal; - c = (c << 6) | ( tmp & 0x3F); - case 2: - if(BOOST_LOCALE_UNLIKELY(p==e)) - return incomplete; - tmp = *p++; -+ if (!is_trail(tmp)) -+ return illegal; - c = (c << 6) | ( tmp & 0x3F); - case 1: - if(BOOST_LOCALE_UNLIKELY(p==e)) - return incomplete; - tmp = *p++; -+ if (!is_trail(tmp)) -+ return illegal; - c = (c << 6) | ( tmp & 0x3F); - } - -Index: libs/locale/test/test_codepage_converter.cpp -=================================================================== ---- libs/locale/test/test_codepage_converter.cpp (revision 81589) -+++ libs/locale/test/test_codepage_converter.cpp (revision 81590) -@@ -140,6 +140,20 @@ - TEST_TO("\xf8\x90\x80\x80\x80",illegal); // 400 0000 - TEST_TO("\xfd\xbf\xbf\xbf\xbf\xbf",illegal); // 7fff ffff - -+ std::cout << "-- Invalid trail" << std::endl; -+ TEST_TO("\xC2\x7F",illegal); -+ TEST_TO("\xdf\x7F",illegal); -+ TEST_TO("\xe0\x7F\x80",illegal); -+ TEST_TO("\xef\xbf\x7F",illegal); -+ TEST_TO("\xe0\x7F\x80",illegal); -+ TEST_TO("\xef\xbf\x7F",illegal); -+ TEST_TO("\xf0\x7F\x80\x80",illegal); -+ TEST_TO("\xf4\x7f\xbf\xbf",illegal); -+ TEST_TO("\xf0\x90\x7F\x80",illegal); -+ TEST_TO("\xf4\x8f\x7F\xbf",illegal); -+ TEST_TO("\xf0\x90\x80\x7F",illegal); -+ TEST_TO("\xf4\x8f\xbf\x7F",illegal); -+ - std::cout << "-- Invalid length" << std::endl; - - /// Test that this actually works diff --git a/dev-libs/boost/files/boost-1.52.0-tuple.patch b/dev-libs/boost/files/boost-1.52.0-tuple.patch deleted file mode 100644 index 08bab8600b86..000000000000 --- a/dev-libs/boost/files/boost-1.52.0-tuple.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- boost/signals2/detail/variadic_slot_invoker.hpp.org 2012-11-20 09:15:55.000000000 +0400 -+++ boost/signals2/detail/variadic_slot_invoker.hpp 2012-11-20 09:19:56.000000000 +0400 -@@ -20,7 +20,7 @@ - // if compiler has std::tuple use it instead of boost::tuple - // because boost::tuple does not have variadic template support at present. - #ifdef BOOST_NO_CXX11_HDR_TUPLE --#include <boost/tuple.hpp> -+#include <boost/tuple/tuple.hpp> - #define BOOST_SIGNALS2_TUPLE boost::tuple - #else - #include <tuple> diff --git a/dev-libs/boost/files/boost-1.53.0-glibc-2.18-compat.patch b/dev-libs/boost/files/boost-1.53.0-glibc-2.18-compat.patch deleted file mode 100644 index 54d2e2990205..000000000000 --- a/dev-libs/boost/files/boost-1.53.0-glibc-2.18-compat.patch +++ /dev/null @@ -1,18 +0,0 @@ -Patch for compatibility with glibc 2.18 -Gentoo bugreport: https://bugs.gentoo.org/show_bug.cgi?id=482372 -Upstream fix: https://svn.boost.org/trac/boost/changeset/84950 - ---- boost_1_53_0/boost/cstdint.hpp 2012-12-11 22:42:26.000000000 +0800 -+++ boost_1_53_0.fix/boost/cstdint.hpp 2013-08-25 20:48:53.683000000 +0800 -@@ -41,7 +41,10 @@ - // so we disable use of stdint.h when GLIBC does not define __GLIBC_HAVE_LONG_LONG. - // See https://svn.boost.org/trac/boost/ticket/3548 and http://sources.redhat.com/bugzilla/show_bug.cgi?id=10990 - // --#if defined(BOOST_HAS_STDINT_H) && (!defined(__GLIBC__) || defined(__GLIBC_HAVE_LONG_LONG)) -+#if defined(BOOST_HAS_STDINT_H) \ -+ && (!defined(__GLIBC__) \ -+ || defined(__GLIBC_HAVE_LONG_LONG) \ -+ || (defined(__GLIBC__) && ((__GLIBC__ > 2) || ((__GLIBC__ == 2) && (__GLIBC_MINOR__ >= 17))))) - - // The following #include is an implementation artifact; not part of interface. - # ifdef __hpux diff --git a/dev-libs/boost/files/boost-1.53.0-library_status.patch b/dev-libs/boost/files/boost-1.53.0-library_status.patch deleted file mode 100644 index 7d10461795f4..000000000000 --- a/dev-libs/boost/files/boost-1.53.0-library_status.patch +++ /dev/null @@ -1,57 +0,0 @@ ---- tools_orig/regression/src/library_status.cpp 2012-12-11 15:42:26.000000000 +0100 -+++ tools/regression/src/library_status.cpp 2013-07-11 16:15:54.000000000 +0200 -@@ -171,16 +171,17 @@ - // find_element ------------------------------------------------------------// - -+ struct element_equal { -+ const string & m_name; -+ element_equal(const string & name) : -+ m_name(name) -+ {} -+ bool operator()(const xml::element_ptr & xep) const { -+ return xep.get()->name == m_name; -+ } -+ }; -+ - xml::element_list::const_iterator find_element( - const xml::element & root, const string & name - ){ -- struct element_equal { -- const string & m_name; -- element_equal(const string & name) : -- m_name(name) -- {} -- bool operator()(const xml::element_ptr & xep) const { -- return xep.get()->name == m_name; -- } -- }; - return std::find_if( - root.elements.begin(), -@@ -203,17 +204,18 @@ - // attribute_value ----------------------------------------------------------// - -+ struct attribute_equal { -+ const string & m_name; -+ attribute_equal(const string & name) : -+ m_name(name) -+ {} -+ bool operator()(const xml::attribute & a) const { -+ return a.name == m_name; -+ } -+ }; -+ - const string & attribute_value( - const xml::element & element, - const string & attribute_name - ){ -- struct attribute_equal { -- const string & m_name; -- attribute_equal(const string & name) : -- m_name(name) -- {} -- bool operator()(const xml::attribute & a) const { -- return a.name == m_name; -- } -- }; - xml::attribute_list::const_iterator itr; - itr = std::find_if( diff --git a/dev-libs/boost/files/remove-toolset-1.48.0.patch b/dev-libs/boost/files/remove-toolset-1.48.0.patch deleted file mode 100644 index df9152933788..000000000000 --- a/dev-libs/boost/files/remove-toolset-1.48.0.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- boostcpp.jam -+++ boostcpp.jam -@@ -377,7 +377,7 @@ - if $(layout) = versioned - { - result = [ common.format-name -- <base> <toolset> <threading> <runtime> -$(BOOST_VERSION_TAG) -+ <base> <threading> <runtime> -$(BOOST_VERSION_TAG) - -$(BUILD_ID) - : $(name) : $(type) : $(property-set) ] ; - } |