From a7589e3b57486963fea6f443ea6bb67fdd745a5f Mon Sep 17 00:00:00 2001 From: Jesse Keating Date: Sun, 20 Apr 2008 13:51:28 +0000 Subject: [PATCH 1/5] Initialize branch F-9 for boost --- branch | 1 + 1 file changed, 1 insertion(+) create mode 100644 branch diff --git a/branch b/branch new file mode 100644 index 0000000..1c26f78 --- /dev/null +++ b/branch @@ -0,0 +1 @@ +F-9 From 4e9fe29798d077c06470cd077ecb25420910641d Mon Sep 17 00:00:00 2001 From: Petr Machata Date: Thu, 12 Jun 2008 11:09:13 +0000 Subject: [PATCH 2/5] - Fix "changes meaning of keywords" in boost date_time - Resolves: #450718 --- boost-gcc43.patch | 39 +++++++++++++++++++++++++++++++++++++++ boost.spec | 6 +++++- 2 files changed, 44 insertions(+), 1 deletion(-) diff --git a/boost-gcc43.patch b/boost-gcc43.patch index edcd87e..4346c3c 100644 --- a/boost-gcc43.patch +++ b/boost-gcc43.patch @@ -174,3 +174,42 @@ diff -urp boost_1_34_1/boost/python/detail/def_helper.hpp boost_1_34_1-pm/boost/ , 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.spec b/boost.spec index 2a6c5ac..45ad4dc 100644 --- a/boost.spec +++ b/boost.spec @@ -3,7 +3,7 @@ Name: boost Summary: The Boost C++ Libraries Version: 1.34.1 -Release: 14%{?dist} +Release: 15%{?dist} License: Boost Software License (GPL-Compatible, Free Software License) URL: http://www.boost.org/ Group: System Environment/Libraries @@ -198,6 +198,10 @@ rm -rf $RPM_BUILD_ROOT %doc %{_docdir}/%{name}-%{version} %changelog +* Thu Jun 12 2008 Petr Machata - 1.34.1-15 +- Fix "changes meaning of keywords" in boost date_time +- Resolves: #450718 + * Thu Mar 27 2008 Petr Machata - 1.34.1-14 - Change devel-static back to static. - Related: #225622 From ce3dbabfdcf399888a0f565139946d9a5b5e1885 Mon Sep 17 00:00:00 2001 From: Petr Machata Date: Mon, 5 Jan 2009 15:15:24 +0000 Subject: [PATCH 3/5] - Fix missing include in relaxed_heap.hpp - Resolves: #475587 --- boost-gcc43.patch | 11 +++++++++++ boost.spec | 6 +++++- 2 files changed, 16 insertions(+), 1 deletion(-) diff --git a/boost-gcc43.patch b/boost-gcc43.patch index 4346c3c..01afdd2 100644 --- a/boost-gcc43.patch +++ b/boost-gcc43.patch @@ -213,3 +213,14 @@ diff -urp new-boost/date_time/tz_db_base.hpp old-boost/date_time/tz_db_base.hpp rules = boost::shared_ptr(parse_rules(result[START_DATE_RULE], +diff -urp boost/pending/relaxed_heap.hpp /usr/include/boost/pending/relaxed_heap.hpp +--- boost_1_34_1/boost/pending/relaxed_heap.hpp 2005-12-08 03:56:25.000000000 +0100 ++++ boost_1_34_1-pm/boost/pending/relaxed_heap.hpp 2009-01-05 13:49:23.000000000 +0100 +@@ -13,6 +13,7 @@ + #include + #include + #include ++#include + + #ifdef BOOST_RELAXED_HEAP_DEBUG + # include diff --git a/boost.spec b/boost.spec index 45ad4dc..6d30d0a 100644 --- a/boost.spec +++ b/boost.spec @@ -3,7 +3,7 @@ Name: boost Summary: The Boost C++ Libraries Version: 1.34.1 -Release: 15%{?dist} +Release: 16%{?dist} License: Boost Software License (GPL-Compatible, Free Software License) URL: http://www.boost.org/ Group: System Environment/Libraries @@ -198,6 +198,10 @@ rm -rf $RPM_BUILD_ROOT %doc %{_docdir}/%{name}-%{version} %changelog +* Mon Jan 5 2009 Petr Machata - 1.34.1-16 +- Fix missing include in relaxed_heap.hpp +- Resolves: #475587 + * Thu Jun 12 2008 Petr Machata - 1.34.1-15 - Fix "changes meaning of keywords" in boost date_time - Resolves: #450718 From 1a1a0c7cb16b8f9405009e9c219b94e1510cc201 Mon Sep 17 00:00:00 2001 From: Bill Nottingham Date: Thu, 26 Nov 2009 01:22:52 +0000 Subject: [PATCH 4/5] Fix typo that causes a failure to update the common directory. (releng #2781) --- Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index 8ebb4c7..a239116 100644 --- a/Makefile +++ b/Makefile @@ -1,10 +1,10 @@ # Makefile for source rpm: boost -# $Id: Makefile,v 1.3 2005/08/19 17:39:58 bkoz Exp $ +# $Id: Makefile,v 1.4 2007/10/15 17:13:04 scop Exp $ NAME := boost SPECFILE = $(firstword $(wildcard *.spec)) define find-makefile-common -for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done +for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$d/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done endef MAKEFILE_COMMON := $(shell $(find-makefile-common)) From 865f1489c5690c345e2578e6efc29d9840c764b9 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 28 Jul 2010 11:12:17 +0000 Subject: [PATCH 5/5] dist-git conversion --- .cvsignore => .gitignore | 0 Makefile | 21 --------------------- branch | 1 - 3 files changed, 22 deletions(-) rename .cvsignore => .gitignore (100%) delete mode 100644 Makefile delete mode 100644 branch diff --git a/.cvsignore b/.gitignore similarity index 100% rename from .cvsignore rename to .gitignore diff --git a/Makefile b/Makefile deleted file mode 100644 index a239116..0000000 --- a/Makefile +++ /dev/null @@ -1,21 +0,0 @@ -# Makefile for source rpm: boost -# $Id: Makefile,v 1.4 2007/10/15 17:13:04 scop Exp $ -NAME := boost -SPECFILE = $(firstword $(wildcard *.spec)) - -define find-makefile-common -for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$d/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done -endef - -MAKEFILE_COMMON := $(shell $(find-makefile-common)) - -ifeq ($(MAKEFILE_COMMON),) -# attempt a checkout -define checkout-makefile-common -test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2 -endef - -MAKEFILE_COMMON := $(shell $(checkout-makefile-common)) -endif - -include $(MAKEFILE_COMMON) diff --git a/branch b/branch deleted file mode 100644 index 1c26f78..0000000 --- a/branch +++ /dev/null @@ -1 +0,0 @@ -F-9