Git-Url: 
http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=f94f476cc3c899aaaff7e2b72ba9aecd2bd7cc47

commit f94f476cc3c899aaaff7e2b72ba9aecd2bd7cc47
Author: Miklos Vajna <vmik...@frugalware.org>
Date:   Tue Aug 11 12:50:31 2009 +0200

boost-1.39.0-2-i686

- added two patches to fix build with gcc-4.4 and an openoffice bug

diff --git a/source/devel-extra/boost/FrugalBuild 
b/source/devel-extra/boost/FrugalBuild
index 32049fa..1bd1be4 100644
--- a/source/devel-extra/boost/FrugalBuild
+++ b/source/devel-extra/boost/FrugalBuild
@@ -4,7 +4,7 @@

pkgname=boost
pkgver=1.39.0
-pkgrel=1
+pkgrel=2
pkgdesc="Boost header files , examples and tools"
_F_sourceforge_ext=".tar.bz2"
Finclude sourceforge python
@@ -13,10 +13,13 @@ depends=()
makedepends=('boost-jam>=3.1.17' 'python>=2.6' 'icu4c>=4.2' 'bzip2' 'zlib')
groups=('devel-extra')
archs=('i686' 'x86_64' 'ppc')
-source=(${source/-$pkgver/_${pkgver//./_}} boost-mt.patch)
+source=(${source/-$pkgver/_${pkgver//./_}} boost-mt.patch \
+       boost-fs_gcc44.patch boost-function_template.patch)
_F_cd_path="${pkgname}_`echo $pkgver|tr . _`"
sha1sums=('6af42f74ab24ccc51589a025593bad298c8adde8' \
-          'b96f45451173a01e276427d21aa2a584b2bb2dd1')
+          'b96f45451173a01e276427d21aa2a584b2bb2dd1' \
+          '84bacf10dd215637282982f4480589ef276f6af9' \
+          'f43601261c66704638ff66347fd2741211edd864')

subpkgs=("libboost" "libboost-mt" "libboost-static" "libboost-mt-static")
subdescs=('Boost libraries.' 'Boost libraries with multithreading support.' \
diff --git a/source/devel-extra/boost/boost-fs_gcc44.patch 
b/source/devel-extra/boost/boost-fs_gcc44.patch
new file mode 100644
index 0000000..ef02b85
--- /dev/null
+++ b/source/devel-extra/boost/boost-fs_gcc44.patch
@@ -0,0 +1,163 @@
+Index: boost/filesystem/operations.hpp
+===================================================================
+--- boost/filesystem/operations.hpp    (revision 52859)
++++ boost/filesystem/operations.hpp    (working copy)
+@@ -659,9 +659,9 @@
+       { return is_symlink<wpath>( ph ); }
+
+     inline bool is_empty( const path & ph )
+-      { return is_empty<path>( ph ); }
++      { return boost::filesystem::is_empty<path>( ph ); }
+     inline bool is_empty( const wpath & ph )
+-      { return is_empty<wpath>( ph ); }
++      { return boost::filesystem::is_empty<wpath>( ph ); }
+
+     inline bool equivalent( const path & ph1, const path & ph2 )
+       { return equivalent<path>( ph1, ph2 ); }
+Index: libs/filesystem/test/path_test.cpp
+===================================================================
+--- libs/filesystem/test/path_test.cpp (revision 52859)
++++ libs/filesystem/test/path_test.cpp (working copy)
+@@ -27,9 +27,8 @@
+
+ namespace fs = boost::filesystem;
+ using boost::filesystem::path;
+-using boost::next;
+-using boost::prior;
+
++
+ #include <boost/detail/lightweight_test.hpp>
+
+ #define PATH_CHECK( a, b ) check( a, b, __LINE__ )
+@@ -480,18 +479,18 @@
+
+   itr_ck = "foo";
+   BOOST_TEST( *itr_ck.begin() == std::string( "foo" ) );
+-  BOOST_TEST( next( itr_ck.begin() ) == itr_ck.end() );
+-  BOOST_TEST( *prior( itr_ck.end() ) == std::string( "foo" ) );
+-  BOOST_TEST( prior( itr_ck.end() ) == itr_ck.begin() );
++  BOOST_TEST( boost::next( itr_ck.begin() ) == itr_ck.end() );
++  BOOST_TEST( *boost::prior( itr_ck.end() ) == std::string( "foo" ) );
++  BOOST_TEST( boost::prior( itr_ck.end() ) == itr_ck.begin() );
+
+   itr_ck = path( "/foo" );
+   BOOST_TEST( *itr_ck.begin() == std::string( "/" ) );
+-  BOOST_TEST( *next( itr_ck.begin() ) == std::string( "foo" ) );
+-  BOOST_TEST( next(next( itr_ck.begin() )) == itr_ck.end() );
+-  BOOST_TEST( next( itr_ck.begin() ) == prior( itr_ck.end() ) );
+-  BOOST_TEST( *prior( itr_ck.end() ) == std::string( "foo" ) );
+-  BOOST_TEST( *prior(prior( itr_ck.end() )) == std::string( "/" ) );
+-  BOOST_TEST( prior(prior( itr_ck.end() )) == itr_ck.begin() );
++  BOOST_TEST( *boost::next( itr_ck.begin() ) == std::string( "foo" ) );
++  BOOST_TEST( boost::next(boost::next( itr_ck.begin() )) == itr_ck.end() );
++  BOOST_TEST( boost::next( itr_ck.begin() ) == boost::prior( itr_ck.end() ) );
++  BOOST_TEST( *boost::prior( itr_ck.end() ) == std::string( "foo" ) );
++  BOOST_TEST( *boost::prior(boost::prior( itr_ck.end() )) == std::string( "/" 
) );
++  BOOST_TEST( boost::prior(boost::prior( itr_ck.end() )) == itr_ck.begin() );
+
+   itr_ck = "/foo/bar";
+   itr = itr_ck.begin();
+@@ -1106,65 +1105,65 @@
+
+     itr_ck = path( "c:" );
+     BOOST_TEST( *itr_ck.begin() == std::string( "c:" ) );
+-    BOOST_TEST( next( itr_ck.begin() ) == itr_ck.end() );
+-    BOOST_TEST( prior( itr_ck.end() ) == itr_ck.begin() );
+-    BOOST_TEST( *prior( itr_ck.end() ) == std::string( "c:" ) );
++    BOOST_TEST( boost::next( itr_ck.begin() ) == itr_ck.end() );
++    BOOST_TEST( boost::prior( itr_ck.end() ) == itr_ck.begin() );
++    BOOST_TEST( *boost::prior( itr_ck.end() ) == std::string( "c:" ) );
+
+     itr_ck = path( "c:/" );
+     BOOST_TEST( *itr_ck.begin() == std::string( "c:" ) );
+-    BOOST_TEST( *next( itr_ck.begin() ) == std::string( "/" ) );
+-    BOOST_TEST( next( next( itr_ck.begin() )) == itr_ck.end() );
+-    BOOST_TEST( prior( prior( itr_ck.end() )) == itr_ck.begin() );
+-    BOOST_TEST( *prior( itr_ck.end() ) == std::string( "/" ) );
+-    BOOST_TEST( *prior( prior( itr_ck.end() )) == std::string( "c:" ) );
++    BOOST_TEST( *boost::next( itr_ck.begin() ) == std::string( "/" ) );
++    BOOST_TEST( boost::next( boost::next( itr_ck.begin() )) == itr_ck.end() );
++    BOOST_TEST( boost::prior( boost::prior( itr_ck.end() )) == itr_ck.begin() 
);
++    BOOST_TEST( *boost::prior( itr_ck.end() ) == std::string( "/" ) );
++    BOOST_TEST( *boost::prior( boost::prior( itr_ck.end() )) == std::string( 
"c:" ) );
+
+     itr_ck = path( "c:foo" );
+     BOOST_TEST( *itr_ck.begin() == std::string( "c:" ) );
+-    BOOST_TEST( *next( itr_ck.begin() ) == std::string( "foo" ) );
+-    BOOST_TEST( next(next( itr_ck.begin() )) == itr_ck.end() );
+-    BOOST_TEST( prior(prior( itr_ck.end() )) == itr_ck.begin() );
+-    BOOST_TEST( *prior( itr_ck.end() ) == std::string( "foo" ) );
+-    BOOST_TEST( *prior(prior( itr_ck.end() )) == std::string( "c:" ) );
++    BOOST_TEST( *boost::next( itr_ck.begin() ) == std::string( "foo" ) );
++    BOOST_TEST( boost::next(boost::next( itr_ck.begin() )) == itr_ck.end() );
++    BOOST_TEST( boost::prior(boost::prior( itr_ck.end() )) == itr_ck.begin() 
);
++    BOOST_TEST( *boost::prior( itr_ck.end() ) == std::string( "foo" ) );
++    BOOST_TEST( *boost::prior(boost::prior( itr_ck.end() )) == std::string( 
"c:" ) );
+
+     itr_ck = path( "c:/foo" );
+     BOOST_TEST( *itr_ck.begin() == std::string( "c:" ) );
+-    BOOST_TEST( *next( itr_ck.begin() ) == std::string( "/" ) );
+-    BOOST_TEST( *next( next( itr_ck.begin() )) == std::string( "foo" ) );
+-    BOOST_TEST( next( next( next( itr_ck.begin() ))) == itr_ck.end() );
+-    BOOST_TEST( prior( prior( prior( itr_ck.end() ))) == itr_ck.begin() );
+-    BOOST_TEST( *prior( itr_ck.end() ) == std::string( "foo" ) );
+-    BOOST_TEST( *prior( prior( itr_ck.end() )) == std::string( "/" ) );
+-    BOOST_TEST( *prior( prior( prior( itr_ck.end() ))) == std::string( "c:" ) 
);
++    BOOST_TEST( *boost::next( itr_ck.begin() ) == std::string( "/" ) );
++    BOOST_TEST( *boost::next( boost::next( itr_ck.begin() )) == std::string( 
"foo" ) );
++    BOOST_TEST( boost::next( boost::next( boost::next( itr_ck.begin() ))) == 
itr_ck.end() );
++    BOOST_TEST( boost::prior( boost::prior( boost::prior( itr_ck.end() ))) == 
itr_ck.begin() );
++    BOOST_TEST( *boost::prior( itr_ck.end() ) == std::string( "foo" ) );
++    BOOST_TEST( *boost::prior( boost::prior( itr_ck.end() )) == std::string( 
"/" ) );
++    BOOST_TEST( *boost::prior( boost::prior( boost::prior( itr_ck.end() ))) 
== std::string( "c:" ) );
+
+     itr_ck = path( "//net" );
+     BOOST_TEST( *itr_ck.begin() == std::string( "//net" ) );
+-    BOOST_TEST( next( itr_ck.begin() ) == itr_ck.end() );
+-    BOOST_TEST( prior( itr_ck.end() ) == itr_ck.begin() );
+-    BOOST_TEST( *prior( itr_ck.end() ) == std::string( "//net" ) );
++    BOOST_TEST( boost::next( itr_ck.begin() ) == itr_ck.end() );
++    BOOST_TEST( boost::prior( itr_ck.end() ) == itr_ck.begin() );
++    BOOST_TEST( *boost::prior( itr_ck.end() ) == std::string( "//net" ) );
+
+     itr_ck = path( "//net/" );
+     CHECK_EQUAL( *itr_ck.begin(), "//net" );
+-    CHECK_EQUAL( *next( itr_ck.begin() ), "/" );
+-    BOOST_TEST( next(next( itr_ck.begin() )) == itr_ck.end() );
+-    BOOST_TEST( prior(prior( itr_ck.end() )) == itr_ck.begin() );
+-    CHECK_EQUAL( *prior( itr_ck.end() ), "/" );
+-    CHECK_EQUAL( *prior(prior( itr_ck.end() )), "//net" );
++    CHECK_EQUAL( *boost::next( itr_ck.begin() ), "/" );
++    BOOST_TEST( boost::next(boost::next( itr_ck.begin() )) == itr_ck.end() );
++    BOOST_TEST( boost::prior(boost::prior( itr_ck.end() )) == itr_ck.begin() 
);
++    CHECK_EQUAL( *boost::prior( itr_ck.end() ), "/" );
++    CHECK_EQUAL( *boost::prior(boost::prior( itr_ck.end() )), "//net" );
+
+     itr_ck = path( "//net/foo" );
+     BOOST_TEST( *itr_ck.begin() == std::string( "//net" ) );
+-    BOOST_TEST( *next( itr_ck.begin() ) == std::string( "/" ) );
+-    BOOST_TEST( *next(next( itr_ck.begin() )) == std::string( "foo" ) );
+-    BOOST_TEST( next(next(next( itr_ck.begin() ))) == itr_ck.end() );
+-    BOOST_TEST( prior(prior(prior( itr_ck.end() ))) == itr_ck.begin() );
+-    BOOST_TEST( *prior( itr_ck.end() ) == std::string( "foo" ) );
+-    BOOST_TEST( *prior(prior( itr_ck.end() )) == std::string( "/" ) );
+-    BOOST_TEST( *prior(prior(prior( itr_ck.end() ))) == std::string( "//net" 
) );
++    BOOST_TEST( *boost::next( itr_ck.begin() ) == std::string( "/" ) );
++    BOOST_TEST( *boost::next(boost::next( itr_ck.begin() )) == std::string( 
"foo" ) );
++    BOOST_TEST( boost::next(boost::next(boost::next( itr_ck.begin() ))) == 
itr_ck.end() );
++    BOOST_TEST( boost::prior(boost::prior(boost::prior( itr_ck.end() ))) == 
itr_ck.begin() );
++    BOOST_TEST( *boost::prior( itr_ck.end() ) == std::string( "foo" ) );
++    BOOST_TEST( *boost::prior(boost::prior( itr_ck.end() )) == std::string( 
"/" ) );
++    BOOST_TEST( *boost::prior(boost::prior(boost::prior( itr_ck.end() ))) == 
std::string( "//net" ) );
+
+     itr_ck = path( "prn:" );
+     BOOST_TEST( *itr_ck.begin() == std::string( "prn:" ) );
+-    BOOST_TEST( next( itr_ck.begin() ) == itr_ck.end() );
+-    BOOST_TEST( prior( itr_ck.end() ) == itr_ck.begin() );
+-    BOOST_TEST( *prior( itr_ck.end() ) == std::string( "prn:" ) );
++    BOOST_TEST( boost::next( itr_ck.begin() ) == itr_ck.end() );
++    BOOST_TEST( boost::prior( itr_ck.end() ) == itr_ck.begin() );
++    BOOST_TEST( *boost::prior( itr_ck.end() ) == std::string( "prn:" ) );
+   } // Windows
+
+   else
diff --git a/source/devel-extra/boost/boost-function_template.patch 
b/source/devel-extra/boost/boost-function_template.patch
new file mode 100644
index 0000000..c8178ea
--- /dev/null
+++ b/source/devel-extra/boost/boost-function_template.patch
@@ -0,0 +1,15 @@
+diff -ru boost/function/function_template.hpp 
boost/function/function_template.hpp
+--- boost/function/function_template.hpp       2009-05-10 10:31:29.000000000 
+0100
++++ boost/function/function_template.hpp       2009-05-10 10:49:46.000000000 
+0100
+@@ -950,10 +950,10 @@
+           f.vtable->manager(f.functor, this->functor,
+                             boost::detail::function::move_functor_tag);
+                 f.vtable = 0;
+-#if !defined(BOOST_NO_EXCEPTIONS)
+         } else {
+           clear();
+         }
++#if !defined(BOOST_NO_EXCEPTIONS)
+       } catch (...) {
+         vtable = 0;
+         throw;
_______________________________________________
Frugalware-git mailing list
Frugalware-git@frugalware.org
http://frugalware.org/mailman/listinfo/frugalware-git

Reply via email to