rpms/fusecompress/F-13 fusecompress-2.6-boost.patch, NONE, 1.1 fusecompress.spec, 1.21, 1.22

[Lubomir Rintel]

Author: lkundrak

Update of /cvs/pkgs/rpms/fusecompress/F-13
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23959

Modified Files:
	fusecompress.spec 
Added Files:
	fusecompress-2.6-boost.patch 
Log Message:
Merge from devel

fusecompress-2.6-boost.patch:
 archive/portable_binary_iarchive.hpp             |   10 ++++++++++
 archive/portable_binary_oarchive.hpp             |    9 +++++++++
 iostreams/device/nonclosable_file_descriptor.hpp |    8 ++++++++
 3 files changed, 27 insertions(+)

--- NEW FILE fusecompress-2.6-boost.patch ---
Patch for fixing build failures with boost version >1.40
diff -up tex-fusecompress-4e07d3fe1c61f9a83732eb3021e3016feb008bdb/src/boost/archive/portable_binary_iarchive.hpp.boost tex-fusecompress-4e07d3fe1c61f9a83732eb3021e3016feb008bdb/src/boost/archive/portable_binary_iarchive.hpp
--- tex-fusecompress-4e07d3fe1c61f9a83732eb3021e3016feb008bdb/src/boost/archive/portable_binary_iarchive.hpp.boost	2009-05-03 09:49:47.000000000 +0200
+++ tex-fusecompress-4e07d3fe1c61f9a83732eb3021e3016feb008bdb/src/boost/archive/portable_binary_iarchive.hpp	2010-02-21 15:02:49.296895523 +0100
@@ -239,7 +239,13 @@ public:
 };
 
 #include <boost/archive/impl/basic_binary_iarchive.ipp>
+
+#if BOOST_VERSION < 104000
 #include <boost/archive/impl/archive_pointer_iserializer.ipp>
+#else
+#include <boost/archive/impl/archive_serializer_map.ipp>
+#endif
+
 #include <boost/archive/impl/basic_binary_iprimitive.ipp>
 
 namespace boost {
@@ -266,7 +272,11 @@ template class binary_iarchive_impl<
 #endif
 >;
 
+#if BOOST_VERSION < 104000
 template class detail::archive_pointer_iserializer<portable_binary_iarchive> ;
+#else
+template class detail::archive_serializer_map<portable_binary_iarchive> ;
+#endif
 
 } // namespace archive
 } // namespace boost
diff -up tex-fusecompress-4e07d3fe1c61f9a83732eb3021e3016feb008bdb/src/boost/archive/portable_binary_oarchive.hpp.boost tex-fusecompress-4e07d3fe1c61f9a83732eb3021e3016feb008bdb/src/boost/archive/portable_binary_oarchive.hpp
--- tex-fusecompress-4e07d3fe1c61f9a83732eb3021e3016feb008bdb/src/boost/archive/portable_binary_oarchive.hpp.boost	2009-05-03 09:49:47.000000000 +0200
+++ tex-fusecompress-4e07d3fe1c61f9a83732eb3021e3016feb008bdb/src/boost/archive/portable_binary_oarchive.hpp	2010-02-21 15:02:49.302879732 +0100
@@ -229,7 +229,12 @@ public:
 };
 
 #include <boost/archive/impl/basic_binary_oarchive.ipp>
+
+#if BOOST_VERSION < 104000
 #include <boost/archive/impl/archive_pointer_oserializer.ipp>
+// archive_serializer_map will get included in portable_binary_iarchive.hpp
+#endif
+
 #include <boost/archive/impl/basic_binary_oprimitive.ipp>
 
 namespace boost {
@@ -254,7 +259,11 @@ template class binary_oarchive_impl<
 	, std::ostream::traits_type
 #endif
 > ;
+
+#if BOOST_VERSION < 104000
 template class detail::archive_pointer_oserializer<portable_binary_oarchive> ;
+// defined in portable_binary_iarchive.hpp
+#endif
 
 } // namespace archive
 } // namespace boost
diff -up tex-fusecompress-4e07d3fe1c61f9a83732eb3021e3016feb008bdb/src/boost/iostreams/device/nonclosable_file_descriptor.hpp.boost tex-fusecompress-4e07d3fe1c61f9a83732eb3021e3016feb008bdb/src/boost/iostreams/device/nonclosable_file_descriptor.hpp
--- tex-fusecompress-4e07d3fe1c61f9a83732eb3021e3016feb008bdb/src/boost/iostreams/device/nonclosable_file_descriptor.hpp.boost	2009-05-03 09:49:47.000000000 +0200
+++ tex-fusecompress-4e07d3fe1c61f9a83732eb3021e3016feb008bdb/src/boost/iostreams/device/nonclosable_file_descriptor.hpp	2010-02-21 15:10:19.824805174 +0100
@@ -2,6 +2,7 @@
 #define NONCLOSABLE_FILE_DESCRIPTOR_HPP
 
 #include <boost/iostreams/device/file_descriptor.hpp>
+#include <boost/version.hpp>
 
 namespace boost { namespace iostreams {
 
@@ -20,12 +21,19 @@ public:
         : file_descriptor(handle, false)
         { }
 #endif
+#if BOOST_VERSION < 104000
     explicit nonclosable_file_descriptor( const std::string& path,
                               BOOST_IOS::openmode mode =
                                   BOOST_IOS::in | BOOST_IOS::out,
                               BOOST_IOS::openmode base_mode =
                                   BOOST_IOS::in | BOOST_IOS::out )
         : file_descriptor(path, mode, base_mode) {}
+#else
+    explicit nonclosable_file_descriptor( const std::string& path,
+                              BOOST_IOS::openmode mode =
+                                  BOOST_IOS::in | BOOST_IOS::out)
+        : file_descriptor(path, mode) {}
+#endif
 };
 
 } }


Index: fusecompress.spec
===================================================================
RCS file: /cvs/pkgs/rpms/fusecompress/F-13/fusecompress.spec,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -p -r1.21 -r1.22
--- fusecompress.spec	5 Feb 2010 15:04:10 -0000	1.21
+++ fusecompress.spec	21 Feb 2010 14:21:49 -0000	1.22
@@ -14,6 +14,8 @@ Patch1:         fusecompress-2.5-ppc.pat
 Patch2:         fusecompress-log-vsprintf.patch
 # Patch in upstream's bugtracker
 Patch3:         fusecompress-xz-port.patch
+# From debian
+Patch4:         fusecompress-2.6-boost.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  fuse-devel file-devel boost-devel
@@ -35,6 +37,7 @@ compressed files and user applications.
 %patch1 -p1 -b .ppc
 %patch2 -p1 -b .vsprintf
 %patch3 -p1 -b .xzup
+%patch4 -p1 -b .boost
 find . -name ChangeLog -o -name '*.[ch]pp' |xargs chmod -x
 
 cp %{SOURCE1} .
@@ -67,7 +70,7 @@ rm -rf $RPM_BUILD_ROOT
 
 %changelog
 * Fri Feb 05 2010 Lubomir Rintel <lkundrak at v3.sk> - 2.6-5
-- Rebuild for newer xerces-c
+- Rebuild for newer boost
 
 * Fri Jan 22 2010 Rahul Sundaram <sundaram at fedoraproject.org> - 2.6-4
 - Rebuild for Boost soname bump