[pkg-boost-commits] r14487 - boost/trunk/debian/patches
Steven Michael Robbins
smr at alioth.debian.org
Sat Sep 5 17:55:40 UTC 2009
Author: smr
Date: 2009-09-05 17:55:40 +0000 (Sat, 05 Sep 2009)
New Revision: 14487
Removed:
boost/trunk/debian/patches/boost_python_translate_exception.patch
boost/trunk/debian/patches/bootstrap.patch
boost/trunk/debian/patches/function-template.patch
boost/trunk/debian/patches/mpi-python.patch
boost/trunk/debian/patches/python-enum-same-value.patch
boost/trunk/debian/patches/python-generic-call.patch
boost/trunk/debian/patches/wave-cpp.patch
Modified:
boost/trunk/debian/patches/series
Log:
Remove patches applied upstream for 1.40.
Deleted: boost/trunk/debian/patches/boost_python_translate_exception.patch
===================================================================
--- boost/trunk/debian/patches/boost_python_translate_exception.patch 2009-09-05 17:54:11 UTC (rev 14486)
+++ boost/trunk/debian/patches/boost_python_translate_exception.patch 2009-09-05 17:55:40 UTC (rev 14487)
@@ -1,13 +0,0 @@
-Taken from upstream Ticket 2582
-https://svn.boost.org/trac/boost/attachment/ticket/2582/boost_python_translate_exception.patch
-
---- boost1.38-1.38.0.orig/boost/python/detail/translate_exception.hpp
-+++ boost1.38-1.38.0/boost/python/detail/translate_exception.hpp
-@@ -9,6 +9,7 @@
-
- # include <boost/call_traits.hpp>
- # include <boost/type_traits/add_const.hpp>
-+# include <boost/type_traits/add_reference.hpp>
-
- # include <boost/function/function0.hpp>
-
Deleted: boost/trunk/debian/patches/bootstrap.patch
===================================================================
--- boost/trunk/debian/patches/bootstrap.patch 2009-09-05 17:54:11 UTC (rev 14486)
+++ boost/trunk/debian/patches/bootstrap.patch 2009-09-05 17:55:40 UTC (rev 14487)
@@ -1,20 +0,0 @@
-Date: Mon, 4 May 2009 16:17:46 -0400
-From: "Matthew L. Creech" <mlcreech at gmail.com>
-To: boost at lists.boost.org
-Subject: [boost] [PATCH] Typo in bootstrap.sh
-
-Boost fails to install when LIBDIR isn't specified explicitly and
-isn't "/lib", due to a typo in bootstrap.sh. Trivial patch below.
-
-
---- boost_1_39_0.orig/bootstrap.sh
-+++ boost_1_39_0/bootstrap.sh
-@@ -249,7 +249,7 @@
- fi
-
- if test "x$LIBDIR" = x; then
-- LIBDIR="$EXPREFIX/lib"
-+ LIBDIR="$EPREFIX/lib"
- fi
-
- if test "x$INCLUDEDIR" = x; then
Deleted: boost/trunk/debian/patches/function-template.patch
===================================================================
--- boost/trunk/debian/patches/function-template.patch 2009-09-05 17:54:11 UTC (rev 14486)
+++ boost/trunk/debian/patches/function-template.patch 2009-09-05 17:55:40 UTC (rev 14487)
@@ -1,16 +0,0 @@
-Reported upstream as https://svn.boost.org/trac/boost/ticket/2469
-
---- boost1.37-1.37.0.orig/boost/function/function_template.hpp
-+++ boost1.37-1.37.0/boost/function/function_template.hpp
-@@ -950,10 +950,10 @@
- f.vtable->manager(f.functor, this->functor,
- boost::detail::function::move_functor_tag);
- f.vtable = 0;
--#if !defined(BOOST_NO_EXCEPTIONS)
- } else {
- clear();
- }
-+#if !defined(BOOST_NO_EXCEPTIONS)
- } catch (...) {
- vtable = 0;
- throw;
Deleted: boost/trunk/debian/patches/mpi-python.patch
===================================================================
--- boost/trunk/debian/patches/mpi-python.patch 2009-09-05 17:54:11 UTC (rev 14486)
+++ boost/trunk/debian/patches/mpi-python.patch 2009-09-05 17:55:40 UTC (rev 14487)
@@ -1,55 +0,0 @@
---- boost1.37-1.37.0.orig/libs/mpi/build/Jamfile.v2
-+++ boost1.37-1.37.0/libs/mpi/build/Jamfile.v2
-@@ -55,52 +55,6 @@
-
- libraries += boost_mpi ;
-
-- if [ python.configured ]
-- {
-- lib boost_mpi_python
-- : # Sources
-- python/serialize.cpp
-- : # Requirements
-- <library>boost_mpi
-- <library>/mpi//mpi [ mpi.extra-requirements ]
-- <library>/boost/python//boost_python
-- <link>shared:<define>BOOST_MPI_DYN_LINK=1
-- <link>shared:<define>BOOST_MPI_PYTHON_DYN_LINK=1
-- <link>shared:<define>BOOST_PYTHON_DYN_LINK=1
-- <define>BOOST_MPI_PYTHON_SOURCE=1
-- : # Default build
-- <link>shared
-- : # Usage requirements
-- <library>/mpi//mpi [ mpi.extra-requirements ]
-- ;
-- libraries += boost_mpi_python ;
--
-- python-extension mpi
-- : # Sources
-- python/collectives.cpp
-- python/py_communicator.cpp
-- python/datatypes.cpp
-- python/documentation.cpp
-- python/py_environment.cpp
-- python/py_nonblocking.cpp
-- python/py_exception.cpp
-- python/module.cpp
-- python/py_request.cpp
-- python/skeleton_and_content.cpp
-- python/status.cpp
-- python/py_timer.cpp
-- : # Requirements
-- <library>/boost/python//boost_python
-- <library>boost_mpi_python
-- <library>boost_mpi
-- <library>/mpi//mpi [ mpi.extra-requirements ]
-- <link>shared:<define>BOOST_MPI_DYN_LINK=1
-- <link>shared:<define>BOOST_MPI_PYTHON_DYN_LINK=1
-- <link>shared:<define>BOOST_PYTHON_DYN_LINK=1
-- <link>shared
-- <variant>release
-- ;
-- }
- }
- else if ! ( --without-mpi in [ modules.peek : ARGV ] )
- {
Deleted: boost/trunk/debian/patches/python-enum-same-value.patch
===================================================================
--- boost/trunk/debian/patches/python-enum-same-value.patch 2009-09-05 17:54:11 UTC (rev 14486)
+++ boost/trunk/debian/patches/python-enum-same-value.patch 2009-09-05 17:55:40 UTC (rev 14487)
@@ -1,113 +0,0 @@
-Debian bug #523343
-Reported upstream as https://svn.boost.org/trac/boost/ticket/2744
-This fix is upstream changeset https://svn.boost.org/trac/boost/changeset/53660
-
---- boost1.39-1.39.0.orig/libs/python/src/object/enum.cpp
-+++ boost1.39-1.39.0/libs/python/src/object/enum.cpp
-@@ -139,6 +139,7 @@
- dict d;
- d["__slots__"] = tuple();
- d["values"] = dict();
-+ d["names"] = dict();
-
- object module_name = module_prefix();
- if (module_name)
-@@ -191,18 +192,19 @@
- enum_object* p = downcast<enum_object>(x.ptr());
- Py_XDECREF(p->name);
- p->name = incref(name.ptr());
-+
-+ dict names_dict = extract<dict>(this->attr("names"))();
-+ names_dict[x.attr("name")] = x;
- }
-
- void enum_base::export_values()
- {
-- dict d = extract<dict>(this->attr("values"))();
-- list values = d.values();
-+ dict d = extract<dict>(this->attr("names"))();
-+ list items = d.items();
- scope current;
--
-- for (unsigned i = 0, max = len(values); i < max; ++i)
-- {
-- api::setattr(current, object(values[i].attr("name")), values[i]);
-- }
-+
-+ for (unsigned i = 0, max = len(items); i < max; ++i)
-+ api::setattr(current, items[i][0], items[i][1]);
- }
-
- PyObject* enum_base::to_python(PyTypeObject* type_, long x)
---- boost1.39-1.39.0.orig/libs/python/test/enum.cpp
-+++ boost1.39-1.39.0/libs/python/test/enum.cpp
-@@ -12,7 +12,7 @@
- #endif
- using namespace boost::python;
-
--enum color { red = 1, green = 2, blue = 4 };
-+enum color { red = 1, green = 2, blue = 4, blood = 1 };
-
- #if BOOST_WORKAROUND(__MWERKS__, <= 0x2407)
- namespace boost // Pro7 has a hard time detecting enums
-@@ -34,6 +34,7 @@
- .value("red", red)
- .value("green", green)
- .value("blue", blue)
-+ .value("blood", blood)
- .export_values()
- ;
-
---- boost1.39-1.39.0.orig/libs/python/test/enum.py
-+++ boost1.39-1.39.0/libs/python/test/enum.py
-@@ -4,8 +4,8 @@
- '''
- >>> from enum_ext import *
-
-->>> identity(color.red)
--enum_ext.color.red
-+>>> identity(color.red) # in case of duplicated enums it always take the last enum
-+enum_ext.color.blood
-
- >>> identity(color.green)
- enum_ext.color.green
-@@ -13,8 +13,8 @@
- >>> identity(color.blue)
- enum_ext.color.blue
-
-->>> identity(color(1))
--enum_ext.color.red
-+>>> identity(color(1)) # in case of duplicated enums it always take the last enum
-+enum_ext.color.blood
-
- >>> identity(color(2))
- enum_ext.color.green
-@@ -28,7 +28,7 @@
- --- check export to scope ---
-
- >>> identity(red)
--enum_ext.color.red
-+enum_ext.color.blood
-
- >>> identity(green)
- enum_ext.color.green
-@@ -42,10 +42,18 @@
-
- >>> c = colorized()
- >>> c.x
--enum_ext.color.red
-+enum_ext.color.blood
- >>> c.x = green
- >>> c.x
- enum_ext.color.green
-+>>> red == blood
-+True
-+>>> red == green
-+False
-+>>> hash(red) == hash(blood)
-+True
-+>>> hash(red) == hash(green)
-+False
- '''
-
- # pickling of enums only works with Python 2.3 or higher
Deleted: boost/trunk/debian/patches/python-generic-call.patch
===================================================================
--- boost/trunk/debian/patches/python-generic-call.patch 2009-09-05 17:54:11 UTC (rev 14486)
+++ boost/trunk/debian/patches/python-generic-call.patch 2009-09-05 17:55:40 UTC (rev 14487)
@@ -1,171 +0,0 @@
-Debian bug 523344
-Patch from upstream https://svn.boost.org/trac/boost/changeset/47846
-
---- boost1.39-1.39.0.orig/boost/python/object_core.hpp
-+++ boost1.39-1.39.0/boost/python/object_core.hpp
-@@ -42,6 +42,12 @@
-
- namespace boost { namespace python {
-
-+namespace detail
-+{
-+ class kwds_proxy;
-+ class args_proxy;
-+}
-+
- namespace converter
- {
- template <class T> struct arg_to_python;
-@@ -102,6 +108,11 @@
-
- # define BOOST_PP_ITERATION_PARAMS_1 (3, (1, BOOST_PYTHON_MAX_ARITY, <boost/python/object_call.hpp>))
- # include BOOST_PP_ITERATE()
-+
-+ detail::args_proxy operator* () const;
-+ object operator()(detail::args_proxy const &args) const;
-+ object operator()(detail::args_proxy const &args,
-+ detail::kwds_proxy const &kwds) const;
-
- // truth value testing
- //
-@@ -416,6 +427,62 @@
- // implementation
- //
-
-+namespace detail
-+{
-+
-+class call_proxy
-+{
-+public:
-+ call_proxy(object target) : m_target(target) {}
-+ operator object() const { return m_target;}
-+
-+ private:
-+ object m_target;
-+};
-+
-+class kwds_proxy : public call_proxy
-+{
-+public:
-+ kwds_proxy(object o = object()) : call_proxy(o) {}
-+};
-+class args_proxy : public call_proxy
-+{
-+public:
-+ args_proxy(object o) : call_proxy(o) {}
-+ kwds_proxy operator* () const { return kwds_proxy(*this);}
-+};
-+}
-+
-+template <typename U>
-+detail::args_proxy api::object_operators<U>::operator* () const
-+{
-+ object_cref2 x = *static_cast<U const*>(this);
-+ return detail::args_proxy(x);
-+}
-+
-+template <typename U>
-+object api::object_operators<U>::operator()(detail::args_proxy const &args) const
-+{
-+ U const& self = *static_cast<U const*>(this);
-+ PyObject *result = PyObject_Call(get_managed_object(self, tag),
-+ args.operator object().ptr(),
-+ 0);
-+ return object(detail::new_reference(result));
-+
-+}
-+
-+template <typename U>
-+object api::object_operators<U>::operator()(detail::args_proxy const &args,
-+ detail::kwds_proxy const &kwds) const
-+{
-+ U const& self = *static_cast<U const*>(this);
-+ PyObject *result = PyObject_Call(get_managed_object(self, tag),
-+ args.operator object().ptr(),
-+ kwds.operator object().ptr());
-+ return object(detail::new_reference(result));
-+
-+}
-+
- inline object::object()
- : object_base(python::incref(Py_None))
- {}
---- boost1.39-1.39.0.orig/libs/python/doc/v2/object.html
-+++ boost1.39-1.39.0/libs/python/doc/v2/object.html
-@@ -655,6 +655,11 @@
- template <class A0, class A1,...class An>
- object operator()(A0 const&, A1 const&,...An const&) const;
-
-+ detail::args_proxy operator* () const;
-+ object operator()(detail::args_proxy const &args) const;
-+ object operator()(detail::args_proxy const &args,
-+ detail::kwds_proxy const &kwds) const;
-+
- // truth value testing
- //
- typedef unspecified bool_type;
-@@ -704,6 +709,25 @@
- call<object>(object(*static_cast<U*>(this)).ptr(), a1,
- a2,...aN)</dt>
- </dl>
-+
-+<pre>
-+object operator()(detail::args_proxy const &args) const;
-+</pre>
-+<dl class="function-semantics">
-+ <dt><b>Effects:</b>
-+ call object with arguments given by the tuple <varname>args</varname></dt>
-+</dl>
-+<pre>
-+object operator()(detail::args_proxy const &args,
-+ detail::kwds_proxy const &kwds) const;
-+</pre>
-+<dl class="function-semantics">
-+ <dt><b>Effects:</b>
-+ call object with arguments given by the tuple <varname>args</varname>, and named
-+ arguments given by the dictionary <varname>kwds</varname></dt>
-+</dl>
-+
-+
- <pre>
- operator bool_type() const;
- </pre>
---- boost1.39-1.39.0.orig/libs/python/test/object.cpp
-+++ boost1.39-1.39.0/libs/python/test/object.cpp
-@@ -187,6 +187,11 @@
- return s.slice(2,-1).slice(1,-1) == "lo, wor";
- }
-
-+object test_call(object c, object args, object kwds)
-+{
-+ return c(*args, **kwds);
-+}
-+
- bool check_binary_operators()
- {
- int y;
-@@ -377,6 +382,7 @@
- def("test_item", test_item);
- def("test_not_item", test_not_item);
-
-+ def("test_call", test_call);
- def("check_binary_operators", check_binary_operators);
- def("check_inplace", check_inplace);
- def("check_string_slice", check_string_slice);
---- boost1.39-1.39.0.orig/libs/python/test/object.py
-+++ boost1.39-1.39.0/libs/python/test/object.py
-@@ -134,7 +134,12 @@
-
- Operators
-
--
-+>>> def print_args(*args, **kwds):
-+... print args, kwds
-+>>> test_call(print_args, (0, 1, 2, 3), {'a':'A'})
-+(0, 1, 2, 3) {'a': 'A'}
-+
-+
- >>> assert check_binary_operators()
-
- >>> class X: pass
Modified: boost/trunk/debian/patches/series
===================================================================
--- boost/trunk/debian/patches/series 2009-09-05 17:54:11 UTC (rev 14486)
+++ boost/trunk/debian/patches/series 2009-09-05 17:55:40 UTC (rev 14487)
@@ -1,15 +1,8 @@
mips-asm.patch
-python-enum-same-value.patch
-python-generic-call.patch
-bootstrap.patch
boost-python-examples.patch
endian.patch
kfreebsd-jam.patch
python2.5-elementtree.patch
date_time_date_formatting_hpp.patch
-mpi-python.patch
jam-wall-clean.patch
-boost_python_translate_exception.patch
-wave-cpp.patch
-function-template.patch
sh4.patch
Deleted: boost/trunk/debian/patches/wave-cpp.patch
===================================================================
--- boost/trunk/debian/patches/wave-cpp.patch 2009-09-05 17:54:11 UTC (rev 14486)
+++ boost/trunk/debian/patches/wave-cpp.patch 2009-09-05 17:55:40 UTC (rev 14487)
@@ -1,20 +0,0 @@
---- boost1.39-1.39.0.orig/tools/wave/cpp.cpp
-+++ boost1.39-1.39.0/tools/wave/cpp.cpp
-@@ -799,7 +799,7 @@
-
- // add include directories to the system include search paths
- if (vm.count("sysinclude")) {
-- vector<std::string> syspaths = vm["sysinclude"].as<vector<string> >();
-+ vector<std::string> syspaths = vm["sysinclude"].as<vector<std::string> >();
-
- vector<std::string>::const_iterator end = syspaths.end();
- for (vector<std::string>::const_iterator cit = syspaths.begin();
-@@ -836,7 +836,7 @@
-
- // add additional defined macros
- if (vm.count("define")) {
-- vector<std::string> const ¯os = vm["define"].as<vector<string> >();
-+ vector<std::string> const ¯os = vm["define"].as<vector<std::string> >();
- vector<std::string>::const_iterator end = macros.end();
- for (vector<std::string>::const_iterator cit = macros.begin();
- cit != end; ++cit)
More information about the pkg-boost-commits
mailing list