[pkg-boost-commits] r14642 - in boost/trunk/debian: . patches

[Steven Michael Robbins]

Author: smr
Date: 2011-04-07 04:09:24 +0000 (Thu, 07 Apr 2011)
New Revision: 14642

Added:
   boost/trunk/debian/patches/changeset_71050.diff
Modified:
   boost/trunk/debian/changelog
   boost/trunk/debian/patches/series
Log:
Fix build with python 3.2

Modified: boost/trunk/debian/changelog
===================================================================
--- boost/trunk/debian/changelog	2011-04-06 05:28:48 UTC (rev 14641)
+++ boost/trunk/debian/changelog	2011-04-07 04:09:24 UTC (rev 14642)
@@ -1,3 +1,11 @@
+boost1.46 (1.46.1-4) unstable; urgency=low
+
+  * NEWS.Debian: fix format.
+
+  * patches/changeset_71050.diff: Fix build with Python 3.2.
+  
+ -- Steve M. Robbins <smr at debian.org>  Wed, 06 Apr 2011 23:08:56 -0500
+
 boost1.46 (1.46.1-3) unstable; urgency=low
 
   * control: Remove package bjam; install bjam and Boost.Build with -dev

Added: boost/trunk/debian/patches/changeset_71050.diff
===================================================================
--- boost/trunk/debian/patches/changeset_71050.diff	                        (rev 0)
+++ boost/trunk/debian/patches/changeset_71050.diff	2011-04-07 04:09:24 UTC (rev 14642)
@@ -0,0 +1,15 @@
+Upstream: https://svn.boost.org/trac/boost/ticket/4994
+Description: Python 3.2 compatibility, based on patch by Matthew Bradbury.
+
+--- boost1.46-1.46.1.orig/libs/python/src/converter/builtin_converters.cpp
++++ boost1.46-1.46.1/libs/python/src/converter/builtin_converters.cpp
+@@ -432,5 +432,8 @@
+           {
+               int err = PyUnicode_AsWideChar(
+-                  (PyUnicodeObject *)intermediate
++#if PY_VERSION_HEX < 0x03020000
++                  (PyUnicodeObject *)
++#endif
++                    intermediate
+                 , &result[0]
+                 , result.size());

Modified: boost/trunk/debian/patches/series
===================================================================
--- boost/trunk/debian/patches/series	2011-04-06 05:28:48 UTC (rev 14641)
+++ boost/trunk/debian/patches/series	2011-04-07 04:09:24 UTC (rev 14642)
@@ -10,3 +10,4 @@
 fusion-name-qual.patch
 remove-rpath.patch
 boost-1.44-py3.1.patch
+changeset_71050.diff