rpms/boost/devel boost-gcc43.patch,1.6,1.7
Petr Machata (pmachata)
fedora-extras-commits at redhat.com
Mon Aug 11 21:57:12 UTC 2008
Author: pmachata
Update of /cvs/pkgs/rpms/boost/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20532
Modified Files:
boost-gcc43.patch
Log Message:
Regenerate gcc43.patch so that it applies cleanly.
boost-gcc43.patch:
Index: boost-gcc43.patch
===================================================================
RCS file: /cvs/pkgs/rpms/boost/devel/boost-gcc43.patch,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- boost-gcc43.patch 11 Aug 2008 21:24:13 -0000 1.6
+++ boost-gcc43.patch 11 Aug 2008 21:56:42 -0000 1.7
@@ -1,8 +1,74 @@
-diff -urp boost_1_34_1/boost/regex/v4/basic_regex_creator.hpp boost_1_34_1.pm/boost/regex/v4/basic_regex_creator.hpp
---- boost_1_34_1/boost/regex/v4/basic_regex_creator.hpp 2006-07-16 18:06:38.000000000 +0200
-+++ boost_1_34_1.pm/boost/regex/v4/basic_regex_creator.hpp 2008-02-06 17:36:42.000000000 +0100
-@@ -24,6 +24,8 @@
- # include BOOST_ABI_PREFIX
+diff -urp boost_1_36_0_beta1-orig/boost/archive/polymorphic_iarchive.hpp boost_1_36_0_beta1/boost/archive/polymorphic_iarchive.hpp
+--- boost_1_36_0_beta1-orig/boost/archive/polymorphic_iarchive.hpp 2008-08-11 23:49:44.000000000 +0200
++++ boost_1_36_0_beta1/boost/archive/polymorphic_iarchive.hpp 2008-08-11 23:50:38.000000000 +0200
+@@ -35,6 +35,8 @@ namespace std{
+ #include <boost/serialization/nvp.hpp>
+ #include <boost/archive/detail/register_archive.hpp>
+
++#include <limits.h>
++
+ // determine if its necessary to handle (u)int64_t specifically
+ // i.e. that its not a synonym for (unsigned) long
+ // if there is no 64 bit int or if its the same as a long
+Only in boost_1_36_0_beta1/boost/archive: polymorphic_iarchive.hpp.orig
+diff -urp boost_1_36_0_beta1-orig/boost/archive/polymorphic_oarchive.hpp boost_1_36_0_beta1/boost/archive/polymorphic_oarchive.hpp
+--- boost_1_36_0_beta1-orig/boost/archive/polymorphic_oarchive.hpp 2008-08-11 23:49:44.000000000 +0200
++++ boost_1_36_0_beta1/boost/archive/polymorphic_oarchive.hpp 2008-08-11 23:50:38.000000000 +0200
+@@ -34,6 +34,8 @@ namespace std{
+ #include <boost/serialization/nvp.hpp>
+ #include <boost/archive/detail/register_archive.hpp>
+
++#include <limits.h>
++
+ // determine if its necessary to handle (u)int64_t specifically
+ // i.e. that its not a synonym for (unsigned) long
+ // if there is no 64 bit int or if its the same as a long
+Only in boost_1_36_0_beta1/boost/archive: polymorphic_oarchive.hpp.orig
+diff -urp boost_1_36_0_beta1-orig/boost/date_time/tz_db_base.hpp boost_1_36_0_beta1/boost/date_time/tz_db_base.hpp
+--- boost_1_36_0_beta1-orig/boost/date_time/tz_db_base.hpp 2008-08-11 23:49:45.000000000 +0200
++++ boost_1_36_0_beta1/boost/date_time/tz_db_base.hpp 2008-08-11 23:50:38.000000000 +0200
+@@ -158,7 +158,7 @@ namespace boost {
+ 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 dst_adjustment_offsets<time_duration_type> dst_adjustment_offsets_t;
+ typedef std::basic_string<char_type> string_type;
+
+ //! Constructs an empty database
+@@ -346,18 +346,18 @@ namespace boost {
+ time_duration_type utc_offset =
+ str_from_delimited_time_duration<time_duration_type,char_type>(result[GMTOFFSET]);
+
+- dst_adjustment_offsets adjust(time_duration_type(0,0,0),
+- time_duration_type(0,0,0),
+- time_duration_type(0,0,0));
++ dst_adjustment_offsets_t adjust(time_duration_type(0,0,0),
++ time_duration_type(0,0,0),
++ time_duration_type(0,0,0));
+
+ boost::shared_ptr<rule_type> rules;
+
+ if(has_dst){
+- adjust = dst_adjustment_offsets(
+- str_from_delimited_time_duration<time_duration_type,char_type>(result[DSTADJUST]),
+- str_from_delimited_time_duration<time_duration_type,char_type>(result[START_TIME]),
+- str_from_delimited_time_duration<time_duration_type,char_type>(result[END_TIME])
+- );
++ adjust = dst_adjustment_offsets_t(
++ str_from_delimited_time_duration<time_duration_type,char_type>(result[DSTADJUST]),
++ str_from_delimited_time_duration<time_duration_type,char_type>(result[START_TIME]),
++ str_from_delimited_time_duration<time_duration_type,char_type>(result[END_TIME])
++ );
+
+ rules =
+ boost::shared_ptr<rule_type>(parse_rules(result[START_DATE_RULE],
+Only in boost_1_36_0_beta1/boost/date_time: tz_db_base.hpp.orig
+diff -urp boost_1_36_0_beta1-orig/boost/regex/v4/basic_regex_creator.hpp boost_1_36_0_beta1/boost/regex/v4/basic_regex_creator.hpp
+--- boost_1_36_0_beta1-orig/boost/regex/v4/basic_regex_creator.hpp 2008-08-11 23:49:48.000000000 +0200
++++ boost_1_36_0_beta1/boost/regex/v4/basic_regex_creator.hpp 2008-08-11 23:50:38.000000000 +0200
+@@ -36,6 +36,8 @@
+ # pragma warning(disable: 4800)
#endif
+#include <limits.h>
@@ -10,11 +76,12 @@
namespace boost{
namespace re_detail{
-diff -urp boost_1_34_1/boost/regex/v4/basic_regex.hpp boost_1_34_1.pm/boost/regex/v4/basic_regex.hpp
---- boost_1_34_1/boost/regex/v4/basic_regex.hpp 2007-06-05 19:28:18.000000000 +0200
-+++ boost_1_34_1.pm/boost/regex/v4/basic_regex.hpp 2008-02-06 17:33:30.000000000 +0100
-@@ -23,6 +23,8 @@
- # include BOOST_ABI_PREFIX
+Only in boost_1_36_0_beta1/boost/regex/v4: basic_regex_creator.hpp.orig
+diff -urp boost_1_36_0_beta1-orig/boost/regex/v4/basic_regex.hpp boost_1_36_0_beta1/boost/regex/v4/basic_regex.hpp
+--- boost_1_36_0_beta1-orig/boost/regex/v4/basic_regex.hpp 2008-08-11 23:49:48.000000000 +0200
++++ boost_1_36_0_beta1/boost/regex/v4/basic_regex.hpp 2008-08-11 23:50:38.000000000 +0200
+@@ -30,6 +30,8 @@
+ #pragma warning(pop)
#endif
+#include <limits.h>
@@ -22,11 +89,12 @@
namespace boost{
#ifdef BOOST_MSVC
#pragma warning(push)
-diff -urp boost_1_34_1/boost/regex/v4/basic_regex_parser.hpp boost_1_34_1.pm/boost/regex/v4/basic_regex_parser.hpp
---- boost_1_34_1/boost/regex/v4/basic_regex_parser.hpp 2008-02-06 17:45:26.000000000 +0100
-+++ boost_1_34_1.pm/boost/regex/v4/basic_regex_parser.hpp 2008-02-06 17:38:58.000000000 +0100
-@@ -23,6 +23,8 @@
- # include BOOST_ABI_PREFIX
+Only in boost_1_36_0_beta1/boost/regex/v4: basic_regex.hpp.orig
+diff -urp boost_1_36_0_beta1-orig/boost/regex/v4/basic_regex_parser.hpp boost_1_36_0_beta1/boost/regex/v4/basic_regex_parser.hpp
+--- boost_1_36_0_beta1-orig/boost/regex/v4/basic_regex_parser.hpp 2008-08-11 23:49:48.000000000 +0200
++++ boost_1_36_0_beta1/boost/regex/v4/basic_regex_parser.hpp 2008-08-11 23:50:38.000000000 +0200
+@@ -30,6 +30,8 @@
+ #pragma warning(pop)
#endif
+#include <limits.h>
@@ -34,11 +102,12 @@
namespace boost{
namespace re_detail{
-diff -urp boost_1_34_1/boost/regex/v4/perl_matcher.hpp boost_1_34_1.pm/boost/regex/v4/perl_matcher.hpp
---- boost_1_34_1/boost/regex/v4/perl_matcher.hpp 2006-10-18 14:55:30.000000000 +0200
-+++ boost_1_34_1.pm/boost/regex/v4/perl_matcher.hpp 2008-02-06 17:39:44.000000000 +0100
-@@ -18,6 +18,8 @@
- # include BOOST_ABI_PREFIX
+Only in boost_1_36_0_beta1/boost/regex/v4: basic_regex_parser.hpp.orig
+diff -urp boost_1_36_0_beta1-orig/boost/regex/v4/perl_matcher.hpp boost_1_36_0_beta1/boost/regex/v4/perl_matcher.hpp
+--- boost_1_36_0_beta1-orig/boost/regex/v4/perl_matcher.hpp 2008-08-11 23:49:48.000000000 +0200
++++ boost_1_36_0_beta1/boost/regex/v4/perl_matcher.hpp 2008-08-11 23:50:38.000000000 +0200
+@@ -30,6 +30,8 @@
+ # pragma warning(disable: 4800)
#endif
+#include <limits.h>
@@ -46,9 +115,10 @@
namespace boost{
namespace re_detail{
-diff -urp boost_1_34_1/boost/regex/v4/regex_split.hpp boost_1_34_1.pm/boost/regex/v4/regex_split.hpp
---- boost_1_34_1/boost/regex/v4/regex_split.hpp 2005-01-21 18:22:38.000000000 +0100
-+++ boost_1_34_1.pm/boost/regex/v4/regex_split.hpp 2008-02-06 17:42:13.000000000 +0100
+Only in boost_1_36_0_beta1/boost/regex/v4: perl_matcher.hpp.orig
+diff -urp boost_1_36_0_beta1-orig/boost/regex/v4/regex_split.hpp boost_1_36_0_beta1/boost/regex/v4/regex_split.hpp
+--- boost_1_36_0_beta1-orig/boost/regex/v4/regex_split.hpp 2008-08-11 23:49:48.000000000 +0200
++++ boost_1_36_0_beta1/boost/regex/v4/regex_split.hpp 2008-08-11 23:50:38.000000000 +0200
@@ -21,6 +21,8 @@
#ifndef BOOST_REGEX_SPLIT_HPP
#define BOOST_REGEX_SPLIT_HPP
@@ -57,12 +127,13 @@
+
namespace boost{
- #ifdef BOOST_HAS_ABI_HEADERS
-diff -urp boost_1_34_1/boost/regex/v4/states.hpp boost_1_34_1.pm/boost/regex/v4/states.hpp
---- boost_1_34_1/boost/regex/v4/states.hpp 2005-09-20 14:01:25.000000000 +0200
-+++ boost_1_34_1.pm/boost/regex/v4/states.hpp 2008-02-06 17:32:42.000000000 +0100
-@@ -23,6 +23,8 @@
- # include BOOST_ABI_PREFIX
+ #ifdef BOOST_MSVC
+Only in boost_1_36_0_beta1/boost/regex/v4: regex_split.hpp.orig
+diff -urp boost_1_36_0_beta1-orig/boost/regex/v4/states.hpp boost_1_36_0_beta1/boost/regex/v4/states.hpp
+--- boost_1_36_0_beta1-orig/boost/regex/v4/states.hpp 2008-08-11 23:49:48.000000000 +0200
++++ boost_1_36_0_beta1/boost/regex/v4/states.hpp 2008-08-11 23:50:38.000000000 +0200
+@@ -30,6 +30,8 @@
+ #pragma warning(pop)
#endif
+#include <limits.h>
@@ -70,9 +141,10 @@
namespace boost{
namespace re_detail{
-diff -urp boost_1_34_1/boost/wave/cpplexer/re2clex/cpp_re2c_lexer.hpp boost_1_34_1.pm/boost/wave/cpplexer/re2clex/cpp_re2c_lexer.hpp
---- boost_1_34_1/boost/wave/cpplexer/re2clex/cpp_re2c_lexer.hpp 2006-12-20 17:38:24.000000000 +0100
-+++ boost_1_34_1.pm/boost/wave/cpplexer/re2clex/cpp_re2c_lexer.hpp 2008-02-06 17:25:00.000000000 +0100
+Only in boost_1_36_0_beta1/boost/regex/v4: states.hpp.orig
+diff -urp boost_1_36_0_beta1-orig/boost/wave/cpplexer/re2clex/cpp_re2c_lexer.hpp boost_1_36_0_beta1/boost/wave/cpplexer/re2clex/cpp_re2c_lexer.hpp
+--- boost_1_36_0_beta1-orig/boost/wave/cpplexer/re2clex/cpp_re2c_lexer.hpp 2008-08-11 23:49:45.000000000 +0200
++++ boost_1_36_0_beta1/boost/wave/cpplexer/re2clex/cpp_re2c_lexer.hpp 2008-08-11 23:50:38.000000000 +0200
@@ -16,6 +16,8 @@
#include <string>
#include <cstdio>
@@ -82,66 +154,4 @@
#if defined(BOOST_SPIRIT_DEBUG)
#include <iostream>
#endif // defined(BOOST_SPIRIT_DEBUG)
-diff -urp boost_1_34_1/boost/archive/polymorphic_iarchive.hpp boost_1_34_1.pm/boost/archive/polymorphic_iarchive.hpp
---- boost_1_34_1/boost/archive/polymorphic_iarchive.hpp 2005-12-11 07:12:51.000000000 +0100
-+++ boost_1_34_1.pm/boost/archive/polymorphic_iarchive.hpp 2008-02-06 18:42:07.000000000 +0100
-@@ -33,6 +33,8 @@ namespace std{
- #include <boost/archive/detail/interface_iarchive.hpp>
- #include <boost/serialization/nvp.hpp>
-
-+#include <limits.h>
-+
- // determine if its necessary to handle (u)int64_t specifically
- // i.e. that its not a synonym for (unsigned) long
- // if there is no 64 bit int or if its the same as a long
-diff -urp boost_1_34_1/boost/archive/polymorphic_iarchive.hpp boost_1_34_1.pm/boost/archive/polymorphic_iarchive.hpp
---- boost_1_34_1/boost/archive/polymorphic_oarchive.hpp 2005-12-11 07:12:51.000000000 +0100
-+++ boost_1_34_1.pm/boost/archive/polymorphic_oarchive.hpp 2008-02-06 18:42:07.000000000 +0100
-@@ -33,6 +33,8 @@ namespace std{
- #include <boost/archive/detail/interface_iarchive.hpp>
- #include <boost/serialization/nvp.hpp>
-
-+#include <limits.h>
-+
- // determine if its necessary to handle (u)int64_t specifically
- // i.e. that its not a synonym for (unsigned) long
- // if there is no 64 bit int or if its the same as a long
-diff -urp new-boost/date_time/tz_db_base.hpp old-boost/date_time/tz_db_base.hpp
---- boost_1_34_1/boost/date_time/tz_db_base.hpp 2008-06-12 13:03:34.000000000 +0200
-+++ boost_1_34_1-pm/boost/date_time/tz_db_base.hpp 2008-06-12 12:59:43.000000000 +0200
-@@ -158,7 +158,7 @@ namespace boost {
- 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 dst_adjustment_offsets<time_duration_type> dst_adjustment_offsets_t;
- typedef std::basic_string<char_type> string_type;
-
- //! Constructs an empty database
-@@ -346,18 +346,18 @@ namespace boost {
- time_duration_type utc_offset =
- str_from_delimited_time_duration<time_duration_type,char_type>(result[GMTOFFSET]);
-
-- dst_adjustment_offsets adjust(time_duration_type(0,0,0),
-- time_duration_type(0,0,0),
-- time_duration_type(0,0,0));
-+ dst_adjustment_offsets_t adjust(time_duration_type(0,0,0),
-+ time_duration_type(0,0,0),
-+ time_duration_type(0,0,0));
-
- boost::shared_ptr<rule_type> rules;
-
- if(has_dst){
-- adjust = dst_adjustment_offsets(
-- str_from_delimited_time_duration<time_duration_type,char_type>(result[DSTADJUST]),
-- str_from_delimited_time_duration<time_duration_type,char_type>(result[START_TIME]),
-- str_from_delimited_time_duration<time_duration_type,char_type>(result[END_TIME])
-- );
-+ adjust = dst_adjustment_offsets_t(
-+ str_from_delimited_time_duration<time_duration_type,char_type>(result[DSTADJUST]),
-+ str_from_delimited_time_duration<time_duration_type,char_type>(result[START_TIME]),
-+ str_from_delimited_time_duration<time_duration_type,char_type>(result[END_TIME])
-+ );
-
- rules =
- boost::shared_ptr<rule_type>(parse_rules(result[START_DATE_RULE],
+Only in boost_1_36_0_beta1/boost/wave/cpplexer/re2clex: cpp_re2c_lexer.hpp.orig
More information about the fedora-extras-commits
mailing list