[pkg-boost-commits] r14665 - in boost/trunk/debian: . patches
Steven Michael Robbins
smr at alioth.debian.org
Sat Nov 19 05:16:28 UTC 2011
Author: smr
Date: 2011-11-19 05:16:26 +0000 (Sat, 19 Nov 2011)
New Revision: 14665
Removed:
boost/trunk/debian/patches/hurd-ellint_rd.patch
boost/trunk/debian/patches/hurd-execution_monitor.patch
boost/trunk/debian/patches/mips-asm.patch
boost/trunk/debian/patches/python2.5-elementtree.patch
Modified:
boost/trunk/debian/changelog
boost/trunk/debian/patches/series
Log:
Fix patch set for new upstream.
Modified: boost/trunk/debian/changelog
===================================================================
--- boost/trunk/debian/changelog 2011-11-07 07:37:53 UTC (rev 14664)
+++ boost/trunk/debian/changelog 2011-11-19 05:16:26 UTC (rev 14665)
@@ -1,3 +1,19 @@
+boost1.48 (1.48.0-1) unstable; urgency=low
+
+ * New upstream.
+ - patches/changeset_71050.diff:
+ - patches/date_time_date_formatting_hpp.patch:
+ - patches/fusion-name-qual.patch:
+ - patches/mips-asm.patch:
+ - patches/openssl-no-ssl2.patch:
+ - patches/python2.5-elementtree.patch: Removed. Applied upstream.
+
+ * patches/hurd-ellint_rd.patch:
+ * patches/hurd-execution_monitor.patch: Remove. Pino Toscano advised
+ that the hurd no longer needs these.
+
+ -- Steve M. Robbins <smr at debian.org> Fri, 18 Nov 2011 22:06:47 -0600
+
boost1.46 (1.46.1-7) unstable; urgency=low
* control: Fix ungrammatical description for iostreams packages.
Deleted: boost/trunk/debian/patches/hurd-ellint_rd.patch
===================================================================
--- boost/trunk/debian/patches/hurd-ellint_rd.patch 2011-11-07 07:37:53 UTC (rev 14664)
+++ boost/trunk/debian/patches/hurd-ellint_rd.patch 2011-11-19 05:16:26 UTC (rev 14665)
@@ -1,32 +0,0 @@
-Description: Avoid build problem on hurd
- Hurd's bits/errno.h defines constant ED, so rename
- a local variable to avoid the clash.
-Author: Pino Toscano <pino at kde.org>
-Bug: 552383
-Forwarded: not yet
-
-
---- boost1.40-1.40.0.orig/boost/math/special_functions/ellint_rd.hpp
-+++ boost1.40-1.40.0/boost/math/special_functions/ellint_rd.hpp
-@@ -29,7 +29,7 @@
- T ellint_rd_imp(T x, T y, T z, const Policy& pol)
- {
- T value, u, lambda, sigma, factor, tolerance;
-- T X, Y, Z, EA, EB, EC, ED, EE, S1, S2;
-+ T X, Y, Z, EA, EB, EC, ED_, EE, S1, S2;
- unsigned long k;
-
- BOOST_MATH_STD_USING
-@@ -93,9 +93,9 @@
- EA = X * Y;
- EB = Z * Z;
- EC = EA - EB;
-- ED = EA - 6 * EB;
-- EE = ED + EC + EC;
-- S1 = ED * (ED * T(9) / 88 - Z * EE * T(9) / 52 - T(3) / 14);
-+ ED_ = EA - 6 * EB;
-+ EE = ED_ + EC + EC;
-+ S1 = ED_ * (ED_ * T(9) / 88 - Z * EE * T(9) / 52 - T(3) / 14);
- S2 = Z * (EE / 6 + Z * (-EC * T(9) / 22 + Z * EA * T(3) / 26));
- value = 3 * sigma + factor * (1 + S1 + S2) / (u * sqrt(u));
-
Deleted: boost/trunk/debian/patches/hurd-execution_monitor.patch
===================================================================
--- boost/trunk/debian/patches/hurd-execution_monitor.patch 2011-11-07 07:37:53 UTC (rev 14664)
+++ boost/trunk/debian/patches/hurd-execution_monitor.patch 2011-11-19 05:16:26 UTC (rev 14665)
@@ -1,204 +0,0 @@
-Description: Avoid build problem on hurd
- Hurd does not define sigaction::sa_handler so
- implement logic using basic sa_handler.
-Author: Pino Toscano <pino at kde.org>
-Bug: 552383
-Forwarded: not yet
-
---- boost1.42-1.42.0.orig/boost/test/impl/execution_monitor.ipp
-+++ boost1.42-1.42.0/boost/test/impl/execution_monitor.ipp
-@@ -301,22 +301,37 @@
- public:
- // Constructor
- system_signal_exception()
-+#ifdef SA_SIGINFO
- : m_sig_info( 0 )
- , m_context( 0 )
-+#else
-+ : m_sig( 0 )
-+#endif
- {}
-
- // Access methods
-+#ifdef SA_SIGINFO
- void operator()( siginfo_t* i, void* c )
- {
- m_sig_info = i;
- m_context = c;
- }
-+#else
-+ void operator()( int s )
-+ {
-+ m_sig = s;
-+ }
-+#endif
- void report() const;
-
- private:
- // Data members
-+#ifdef SA_SIGINFO
- siginfo_t* m_sig_info; // system signal detailed info
- void* m_context; // signal context
-+#else
-+ int m_sig; // sistem signal
-+#endif
- };
-
- //____________________________________________________________________________//
-@@ -324,6 +339,7 @@
- void
- system_signal_exception::report() const
- {
-+#ifdef SA_SIGINFO
- if( !m_sig_info )
- return; // no error actually occur?
-
-@@ -608,6 +624,59 @@
- default:
- report_error( execution_exception::system_error, "unrecognized signal" );
- }
-+#else
-+ if( !m_sig )
-+ return; // no error actually occur?
-+
-+ switch( m_sig ) {
-+ case SIGILL:
-+ report_error( execution_exception::system_fatal_error,
-+ "signal: SIGILL (illegal instruction)" );
-+ break;
-+
-+ case SIGFPE:
-+ report_error( execution_exception::system_error,
-+ "signal: SIGFPE (errnoneous arithmetic operations)" );
-+ break;
-+
-+ case SIGSEGV:
-+ report_error( execution_exception::system_fatal_error,
-+ "signal: SIGSEGV (memory access violation)" );
-+ break;
-+
-+ case SIGBUS:
-+ report_error( execution_exception::system_fatal_error,
-+ "signal: SIGSEGV (memory access violation)" );
-+ break;
-+
-+ case SIGCHLD:
-+ report_error( execution_exception::system_fatal_error,
-+ "signal: SIGCHLD (child process has terminated)" );
-+ break;
-+
-+#if defined(BOOST_TEST_CATCH_SIGPOLL)
-+
-+ case SIGPOLL:
-+ report_error( execution_exception::system_error,
-+ "signal: SIGPOLL (asynchronous I/O event occured)" );
-+ break;
-+
-+#endif
-+
-+ case SIGABRT:
-+ report_error( execution_exception::system_error,
-+ "signal: SIGABRT (application abort requested)" );
-+ break;
-+
-+ case SIGALRM:
-+ report_error( execution_exception::timeout_error,
-+ "signal: SIGALRM (timeout while executing function)" );
-+ break;
-+
-+ default:
-+ report_error( execution_exception::system_error, "unrecognized signal" );
-+ }
-+#endif
- }
-
- //____________________________________________________________________________//
-@@ -618,8 +687,13 @@
-
- // Forward declaration
- extern "C" {
-+#ifdef SA_SIGINFO
- static void execution_monitor_jumping_signal_handler( int sig, siginfo_t* info, void* context );
- static void execution_monitor_attaching_signal_handler( int sig, siginfo_t* info, void* context );
-+#else
-+static void execution_monitor_jumping_signal_handler( int sig );
-+static void execution_monitor_attaching_signal_handler( int sig );
-+#endif
- }
-
- class signal_action {
-@@ -662,9 +736,14 @@
- return;
- }
-
-+#ifdef SA_SIGINFO
- m_new_action.sa_flags |= SA_SIGINFO;
- m_new_action.sa_sigaction = attach_dbg ? &execution_monitor_attaching_signal_handler
- : &execution_monitor_jumping_signal_handler;
-+#else
-+ m_new_action.sa_handler = attach_dbg ? &execution_monitor_attaching_signal_handler
-+ : &execution_monitor_jumping_signal_handler;
-+#endif
- BOOST_TEST_SYS_ASSERT( sigemptyset( &m_new_action.sa_mask ) != -1 );
-
- #ifdef BOOST_TEST_USE_ALT_STACK
-@@ -813,6 +892,7 @@
-
- extern "C" {
-
-+#ifdef SA_SIGINFO
- static bool ignore_sigchild( siginfo_t* info )
- {
- return info->si_signo == SIGCHLD
-@@ -825,9 +905,16 @@
- && (int)info->si_status == 0;
- #endif
- }
-+#else
-+static bool ignore_sigchild( int sig )
-+{
-+ return sig == SIGCHLD;
-+}
-+#endif
-
- //____________________________________________________________________________//
-
-+#ifdef SA_SIGINFO
- static void execution_monitor_jumping_signal_handler( int sig, siginfo_t* info, void* context )
- {
- if( ignore_sigchild( info ) )
-@@ -854,6 +941,34 @@
-
- //____________________________________________________________________________//
-
-+#else
-+static void execution_monitor_jumping_signal_handler( int sig )
-+{
-+ if( ignore_sigchild( sig ) )
-+ return;
-+
-+ signal_handler::sys_sig()( sig );
-+
-+ siglongjmp( signal_handler::jump_buffer(), sig );
-+}
-+
-+//____________________________________________________________________________//
-+
-+static void execution_monitor_attaching_signal_handler( int sig )
-+{
-+ if( ignore_sigchild( sig ) )
-+ return;
-+
-+ if( !debug::attach_debugger( false ) )
-+ execution_monitor_jumping_signal_handler( sig );
-+
-+ // debugger attached; it will handle the signal
-+ BOOST_TEST_SYS_ASSERT( ::signal( sig, SIG_DFL ) != SIG_ERR );
-+}
-+#endif
-+
-+//____________________________________________________________________________//
-+
- }
-
- } // namespace detail
Deleted: boost/trunk/debian/patches/mips-asm.patch
===================================================================
--- boost/trunk/debian/patches/mips-asm.patch 2011-11-07 07:37:53 UTC (rev 14664)
+++ boost/trunk/debian/patches/mips-asm.patch 2011-11-19 05:16:26 UTC (rev 14665)
@@ -1,53 +0,0 @@
-Description: Patch to build sp_counted_base on MIPS
- The code in sp_counted_base_gcc_mips.hpp uses mips2 opcodes
- despite compiling for mips1. Florian Lohoff provided the solution
- http://lists.debian.org/debian-mips/2009/08/msg00033.html
-Author: Steve Robbins <smr at debian.org>
-Bug: 543975
-Forwarded: https://svn.boost.org/trac/boost/ticket/5327
-
-Status as of 2011-11-07: Patch applied in boost/trunk but not merged
-to release.
-
---- boost1.39-1.39.0.obsolete.0.994080839927658.orig/boost/smart_ptr/detail/sp_counted_base_gcc_mips.hpp
-+++ boost1.39-1.39.0.obsolete.0.994080839927658/boost/smart_ptr/detail/sp_counted_base_gcc_mips.hpp
-@@ -37,9 +37,12 @@
- __asm__ __volatile__
- (
- "0:\n\t"
-+ ".set push\n\t"
-+ ".set mips2\n\t"
- "ll %0, %1\n\t"
- "addiu %0, 1\n\t"
- "sc %0, %1\n\t"
-+ ".set pop\n\t"
- "beqz %0, 0b":
- "=&r"( tmp ), "=m"( *pw ):
- "m"( *pw )
-@@ -55,9 +58,12 @@
- __asm__ __volatile__
- (
- "0:\n\t"
-+ ".set push\n\t"
-+ ".set mips2\n\t"
- "ll %1, %2\n\t"
- "addiu %0, %1, -1\n\t"
- "sc %0, %2\n\t"
-+ ".set pop\n\t"
- "beqz %0, 0b\n\t"
- "addiu %0, %1, -1":
- "=&r"( rv ), "=&r"( tmp ), "=m"( *pw ):
-@@ -78,10 +84,13 @@
- __asm__ __volatile__
- (
- "0:\n\t"
-+ ".set push\n\t"
-+ ".set mips2\n\t"
- "ll %0, %2\n\t"
- "beqz %0, 1f\n\t"
- "addiu %1, %0, 1\n\t"
- "sc %1, %2\n\t"
-+ ".set pop\n\t"
- "beqz %1, 0b\n\t"
- "addiu %0, %0, 1\n\t"
- "1:":
Deleted: boost/trunk/debian/patches/python2.5-elementtree.patch
===================================================================
--- boost/trunk/debian/patches/python2.5-elementtree.patch 2011-11-07 07:37:53 UTC (rev 14664)
+++ boost/trunk/debian/patches/python2.5-elementtree.patch 2011-11-19 05:16:26 UTC (rev 14665)
@@ -1,29 +0,0 @@
-Description: Use ElementTree from the python standard library
- Patch from Ubuntu, forwarded by James Westby.
-Author: Ubuntu
-Bug: 489022
-Forwarded: http://svn.boost.org/trac/boost/ticket/2208
-
---- boost1.35-1.35.0.orig/libs/python/pyste/src/Pyste/GCCXMLParser.py
-+++ boost1.35-1.35.0/libs/python/pyste/src/Pyste/GCCXMLParser.py
-@@ -4,12 +4,16 @@
- # http://www.boost.org/LICENSE_1_0.txt)
-
- from declarations import *
--# try to use cElementTree if avaiable
- try:
-- from cElementTree import ElementTree
-+ # try to use internal elementtree
-+ from xml.etree.cElementTree import ElementTree
- except ImportError:
-- # fall back to the normal elementtree
-- from elementtree.ElementTree import ElementTree
-+ # try to use cElementTree if avaiable
-+ try:
-+ from cElementTree import ElementTree
-+ except ImportError:
-+ # fall back to the normal elementtree
-+ from elementtree.ElementTree import ElementTree
- from xml.parsers.expat import ExpatError
- from copy import deepcopy
- from utils import enumerate
Modified: boost/trunk/debian/patches/series
===================================================================
--- boost/trunk/debian/patches/series 2011-11-07 07:37:53 UTC (rev 14664)
+++ boost/trunk/debian/patches/series 2011-11-19 05:16:26 UTC (rev 14665)
@@ -1,9 +1,5 @@
-mips-asm.patch
boost-python-examples.patch
endian.patch
-python2.5-elementtree.patch
sh4.patch
-hurd-ellint_rd.patch
-hurd-execution_monitor.patch
kfreebsd-thread.patch
boost-1.44-py3.1.patch
More information about the pkg-boost-commits
mailing list