From 1b86749d19b12197693b289bde4e8ecb79f2d7d7 Mon Sep 17 00:00:00 2001 From: Petr Machata Date: Aug 12 2008 16:40:21 +0000 Subject: Revert rebase. --- diff --git a/boost-configure.patch b/boost-configure.patch index 91e8508..7ce1a52 100644 --- a/boost-configure.patch +++ b/boost-configure.patch @@ -13,7 +13,7 @@ BJAM="" TOOLSET="" -! BJAM_CONFIG="-d2 --layout=system variant=release threading=single,multi debug-symbols=on" +! BJAM_CONFIG="-d2 --layout=system variant=release debug-symbols=on" BUILD="" PREFIX=/usr/local EPREFIX= diff --git a/boost-gcc-soname.patch b/boost-gcc-soname.patch index 7ab692f..f26b033 100644 --- a/boost-gcc-soname.patch +++ b/boost-gcc-soname.patch @@ -1,21 +1,37 @@ ---- boost_1_36_0_beta1/tools/build/v2/tools/gcc.jam.orig 2008-08-11 13:15:13.000000000 +0200 -+++ boost_1_36_0_beta1/tools/build/v2/tools/gcc.jam 2008-08-11 15:21:05.000000000 +0200 -@@ -336,7 +336,8 @@ - # OSF does have an option called -soname but it doesn't seem to work as - # expected, therefore it has been disabled. - HAVE_SONAME = "" ; -- SONAME_OPTION = -h ; -+ SONAME_OPTION = -soname ; -+ SONAME_VERSION = !!!SONAME!!! ; - } - - -@@ -726,7 +727,7 @@ - # Differ from 'link' above only by -shared. - actions link.dll bind LIBRARIES - { -- "$(CONFIG_COMMAND)" -L"$(LINKPATH)" -Wl,$(RPATH_OPTION:E=-R)$(SPACE)-Wl,"$(RPATH)" "$(.IMPLIB-COMMAND)$(<[1])" -o "$(<[-1])" $(HAVE_SONAME)-Wl,$(SONAME_OPTION)$(SPACE)-Wl,$(<[-1]:D=) -shared $(START-GROUP) "$(>)" "$(LIBRARIES)" $(FINDLIBS-ST-PFX) -l$(FINDLIBS-ST) $(FINDLIBS-SA-PFX) -l$(FINDLIBS-SA) $(END-GROUP) $(OPTIONS) $(USER_OPTIONS) -+ "$(CONFIG_COMMAND)" -L"$(LINKPATH)" -Wl,$(RPATH_OPTION:E=-R)$(SPACE)-Wl,"$(RPATH)" "$(.IMPLIB-COMMAND)$(<[1])" -o "$(<[-1])" $(HAVE_SONAME)-Wl,$(SONAME_OPTION)$(SPACE)-Wl,$(<[-1]:D=).$(SONAME_VERSION) -shared $(START-GROUP) "$(>)" "$(LIBRARIES)" $(FINDLIBS-ST-PFX) -l$(FINDLIBS-ST) $(FINDLIBS-SA-PFX) -l$(FINDLIBS-SA) $(END-GROUP) $(OPTIONS) $(USER_OPTIONS) - } - - # Set up threading support. It's somewhat contrived, so perform it at the end, +*** tools/build/v2/tools/gcc.jam.orig 2007-05-03 08:09:04.000000000 +0200 +--- tools/build/v2/tools/gcc.jam 2007-06-26 20:37:44.000000000 +0200 +*************** if [ os.name ] != NT && [ os.name ] != O +*** 316,322 **** + # expected, therefore it has been disabled. + + HAVE_SONAME = "" ; +! SONAME_OPTION = -h ; + } + + +--- 316,323 ---- + # expected, therefore it has been disabled. + + HAVE_SONAME = "" ; +! SONAME_OPTION = -soname ; +! SONAME_VERSION = 3 ; + } + + +*************** rule link.dll ( targets * : sources * : +*** 631,637 **** + # Differ from 'link' above only by -shared. + actions link.dll bind LIBRARIES + { +! "$(CONFIG_COMMAND)" -L"$(LINKPATH)" -Wl,$(RPATH_OPTION:E=-R)$(SPACE)-Wl,"$(RPATH)" "$(.IMPLIB-COMMAND)$(<[1])" -o "$(<[-1])" $(HAVE_SONAME)-Wl,$(SONAME_OPTION)$(SPACE)-Wl,$(<[-1]:D=) -shared $(START-GROUP) "$(>)" "$(LIBRARIES)" -l$(FINDLIBS-ST) -l$(FINDLIBS-SA) $(END-GROUP) $(OPTIONS) $(USER_OPTIONS) + } + + # Set up threading support. It's somewhat contrived, so perform it at the end, +--- 632,638 ---- + # Differ from 'link' above only by -shared. + actions link.dll bind LIBRARIES + { +! "$(CONFIG_COMMAND)" -L"$(LINKPATH)" -Wl,$(RPATH_OPTION:E=-R)$(SPACE)-Wl,"$(RPATH)" "$(.IMPLIB-COMMAND)$(<[1])" -o "$(<[-1])" $(HAVE_SONAME)-Wl,$(SONAME_OPTION)$(SPACE)-Wl,$(<[-1]:D=).$(SONAME_VERSION) -shared $(START-GROUP) "$(>)" "$(LIBRARIES)" -l$(FINDLIBS-ST) -l$(FINDLIBS-SA) $(END-GROUP) $(OPTIONS) $(USER_OPTIONS) + } + + # Set up threading support. It's somewhat contrived, so perform it at the end, diff --git a/boost-gcc43.patch b/boost-gcc43.patch index 7b1f999..4346c3c 100644 --- a/boost-gcc43.patch +++ b/boost-gcc43.patch @@ -1,74 +1,19 @@ -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 - #include - -+#include -+ - // 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 - #include - +diff -urp boost_1_34_1/boost/spirit/phoenix/operators.hpp boost_1_34_1.pm/boost/spirit/phoenix/operators.hpp +--- boost_1_34_1/boost/spirit/phoenix/operators.hpp 2006-08-25 18:27:30.000000000 +0200 ++++ boost_1_34_1.pm/boost/spirit/phoenix/operators.hpp 2008-02-06 16:29:32.000000000 +0100 +@@ -24,6 +24,7 @@ + #include + #include + #include +#include -+ - // 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 time_zone_names; -- typedef dst_adjustment_offsets dst_adjustment_offsets; -+ typedef dst_adjustment_offsets dst_adjustment_offsets_t; - typedef std::basic_string string_type; - - //! Constructs an empty database -@@ -346,18 +346,18 @@ namespace boost { - time_duration_type utc_offset = - str_from_delimited_time_duration(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 rules; - if(has_dst){ -- adjust = dst_adjustment_offsets( -- str_from_delimited_time_duration(result[DSTADJUST]), -- str_from_delimited_time_duration(result[START_TIME]), -- str_from_delimited_time_duration(result[END_TIME]) -- ); -+ adjust = dst_adjustment_offsets_t( -+ str_from_delimited_time_duration(result[DSTADJUST]), -+ str_from_delimited_time_duration(result[START_TIME]), -+ str_from_delimited_time_duration(result[END_TIME]) -+ ); - - rules = - boost::shared_ptr(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) + /////////////////////////////////////////////////////////////////////////////// + namespace phoenix { +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 #endif +#include @@ -76,12 +21,11 @@ diff -urp boost_1_36_0_beta1-orig/boost/regex/v4/basic_regex_creator.hpp boost_1 namespace boost{ namespace re_detail{ -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) +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 #endif +#include @@ -89,12 +33,11 @@ diff -urp boost_1_36_0_beta1-orig/boost/regex/v4/basic_regex.hpp boost_1_36_0_be namespace boost{ #ifdef BOOST_MSVC #pragma warning(push) -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) +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 #endif +#include @@ -102,12 +45,22 @@ diff -urp boost_1_36_0_beta1-orig/boost/regex/v4/basic_regex_parser.hpp boost_1_ namespace boost{ namespace re_detail{ -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) +diff -urp boost_1_34_1/boost/regex/v4/cpp_regex_traits.hpp boost_1_34_1.pm/boost/regex/v4/cpp_regex_traits.hpp +--- boost_1_34_1/boost/regex/v4/cpp_regex_traits.hpp 2007-01-15 12:09:44.000000000 +0100 ++++ boost_1_34_1.pm/boost/regex/v4/cpp_regex_traits.hpp 2008-02-06 17:26:51.000000000 +0100 +@@ -41,6 +41,7 @@ + + #include + #include ++#include + + #ifdef BOOST_HAS_ABI_HEADERS + # include BOOST_ABI_PREFIX +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 #endif +#include @@ -115,10 +68,9 @@ diff -urp boost_1_36_0_beta1-orig/boost/regex/v4/perl_matcher.hpp boost_1_36_0_b namespace boost{ namespace re_detail{ -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 +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 @@ -21,6 +21,8 @@ #ifndef BOOST_REGEX_SPLIT_HPP #define BOOST_REGEX_SPLIT_HPP @@ -127,13 +79,12 @@ diff -urp boost_1_36_0_beta1-orig/boost/regex/v4/regex_split.hpp boost_1_36_0_be + namespace boost{ - #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) + #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 #endif +#include @@ -141,10 +92,20 @@ diff -urp boost_1_36_0_beta1-orig/boost/regex/v4/states.hpp boost_1_36_0_beta1/b namespace boost{ namespace re_detail{ -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 +diff -urp boost_1_34_1/boost/test/test_tools.hpp boost_1_34_1.pm/boost/test/test_tools.hpp +--- boost_1_34_1/boost/test/test_tools.hpp 2007-02-22 18:57:29.000000000 +0100 ++++ boost_1_34_1.pm/boost/test/test_tools.hpp 2008-02-06 17:18:20.000000000 +0100 +@@ -44,6 +44,7 @@ + // STL + #include // for std::size_t + #include ++#include + + #include + +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 @@ -16,6 +16,8 @@ #include #include @@ -154,4 +115,101 @@ diff -urp boost_1_36_0_beta1-orig/boost/wave/cpplexer/re2clex/cpp_re2c_lexer.hpp #if defined(BOOST_SPIRIT_DEBUG) #include #endif // defined(BOOST_SPIRIT_DEBUG) -Only in boost_1_36_0_beta1/boost/wave/cpplexer/re2clex: cpp_re2c_lexer.hpp.orig +diff -urp boost_1_34_1/boost/wave/util/flex_string.hpp boost_1_34_1.pm/boost/wave/util/flex_string.hpp +--- boost_1_34_1/boost/wave/util/flex_string.hpp 2006-04-25 19:21:01.000000000 +0200 ++++ boost_1_34_1.pm/boost/wave/util/flex_string.hpp 2008-02-06 17:22:31.000000000 +0100 +@@ -94,6 +94,7 @@ class StoragePolicy + #include + #include + #include ++#include + + // this must occur after all of the includes and before any code appears + #ifdef BOOST_HAS_ABI_HEADERS +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 + #include + ++#include ++ + // 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 + #include + ++#include ++ + // 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/date_time/date_facet.hpp boost_1_34_1-pm/boost/date_time/date_facet.hpp +--- boost_1_34_1/boost/date_time/date_facet.hpp 2005-09-05 23:10:50.000000000 +0200 ++++ boost_1_34_1-pm/boost/date_time/date_facet.hpp 2008-02-13 16:07:59.000000000 +0100 +@@ -429,7 +429,7 @@ namespace boost { namespace date_time { + typedef std::basic_string string_type; + typedef CharT char_type; + typedef boost::date_time::period_parser period_parser_type; +- typedef special_values_parser special_values_parser_type; ++ typedef boost::date_time::special_values_parser special_values_parser_type; + typedef std::vector > input_collection_type; + typedef format_date_parser format_date_parser_type; + // date_generators stuff goes here +diff -urp boost_1_34_1/boost/python/detail/def_helper.hpp boost_1_34_1-pm/boost/python/detail/def_helper.hpp +--- boost_1_34_1/boost/python/detail/def_helper.hpp 2004-09-16 03:00:28.000000000 +0200 ++++ boost_1_34_1-pm/boost/python/detail/def_helper.hpp 2008-02-14 13:26:23.000000000 +0100 +@@ -155,7 +155,7 @@ namespace detail + , T3 const& + , T4 const& + , default_call_policies +- , keywords<0> ++ , boost::python::detail::keywords<0> + , char const* + , void(not_specified::*)() // A function pointer type which is never an + // appropriate default implementation +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 time_zone_names; +- typedef dst_adjustment_offsets dst_adjustment_offsets; ++ typedef dst_adjustment_offsets dst_adjustment_offsets_t; + typedef std::basic_string string_type; + + //! Constructs an empty database +@@ -346,18 +346,18 @@ namespace boost { + time_duration_type utc_offset = + str_from_delimited_time_duration(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 rules; + + if(has_dst){ +- adjust = dst_adjustment_offsets( +- str_from_delimited_time_duration(result[DSTADJUST]), +- str_from_delimited_time_duration(result[START_TIME]), +- str_from_delimited_time_duration(result[END_TIME]) +- ); ++ adjust = dst_adjustment_offsets_t( ++ str_from_delimited_time_duration(result[DSTADJUST]), ++ str_from_delimited_time_duration(result[START_TIME]), ++ str_from_delimited_time_duration(result[END_TIME]) ++ ); + + rules = + boost::shared_ptr(parse_rules(result[START_DATE_RULE], diff --git a/boost-regex.patch b/boost-regex.patch new file mode 100644 index 0000000..9260afc --- /dev/null +++ b/boost-regex.patch @@ -0,0 +1,40 @@ +*** boost/regex/v4/basic_regex_parser.hpp.orig 2008-01-14 12:53:01.000000000 -0600 +--- boost/regex/v4/basic_regex_parser.hpp 2008-01-14 12:57:25.000000000 -0600 +*************** bool basic_regex_parser:: +*** 777,782 **** +--- 777,783 ---- + case syntax_element_restart_continue: + case syntax_element_jump: + case syntax_element_startmark: ++ case syntax_element_backstep: + // can't legally repeat any of the above: + fail(regex_constants::error_badrepeat, m_position - m_base); + return false; +*************** bool basic_regex_parser:: +*** 1862,1867 **** +--- 1863,1869 ---- + if(markid == -4) + { + re_syntax_base* b = this->getaddress(expected_alt_point); ++ // Make sure we have exactly one alternative following this state: + if(b->type != syntax_element_alt) + { + re_alt* alt = static_cast(this->insert_state(expected_alt_point, syntax_element_alt, sizeof(re_alt))); +*************** bool basic_regex_parser:: +*** 1872,1877 **** +--- 1874,1888 ---- + fail(regex_constants::error_bad_pattern, m_position - m_base); + return false; + } ++ // check for invalid repetition of next state: ++ b = this->getaddress(expected_alt_point); ++ b = this->getaddress(static_cast(b)->next.i, b); ++ if((b->type != syntax_element_assert_backref) ++ && (b->type != syntax_element_startmark)) ++ { ++ fail(regex_constants::error_badrepeat, m_position - m_base); ++ return false; ++ } + } + // + // append closing parenthesis state: diff --git a/boost-run-tests.patch b/boost-run-tests.patch index adcc5f2..ee39db0 100644 --- a/boost-run-tests.patch +++ b/boost-run-tests.patch @@ -1,5 +1,5 @@ -*** tools/regression/src/run_tests.sh.orig 2007-07-31 19:44:25.000000000 -0500 ---- tools/regression/src/run_tests.sh 2007-08-01 12:17:25.000000000 -0500 +*** tools/regression/run_tests.sh.orig 2007-07-31 19:44:25.000000000 -0500 +--- tools/regression/run_tests.sh 2007-08-01 12:17:25.000000000 -0500 *************** *** 15,21 **** # This can be either a non-exitent directory or an already complete Boost diff --git a/boost-use-rpm-optflags.patch b/boost-use-rpm-optflags.patch index 414a63a..6fe2960 100644 --- a/boost-use-rpm-optflags.patch +++ b/boost-use-rpm-optflags.patch @@ -1,13 +1,19 @@ -diff -urp boost_1_36_0_beta1-orig/tools/build/v2/tools/gcc.jam boost_1_36_0_beta1/tools/build/v2/tools/gcc.jam ---- boost_1_36_0_beta1-orig/tools/build/v2/tools/gcc.jam 2008-08-11 13:58:22.000000000 +0200 -+++ boost_1_36_0_beta1/tools/build/v2/tools/gcc.jam 2008-08-11 13:59:21.000000000 +0200 -@@ -288,7 +288,7 @@ flags gcc.compile PCH_FILE on : off : -O0 ; --flags gcc.compile OPTIONS speed : -O3 ; -+flags gcc.compile OPTIONS speed : "$RPM_OPT_FLAGS" ; - flags gcc.compile OPTIONS space : -Os ; - - flags gcc.compile OPTIONS off : -fno-inline ; -Only in boost_1_36_0_beta1/tools/build/v2/tools: gcc.jam~ +*** tools/build/v2/tools/gcc.jam.orig 2007-08-01 01:17:16.000000000 -0500 +--- tools/build/v2/tools/gcc.jam 2007-08-01 01:17:46.000000000 -0500 +*************** flags gcc.compile PCH_FILE on : off : -O0 ; +! flags gcc.compile OPTIONS speed : -O3 ; + flags gcc.compile OPTIONS space : -Os ; + + flags gcc.compile OPTIONS off : -fno-inline ; +--- 268,274 ---- + + # Declare flags and action for compilation + flags gcc.compile OPTIONS off : -O0 ; +! flags gcc.compile OPTIONS speed : "$RPM_OPT_FLAGS" ; + flags gcc.compile OPTIONS space : -Os ; + + flags gcc.compile OPTIONS off : -fno-inline ; diff --git a/boost.spec b/boost.spec index 16641cc..5ba52aa 100644 --- a/boost.spec +++ b/boost.spec @@ -1,18 +1,13 @@ %bcond_with tests -%define sonamever 4 Name: boost Summary: The Boost C++ Libraries -Version: 1.36.0 -Release: 0.1.beta1%{?dist} +Version: 1.34.1 +Release: 16%{?dist} License: Boost URL: http://www.boost.org/ Group: System Environment/Libraries -# boost_1_36_0_beta1.tar.bz2 comes from svn checkout: -# svn co http://svn.boost.org/svn/boost/tags/release/Boost_1_36_0_beta1 \ -# boost_1_36_0_beta1 -r 47919 -Source: boost_1_36_0_beta1.tar.bz2 -Source2: boost-gcc-soname.patch +Source: http://downloads.sourceforge.net/boost/boost_1_34_1.tar.bz2 Obsoletes: boost-doc <= 1.30.2 Obsoletes: boost-python <= 1.30.2 Provides: boost-python = %{version}-%{release} @@ -25,8 +20,10 @@ BuildRequires: zlib-devel BuildRequires: python-devel BuildRequires: libicu-devel Patch0: boost-configure.patch +Patch1: boost-gcc-soname.patch Patch2: boost-use-rpm-optflags.patch Patch3: boost-run-tests.patch +Patch4: boost-regex.patch Patch5: boost-gcc43.patch %description @@ -66,11 +63,12 @@ Provides: boost-python-docs = %{version}-%{release} HTML documentation files for Boost C++ libraries. %prep -%setup -q -n %{name}_1_36_0_beta1 +%setup -q -n %{name}_1_34_1 %patch0 -p0 -sed 's/!!!SONAME!!!/%{sonamever}/' %{SOURCE2} | %{__patch} -p1 -%patch2 -p1 +%patch1 -p0 +%patch2 -p0 %patch3 -p0 +%patch4 -p0 %patch5 -p1 %build @@ -137,11 +135,11 @@ for i in `find stage -type f -name \*.a`; do done; for i in `find stage -type f -name \*.so`; do NAME=$i; - SONAME=$i.%{sonamever}; + SONAME=$i.3; VNAME=$i.%{version}; base=`basename $i`; NAMEbase=$base; - SONAMEbase=$base.%{sonamever}; + SONAMEbase=$base.3; VNAMEbase=$base.%{version}; mv $i $VNAME; ln -s $VNAMEbase $SONAME; @@ -184,7 +182,7 @@ rm -rf $RPM_BUILD_ROOT %files %defattr(-, root, root, -) %{_libdir}/*.so.%{version} -%{_libdir}/*.so.%{sonamever} +%{_libdir}/*.so.3 %files devel %defattr(-, root, root, -) @@ -200,12 +198,6 @@ rm -rf $RPM_BUILD_ROOT %doc %{_docdir}/%{name}-%{version} %changelog -* Mon Aug 11 2008 Petr Machata - 1.36.0-0.1.beta1 -- Rebase to 1.36.0.beta1 - - Drop boost-regex.patch and portions of boost-gcc43.patch, port the rest - - Automate SONAME tracking and bump SONAME to 4 - - Adjust boost-configure.patch to include threading=single,multi explicitly - * Thu Jun 12 2008 Petr Machata - 1.34.1-16 - Fix "changes meaning of keywords" in boost date_time - Related: #450718 diff --git a/sources b/sources index 3f51117..f8946f7 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -b70fdfdfb6a2ec9cc1b73095c67293cd boost_1_36_0_beta1.tar.bz2 +2d938467e8a448a2c9763e0a9f8ca7e5 boost_1_34_1.tar.bz2