Update of /cvsroot/fink/dists/10.4/stable/main/finkinfo/libs In directory sfp-cvsdas-3.v30.ch3.sourceforge.com:/tmp/cvs-serv26068/stable/main/finkinfo/libs
Modified Files: boost1.33.info boost1.35..info boost1.35.patch Log Message: minor updates Index: boost1.33.info =================================================================== RCS file: /cvsroot/fink/dists/10.4/stable/main/finkinfo/libs/boost1.33.info,v retrieving revision 1.7 retrieving revision 1.8 diff -u -d -r1.7 -r1.8 --- boost1.33.info 30 Jan 2010 16:11:48 -0000 1.7 +++ boost1.33.info 14 Oct 2010 04:53:13 -0000 1.8 @@ -1,12 +1,12 @@ Package: boost1.33 Version: 1.33.1 -Revision: 1011 +Revision: 1012 License: BSD Distribution: 10.4, 10.5 Depends: %N-shlibs (= %v-%r) -Conflicts: boost1.31, boost1.32, boost1.32-py23, boost1.32-py24, boost1.32.python, boost1.34.nopython, boost1.34.python23, boost1.34.python24, boost1.34.python25, boost1.35.nopython, boost1.35.python23, boost1.35.python24, boost1.35.python25 -Replaces: boost1.31, boost1.32, boost1.32-py23, boost1.32-py24, boost1.32.python, boost1.34.nopython, boost1.34.python23, boost1.34.python24, boost1.34.python25, boost1.35.nopython, boost1.35.python23, boost1.35.python24, boost1.35.python25 +Conflicts: boost1.31, boost1.32, boost1.32-py23, boost1.32-py24, boost1.32.python, boost1.34.nopython, boost1.34.python23, boost1.34.python24, boost1.34.python25, boost1.35.nopython, boost1.35.python23, boost1.35.python24, boost1.35.python25, boost1.35.python26, boost1.35.python27 +Replaces: boost1.31, boost1.32, boost1.32-py23, boost1.32-py24, boost1.32.python, boost1.34.nopython, boost1.34.python23, boost1.34.python24, boost1.34.python25, boost1.35.nopython, boost1.35.python23, boost1.35.python24, boost1.35.python25, boost1.35.python26, boost1.35.python27 BuildDepends: boost-jam, fink (>= 0.24.12-1), python BuildDependsOnly: True @@ -18,7 +18,6 @@ PatchFile-MD5: 041b193141ebd3ab18b8730ab0efdce0 GCC: 4.0 -SetMACOSX_DEPLOYMENT_TARGET: 10.3 CompileScript: << #!/bin/sh -ex # build with the python version that %p/bin/python points to Index: boost1.35.patch =================================================================== RCS file: /cvsroot/fink/dists/10.4/stable/main/finkinfo/libs/boost1.35.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- boost1.35.patch 17 Sep 2009 08:32:09 -0000 1.1 +++ boost1.35.patch 14 Oct 2010 04:53:13 -0000 1.2 @@ -27,3 +27,364 @@ } # We use libtool instead of ar to support universal binary linking +--- boost_1_35_0/libs/python/src/object/class.cpp 2007-11-25 19:38:02.000000000 +0100 ++++ boost-trunk-r56305/libs/python/src/object/class.cpp 2010-01-12 15:56:11.000000000 +0100 +@@ -67,14 +67,50 @@ + PyObject *prop_set; + PyObject *prop_del; + PyObject *prop_doc; ++ int getter_doc; + } propertyobject; + ++ // Copied from Python source and removed the part for setting docstring, ++ // since we don't have a setter for __doc__ and trying to set it will ++ // cause the init fail. ++ static int property_init(PyObject *self, PyObject *args, PyObject *kwds) ++ { ++ PyObject *get = NULL, *set = NULL, *del = NULL, *doc = NULL; ++ static char *kwlist[] = {"fget", "fset", "fdel", "doc", 0}; ++ propertyobject *prop = (propertyobject *)self; ++ ++ if (!PyArg_ParseTupleAndKeywords(args, kwds, "|OOOO:property", ++ kwlist, &get, &set, &del, &doc)) ++ return -1; ++ ++ if (get == Py_None) ++ get = NULL; ++ if (set == Py_None) ++ set = NULL; ++ if (del == Py_None) ++ del = NULL; ++ ++ Py_XINCREF(get); ++ Py_XINCREF(set); ++ Py_XINCREF(del); ++ Py_XINCREF(doc); ++ ++ prop->prop_get = get; ++ prop->prop_set = set; ++ prop->prop_del = del; ++ prop->prop_doc = doc; ++ prop->getter_doc = 0; ++ ++ return 0; ++ } ++ ++ + static PyObject * + static_data_descr_get(PyObject *self, PyObject * /*obj*/, PyObject * /*type*/) + { + propertyobject *gs = (propertyobject *)self; + +- return PyObject_CallFunction(gs->prop_get, "()"); ++ return PyObject_CallFunction(gs->prop_get, const_cast<char*>("()")); + } + + static int +@@ -95,9 +131,9 @@ + return -1; + } + if (value == NULL) +- res = PyObject_CallFunction(func, "()"); ++ res = PyObject_CallFunction(func, const_cast<char*>("()")); + else +- res = PyObject_CallFunction(func, "(O)", value); ++ res = PyObject_CallFunction(func, const_cast<char*>("(O)"), value); + if (res == NULL) + return -1; + Py_DECREF(res); +@@ -106,10 +142,9 @@ + } + + static PyTypeObject static_data_object = { +- PyObject_HEAD_INIT(0)//&PyType_Type) +- 0, +- "Boost.Python.StaticProperty", +- PyType_Type.tp_basicsize, ++ PyVarObject_HEAD_INIT(NULL, 0) ++ const_cast<char*>("Boost.Python.StaticProperty"), ++ sizeof(propertyobject), + 0, + 0, /* tp_dealloc */ + 0, /* tp_print */ +@@ -143,7 +178,7 @@ + static_data_descr_get, /* tp_descr_get */ + static_data_descr_set, /* tp_descr_set */ + 0, /* tp_dictoffset */ +- 0, /* tp_init */ ++ property_init, /* tp_init */ + 0, /* tp_alloc */ + 0, // filled in with type_new /* tp_new */ + 0, // filled in with __PyObject_GC_Del /* tp_free */ +@@ -160,17 +195,20 @@ + + namespace objects + { ++#if PY_VERSION_HEX < 0x03000000 ++ // XXX Not sure why this run into compiling error in Python 3 + extern "C" + { + // This declaration needed due to broken Python 2.2 headers + extern DL_IMPORT(PyTypeObject) PyProperty_Type; + } ++#endif + + BOOST_PYTHON_DECL PyObject* static_data() + { + if (static_data_object.tp_dict == 0) + { +- static_data_object.ob_type = &PyType_Type; ++ Py_TYPE(&static_data_object) = &PyType_Type; + static_data_object.tp_base = &PyProperty_Type; + if (PyType_Ready(&static_data_object)) + return 0; +@@ -203,16 +241,15 @@ + // If we found a static data descriptor, call it directly to + // force it to set the static data member + if (a != 0 && PyObject_IsInstance(a, objects::static_data())) +- return a->ob_type->tp_descr_set(a, obj, value); ++ return Py_TYPE(a)->tp_descr_set(a, obj, value); + else + return PyType_Type.tp_setattro(obj, name, value); + } + } + + static PyTypeObject class_metatype_object = { +- PyObject_HEAD_INIT(0)//&PyType_Type) +- 0, +- "Boost.Python.class", ++ PyVarObject_HEAD_INIT(NULL, 0) ++ const_cast<char*>("Boost.Python.class"), + PyType_Type.tp_basicsize, + 0, + 0, /* tp_dealloc */ +@@ -266,7 +303,7 @@ + // object. + void instance_holder::install(PyObject* self) throw() + { +- assert(self->ob_type->ob_type == &class_metatype_object); ++ assert(Py_TYPE(Py_TYPE(self)) == &class_metatype_object); + m_next = ((objects::instance<>*)self)->objects; + ((objects::instance<>*)self)->objects = this; + } +@@ -279,7 +316,7 @@ + { + if (class_metatype_object.tp_dict == 0) + { +- class_metatype_object.ob_type = &PyType_Type; ++ Py_TYPE(&class_metatype_object) = &PyType_Type; + class_metatype_object.tp_base = &PyType_Type; + if (PyType_Ready(&class_metatype_object)) + return type_handle(); +@@ -308,7 +345,7 @@ + + Py_XDECREF(kill_me->dict); + +- inst->ob_type->tp_free(inst); ++ Py_TYPE(inst)->tp_free(inst); + } + + static PyObject * +@@ -316,9 +353,14 @@ + { + // Attempt to find the __instance_size__ attribute. If not present, no problem. + PyObject* d = type_->tp_dict; +- PyObject* instance_size_obj = PyObject_GetAttrString(d, "__instance_size__"); ++ PyObject* instance_size_obj = PyObject_GetAttrString(d, const_cast<char*>("__instance_size__")); + +- long instance_size = instance_size_obj ? PyInt_AsLong(instance_size_obj) : 0; ++ Py_ssize_t instance_size = instance_size_obj ? ++#if PY_VERSION_HEX >= 0x03000000 ++ PyLong_AsSsize_t(instance_size_obj) : 0; ++#else ++ PyInt_AsLong(instance_size_obj) : 0; ++#endif + + if (instance_size < 0) + instance_size = 0; +@@ -332,7 +374,12 @@ + // like, so we'll store the total size of the object + // there. A negative number indicates that the extra + // instance memory is not yet allocated to any holders. +- result->ob_size = -(static_cast<int>(offsetof(instance<>,storage) + instance_size)); ++#if PY_VERSION_HEX >= 0x02060000 ++ Py_SIZE(result) = ++#else ++ result->ob_size = ++#endif ++ -(static_cast<int>(offsetof(instance<>,storage) + instance_size)); + } + return (PyObject*)result; + } +@@ -357,20 +404,19 @@ + + + static PyGetSetDef instance_getsets[] = { +- {"__dict__", instance_get_dict, instance_set_dict, NULL, 0}, ++ {const_cast<char*>("__dict__"), instance_get_dict, instance_set_dict, NULL, 0}, + {0, 0, 0, 0, 0} + }; + + + static PyMemberDef instance_members[] = { +- {"__weakref__", T_OBJECT, offsetof(instance<>, weakrefs), 0, 0}, ++ {const_cast<char*>("__weakref__"), T_OBJECT, offsetof(instance<>, weakrefs), 0, 0}, + {0, 0, 0, 0, 0} + }; + + static PyTypeObject class_type_object = { +- PyObject_HEAD_INIT(0) //&class_metatype_object) +- 0, +- "Boost.Python.instance", ++ PyVarObject_HEAD_INIT(NULL, 0) ++ const_cast<char*>("Boost.Python.instance"), + offsetof(instance<>,storage), /* tp_basicsize */ + 1, /* tp_itemsize */ + instance_dealloc, /* tp_dealloc */ +@@ -424,7 +470,7 @@ + { + if (class_type_object.tp_dict == 0) + { +- class_type_object.ob_type = incref(class_metatype().get()); ++ Py_TYPE(&class_type_object) = incref(class_metatype().get()); + class_type_object.tp_base = &PyBaseObject_Type; + if (PyType_Ready(&class_type_object)) + return type_handle(); +@@ -436,7 +482,7 @@ + BOOST_PYTHON_DECL void* + find_instance_impl(PyObject* inst, type_info type, bool null_shared_ptr_only) + { +- if (inst->ob_type->ob_type != &class_metatype_object) ++ if (Py_TYPE(Py_TYPE(inst)) != &class_metatype_object) + return 0; + + instance<>* self = reinterpret_cast<instance<>*>(inst); +@@ -506,13 +552,12 @@ + // Build a tuple of the base Python type objects. If no bases + // were declared, we'll use our class_type() as the single base + // class. +- std::size_t const num_bases = (std::max)(num_types - 1, static_cast<std::size_t>(1)); +- assert(num_bases <= ssize_t_max); +- handle<> bases(PyTuple_New(static_cast<ssize_t>(num_bases))); ++ ssize_t const num_bases = (std::max)(num_types - 1, static_cast<std::size_t>(1)); ++ handle<> bases(PyTuple_New(num_bases)); + +- for (std::size_t i = 1; i <= num_bases; ++i) ++ for (ssize_t i = 1; i <= num_bases; ++i) + { +- type_handle c = (i >= num_types) ? class_type() : get_class(types[i]); ++ type_handle c = (i >= static_cast<ssize_t>(num_types)) ? class_type() : get_class(types[i]); + // PyTuple_SET_ITEM steals this reference + PyTuple_SET_ITEM(bases.get(), static_cast<ssize_t>(i - 1), upcast<PyObject>(c.release())); + } +@@ -527,7 +572,7 @@ + d["__doc__"] = doc; + + object result = object(class_metatype())(name, bases, d); +- assert(PyType_IsSubtype(result.ptr()->ob_type, &PyType_Type)); ++ assert(PyType_IsSubtype(Py_TYPE(result.ptr()), &PyType_Type)); + + if (scope().ptr() != Py_None) + scope().attr(name) = result; +@@ -572,7 +617,7 @@ + { + object property( + (python::detail::new_reference) +- PyObject_CallFunction((PyObject*)&PyProperty_Type, "Osss", fget.ptr(), 0, 0, docstr)); ++ PyObject_CallFunction((PyObject*)&PyProperty_Type, const_cast<char*>("Osss"), fget.ptr(), 0, 0, docstr)); + + this->setattr(name, property); + } +@@ -582,7 +627,7 @@ + { + object property( + (python::detail::new_reference) +- PyObject_CallFunction((PyObject*)&PyProperty_Type, "OOss", fget.ptr(), fset.ptr(), 0, docstr)); ++ PyObject_CallFunction((PyObject*)&PyProperty_Type, const_cast<char*>("OOss"), fget.ptr(), fset.ptr(), 0, docstr)); + + this->setattr(name, property); + } +@@ -590,8 +635,9 @@ + void class_base::add_static_property(char const* name, object const& fget) + { + object property( +- (python::detail::new_reference) +- PyObject_CallFunction(static_data(), "O", fget.ptr())); ++ (python::detail::new_reference) ++ PyObject_CallFunction(static_data(), const_cast<char*>("O"), fget.ptr()) ++ ); + + this->setattr(name, property); + } +@@ -600,7 +646,7 @@ + { + object property( + (python::detail::new_reference) +- PyObject_CallFunction(static_data(), "OO", fget.ptr(), fset.ptr())); ++ PyObject_CallFunction(static_data(), const_cast<char*>("OO"), fget.ptr(), fset.ptr())); + + this->setattr(name, property); + } +@@ -615,13 +661,13 @@ + { + extern "C" PyObject* no_init(PyObject*, PyObject*) + { +- ::PyErr_SetString(::PyExc_RuntimeError, "This class cannot be instantiated from Python"); ++ ::PyErr_SetString(::PyExc_RuntimeError, const_cast<char*>("This class cannot be instantiated from Python")); + return NULL; + } + static ::PyMethodDef no_init_def = { +- "__init__", no_init, METH_VARARGS, +- "Raises an exception\n" +- "This class cannot be instantiated from Python\n" ++ const_cast<char*>("__init__"), no_init, METH_VARARGS, ++ const_cast<char*>("Raises an exception\n" ++ "This class cannot be instantiated from Python\n") + }; + } + +@@ -650,8 +696,8 @@ + + ::PyErr_Format( + PyExc_TypeError +- , "staticmethod expects callable object; got an object of type %s, which is not callable" +- , callable->ob_type->tp_name ++ , const_cast<char*>("staticmethod expects callable object; got an object of type %s, which is not callable") ++ , Py_TYPE(callable)->tp_name + ); + + throw_error_already_set(); +@@ -681,18 +727,18 @@ + + void* instance_holder::allocate(PyObject* self_, std::size_t holder_offset, std::size_t holder_size) + { +- assert(self_->ob_type->ob_type == &class_metatype_object); ++ assert(Py_TYPE(Py_TYPE(self_)) == &class_metatype_object); + objects::instance<>* self = (objects::instance<>*)self_; + + int total_size_needed = holder_offset + holder_size; + +- if (-self->ob_size >= total_size_needed) ++ if (-Py_SIZE(self) >= total_size_needed) + { + // holder_offset should at least point into the variable-sized part + assert(holder_offset >= offsetof(objects::instance<>,storage)); + + // Record the fact that the storage is occupied, noting where it starts +- self->ob_size = holder_offset; ++ Py_SIZE(self) = holder_offset; + return (char*)self + holder_offset; + } + else +@@ -706,9 +752,9 @@ + + void instance_holder::deallocate(PyObject* self_, void* storage) throw() + { +- assert(self_->ob_type->ob_type == &class_metatype_object); ++ assert(Py_TYPE(Py_TYPE(self_)) == &class_metatype_object); + objects::instance<>* self = (objects::instance<>*)self_; +- if (storage != (char*)self + self->ob_size) ++ if (storage != (char*)self + Py_SIZE(self)) + { + PyMem_Free(storage); + } Index: boost1.35..info =================================================================== RCS file: /cvsroot/fink/dists/10.4/stable/main/finkinfo/libs/boost1.35..info,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- boost1.35..info 30 Aug 2010 02:12:02 -0000 1.1 +++ boost1.35..info 14 Oct 2010 04:53:13 -0000 1.2 @@ -1,8 +1,8 @@ Info2: << Package: boost1.35.%type_pkg[python] Version: 1.35.0 -Revision: 2 -Type: python (nopython systempython python2.3 python2.4 python2.5) +Revision: 8 +Type: python (nopython systempython python2.3 python2.4 python2.5 python2.6) Distribution: (%type_pkg[python] = python23) 10.4, (%type_pkg[python] = python24) 10.4, (%type_pkg[python] = python24) 10.5 @@ -21,7 +21,9 @@ (%type_pkg[python] != nopython) boost1.35.systempython, (%type_pkg[python] != nopython) boost1.35.python23, (%type_pkg[python] != nopython) boost1.35.python24, - (%type_pkg[python] != nopython) boost1.35.python25 + (%type_pkg[python] != nopython) boost1.35.python25, + (%type_pkg[python] != nopython) boost1.35.python26, + boost1.41.cmake << Replaces: << boost1.31, boost1.32-py23, boost1.32-py24, boost1.32.python, boost1.33, boost-foreach, @@ -34,7 +36,9 @@ boost1.35.python23, boost1.35.python24, boost1.35.python25, - boost1.35.nopython + boost1.35.python26, + boost1.35.nopython, + boost1.41.cmake << Source: mirror:sourceforge:boost/boost_1_35_0.tar.bz2 @@ -42,9 +46,23 @@ Source-MD5: dce952a7214e72d6597516bcac84048b PatchFile: %{ni}patch -PatchFile-MD5: f4c0536cbc0e87d04ced2914c7f4652e +PatchFile-MD5: bc065bb0617e5ef7f1abbe9480798c72 PatchScript:<< - %{default_script} +#!/bin/sh -ex +# save a file that should only be patched for python2.6.3 or later + case %type_pkg[python] in + python23|python24|python25|systempython) + cp libs/python/src/object/class.cpp libs/python/src/object/class.cpp_bak;; + *) ;; + esac +# the patch file now contains a workaround from boost svn for a new "feature" in python-2.6.3 and later +# keyword: "AttributeError: 'Boost.Python.StaticProperty' object attribute '__doc__' is read-only" + patch -p1 < %{PatchFile} + case %type_pkg[python] in + python23|python24|python25|systempython) + cp libs/python/src/object/class.cpp_bak libs/python/src/object/class.cpp;; + *) ;; + esac # don't link to libpython, we will use -undefined dynamic_lookup perl -pi -e 's|windows cygwin darwin|windows cygwin|' tools/build/v2/tools/python.jam # don't build debug target nor runtime-link-static, otherwise complete @@ -54,7 +72,6 @@ << GCC: 4.0 -SetMACOSX_DEPLOYMENT_TARGET: 10.3 CompileScript: << #!/bin/sh -ex USEPYTHON='--with-python' @@ -150,6 +167,8 @@ << Shlibs: << + ( %type_raw[python] = systempython ) %p/lib/libboost_python-1_35.dylib 1.35.0 %n (>= 1.35.0-1) + ( %type_raw[python] = systempython ) %p/lib/libboost_python-mt-1_35.dylib 1.35.0 %n (>= 1.35.0-1) ( %type_raw[python] = nopython ) %p/lib/libboost_date_time-1_35.dylib 1.35.0 %n (>= 1.35.0-1) ( %type_raw[python] = nopython ) %p/lib/libboost_filesystem-1_35.dylib 1.35.0 %n (>= 1.35.0-1) ( %type_raw[python] = nopython ) %p/lib/libboost_graph-1_35.dylib 1.35.0 %n (>= 1.35.0-1) ------------------------------------------------------------------------------ Beautiful is writing same markup. Internet Explorer 9 supports standards for HTML5, CSS3, SVG 1.1, ECMAScript5, and DOM L2 & L3. Spend less time writing and rewriting code and more time creating great experiences on the web. Be a part of the beta today. http://p.sf.net/sfu/beautyoftheweb _______________________________________________ Fink-commits mailing list Fink-commits@lists.sourceforge.net http://news.gmane.org/gmane.os.apple.fink.cvs