From 2bda2241068f90efc7dfb5f0fd585f28bbbbc451 Mon Sep 17 00:00:00 2001 From: Petr Machata Date: Fri, 3 Jul 2009 12:38:00 +0000 Subject: [PATCH] - Add upstream patch to make boost_filesystem compatible with C++0x. - Resolves: #509250 --- boost-fs_gcc44.patch | 16 ++++++++++++++++ boost.spec | 8 +++++++- 2 files changed, 23 insertions(+), 1 deletion(-) create mode 100644 boost-fs_gcc44.patch diff --git a/boost-fs_gcc44.patch b/boost-fs_gcc44.patch new file mode 100644 index 0000000..1b013ef --- /dev/null +++ b/boost-fs_gcc44.patch @@ -0,0 +1,16 @@ +Index: boost/filesystem/operations.hpp +=================================================================== +--- boost/filesystem/operations.hpp (revision 52859) ++++ boost/filesystem/operations.hpp (working copy) +@@ -659,9 +659,9 @@ + { return is_symlink( ph ); } + + inline bool is_empty( const path & ph ) +- { return is_empty( ph ); } ++ { return boost::filesystem::is_empty( ph ); } + inline bool is_empty( const wpath & ph ) +- { return is_empty( ph ); } ++ { return boost::filesystem::is_empty( ph ); } + + inline bool equivalent( const path & ph1, const path & ph2 ) + { return equivalent( ph1, ph2 ); } diff --git a/boost.spec b/boost.spec index 3c21503..365d2ff 100644 --- a/boost.spec +++ b/boost.spec @@ -4,7 +4,7 @@ Name: boost Summary: The Boost C++ Libraries Version: 1.37.0 -Release: 6%{?dist} +Release: 7%{?dist} License: Boost URL: http://www.boost.org/ Group: System Environment/Libraries @@ -30,6 +30,7 @@ Patch5: boost-function_template.patch Patch6: boost-unneccessary_iostreams.patch Patch7: boost-1_37_0-smp.patch Patch8: boost-bitset.patch +Patch9: boost-fs_gcc44.patch %description Boost provides free peer-reviewed portable C++ source libraries. The @@ -78,6 +79,7 @@ sed 's/!!!SONAME!!!/%{sonamever}/' %{PATCH4} | %{__patch} -p1 --fuzz=0 %patch6 -p0 sed 's/!!!SMP_FLAGS!!!/%{?_smp_mflags}/' %{PATCH7} | %{__patch} -p1 --fuzz=0 %patch8 -p1 +%patch9 -p0 %build BOOST_ROOT=`pwd` @@ -210,6 +212,10 @@ rm -rf $RPM_BUILD_ROOT %doc %{_docdir}/%{name}-%{version} %changelog +* Fri Jul 3 2009 Petr Machata - 1.37.0-7 +- Add upstream patch to make boost_filesystem compatible with C++0x. +- Resolves: #509250 + * Mon Mar 23 2009 Petr Machata - 1.37.0-6 - Apply a SMP patch from Stefan Ring - Apply a workaround for "cannot appear in a constant-expression" in