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

smr at alioth.debian.org smr at alioth.debian.org
Sat Aug 16 23:42:14 UTC 2008


Author: smr
Date: 2008-08-16 23:42:13 +0000 (Sat, 16 Aug 2008)
New Revision: 14280

Added:
   boost/trunk/debian/patches/gcc43-date_time.patch
   boost/trunk/debian/patches/gcc43-path_name_check.patch
   boost/trunk/debian/patches/gcc43-spirit-1617.patch
Removed:
   boost/trunk/debian/patches/gcc-4.3.patch
Modified:
   boost/trunk/debian/Notes
   boost/trunk/debian/changelog
   boost/trunk/debian/patches/series
Log:
Re-jig the GCC 4.3 fixes: now in separate patch files.  Revisit the open boost tickets, creating gcc43-spirit-1617.patch, updating Notes.

Modified: boost/trunk/debian/Notes
===================================================================
--- boost/trunk/debian/Notes	2008-08-16 21:49:08 UTC (rev 14279)
+++ boost/trunk/debian/Notes	2008-08-16 23:42:13 UTC (rev 14280)
@@ -1,26 +1,29 @@
 	GCC 4.3 Patches
 	---------------
 
-As of 2008-03-23, there are a number of issues with respect to GCC
+As of 2008-08-16, there are a number of issues with respect to GCC
 4.3.  A post on the Boost list gives a query to list all the open
 reports in the Boost trac system:
 
   http://svn.boost.org/trac/boost/query?status=new&status=assigned&status=reopened&summary=~4.3&order=priority
 
 Here we track the open tickets and status with respect to the Debian
-gcc-4.3.patch:
+patch series.
 
   Ticket  Inc?  Comment
   ------  ----  ----------------------------------
-  1528     no   Not clear whether patch is good.
-  1570    yes   Patch of 2008-01-15.
-  1605     no   Library property_tree not present in 1.34.1
-  1615    yes   Patch of 2008-02-02.
-  1617    yes   Partial: in patch of 2008-02-02, first two files failed, 
-                only numerics_tests.cpp applied.
-  1630     no   No patch given as of 2008-03-23.
+  1528     no   Patch applied upstream, present in 1.36.0
+  1570     no   Patch applied upstream, present in 1.36.0
+  1605     no   Library property_tree not present in 1.36.0
+  1615    yes   gcc43-date_time.patch
+  1617    yes   gcc43-spirit-1617.patch
+  1630     no   No patch given as of 2008-08-16
+  1955     no   Library property_tree not present in 1.36.0
+  2083     no   Duplicate of ticket 1615
+  2091     no   Duplicate of ticket 1615
 
 
+
 	Thread Support
 	--------------
 

Modified: boost/trunk/debian/changelog
===================================================================
--- boost/trunk/debian/changelog	2008-08-16 21:49:08 UTC (rev 14279)
+++ boost/trunk/debian/changelog	2008-08-16 23:42:13 UTC (rev 14280)
@@ -4,11 +4,16 @@
     - patches/serialisation-utility-include.patch:
     - patches/serialization-intrinsic64.patch:
     - patches/sp_counted_base.patch: Remove.  Applied upstream.
-  
-  * patches/gcc-4.3.patch: Adjust.
 
- -- Steve M. Robbins <smr at debian.org>  Fri, 15 Aug 2008 20:03:17 -0500
+  * patches/gcc43-date_time.patch:
+  * patches/gcc43-spirit-1617.patch:
+  * patches/gcc43-path_name_check.patch: New.  Fixes for GCC 4.3 issues.
 
+  * patches/gcc-4.3.patch: Remove.  Most of this was applied upstream;
+    remainder is now in gcc43-date_time.patch.
+
+ -- Steve M. Robbins <smr at debian.org>  Sat, 16 Aug 2008 18:40:16 -0500
+
 boost1.35 (1.35.0-8) experimental; urgency=low
 
   * debian/patches/jam-wall-clean.patch: Additional changes to expand.c,

Deleted: boost/trunk/debian/patches/gcc-4.3.patch
===================================================================
--- boost/trunk/debian/patches/gcc-4.3.patch	2008-08-16 21:49:08 UTC (rev 14279)
+++ boost/trunk/debian/patches/gcc-4.3.patch	2008-08-16 23:42:13 UTC (rev 14280)
@@ -1,21 +0,0 @@
---- boost1.36-1.36.0.orig/boost/date_time/tz_db_base.hpp
-+++ boost1.36-1.36.0/boost/date_time/tz_db_base.hpp
-@@ -158,7 +158,7 @@
-       typedef typename time_zone_type::base_type time_zone_base_type;
-       typedef typename time_zone_type::time_duration_type time_duration_type;
-       typedef time_zone_names_base<char_type> time_zone_names;
--      typedef dst_adjustment_offsets<time_duration_type> dst_adjustment_offsets;
-+      typedef boost::date_time::dst_adjustment_offsets<time_duration_type> dst_adjustment_offsets;
-       typedef std::basic_string<char_type> string_type;
- 
-       //! Constructs an empty database
---- boost1.36-1.36.0.orig/tools/inspect/path_name_check.cpp
-+++ boost1.36-1.36.0/tools/inspect/path_name_check.cpp
-@@ -15,6 +15,7 @@
- #include <string>
- #include <algorithm>
- #include <cctype>
-+#include <cstring>
- 
- using std::string;
- 

Added: boost/trunk/debian/patches/gcc43-date_time.patch
===================================================================
--- boost/trunk/debian/patches/gcc43-date_time.patch	                        (rev 0)
+++ boost/trunk/debian/patches/gcc43-date_time.patch	2008-08-16 23:42:13 UTC (rev 14280)
@@ -0,0 +1,13 @@
+Patch from http://svn.boost.org/trac/boost/ticket/1615
+
+--- boost1.36-1.36.0.orig/boost/date_time/tz_db_base.hpp
++++ boost1.36-1.36.0/boost/date_time/tz_db_base.hpp
+@@ -158,8 +158,8 @@
+       typedef typename time_zone_type::base_type time_zone_base_type;
+       typedef typename time_zone_type::time_duration_type time_duration_type;
+       typedef time_zone_names_base<char_type> time_zone_names;
+-      typedef dst_adjustment_offsets<time_duration_type> dst_adjustment_offsets;
++      typedef boost::date_time::dst_adjustment_offsets<time_duration_type> dst_adjustment_offsets;
+       typedef std::basic_string<char_type> string_type;
+ 
+       //! Constructs an empty database

Added: boost/trunk/debian/patches/gcc43-path_name_check.patch
===================================================================
--- boost/trunk/debian/patches/gcc43-path_name_check.patch	                        (rev 0)
+++ boost/trunk/debian/patches/gcc43-path_name_check.patch	2008-08-16 23:42:13 UTC (rev 14280)
@@ -0,0 +1,12 @@
+Reported upstream as http://svn.boost.org/trac/boost/ticket/2210
+
+--- boost1.36-1.36.0.orig/tools/inspect/path_name_check.cpp
++++ boost1.36-1.36.0/tools/inspect/path_name_check.cpp
+@@ -15,6 +15,7 @@
+ #include <string>
+ #include <algorithm>
+ #include <cctype>
++#include <cstring>
+ 
+ using std::string;
+ 

Added: boost/trunk/debian/patches/gcc43-spirit-1617.patch
===================================================================
--- boost/trunk/debian/patches/gcc43-spirit-1617.patch	                        (rev 0)
+++ boost/trunk/debian/patches/gcc43-spirit-1617.patch	2008-08-16 23:42:13 UTC (rev 14280)
@@ -0,0 +1,38 @@
+Fix for http://svn.boost.org/trac/boost/ticket/1617
+
+--- boost1.36-1.36.0.orig/libs/spirit/classic/test/mix_and_match_trees.cpp
++++ boost1.36-1.36.0/libs/spirit/classic/test/mix_and_match_trees.cpp
+@@ -54,7 +54,7 @@
+ 
+         typedef rule<ast_scanner> ast_rule;
+         typedef rule<pt_scanner> pt_rule;
+-        typedef rule<Scanner> rule;
++        typedef rule<Scanner> rule_;
+ 
+         definition(my_grammar const & /* self */)
+         {
+@@ -62,12 +62,12 @@
+             start_ = gen_pt_node_d[ pt_rule_ ];
+         }
+ 
+-        rule const & start() const
++        rule_ const & start() const
+         {
+             return start_;
+         }
+ 
+-        rule start_;
++        rule_ start_;
+         ast_rule ast_rule_;
+         pt_rule pt_rule_;
+     };
+--- boost1.36-1.36.0.orig/libs/spirit/classic/test/numerics_tests.cpp
++++ boost1.36-1.36.0/libs/spirit/classic/test/numerics_tests.cpp
+@@ -11,6 +11,7 @@
+ #include <boost/spirit/include/classic_assign_actor.hpp>
+ #include <iostream>
+ #include <boost/detail/lightweight_test.hpp>
++#include <climits>
+ 
+ using namespace std;
+ using namespace BOOST_SPIRIT_CLASSIC_NS;

Modified: boost/trunk/debian/patches/series
===================================================================
--- boost/trunk/debian/patches/series	2008-08-16 21:49:08 UTC (rev 14279)
+++ boost/trunk/debian/patches/series	2008-08-16 23:42:13 UTC (rev 14280)
@@ -5,5 +5,7 @@
 library-naming.patch
 suppress-compiler-warnings.patch
 kfreebsd-poll-symbols.patch
-gcc-4.3.patch
+gcc43-date_time.patch
+gcc43-spirit-1617.patch
+gcc43-path_name_check.patch
 date_time_date_formatting_hpp.patch




More information about the pkg-boost-commits mailing list