Miroirs/slackbuilds_ponce
1
0
Fork 0
mirror of https://github.com/Ponce/slackbuilds synced 2024-11-22 19:44:21 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

development/boost: Updated for version 1.38.0

Browse source
This commit is contained in:
Heinz Wiesinger 2010-05-12 17:38:18 +02:00 committed by Michiel van Wessem
parent 218db509ac
commit a58a9bb6b5
7 changed files with 7 additions and 452 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
development/boost/boost.SlackBuild
View file

@ -3,7 +3,7 @@
# Slackware build script for boost
# Copyright 2007-2008 Eric Hameleers <alien@slackware.com>
# Copyright 2007-2008 Heinz Wiesinger <pprkut@liwjatan.at>
# Copyright 2007-2009 Heinz Wiesinger <pprkut@liwjatan.at>
# All rights reserved.
#
# Redistribution and use of this script, with or without modification, is
@ -29,9 +29,9 @@
# -- no additional license terms and no copyright
PRGNAM=boost
VERSION=1_36_0
VERSION=1_38_0
ARCH=${ARCH:-i486}
BUILD=${BUILD:-2}
BUILD=${BUILD:-1}
TAG=${TAG:-_SBo}
CWD=$(pwd)
@ -65,13 +65,6 @@ find . \
\( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
-exec chmod 644 {} \;
# Apply Hotfixes from http://svn.boost.org/trac/boost/wiki/ReleasePractices/HotFixes
patch -p2 -i $CWD/patches/changeset_r48141.diff
patch -p2 -i $CWD/patches/changeset_r48192.diff
patch -p2 -i $CWD/patches/changeset_r48374.diff
patch -p2 -i $CWD/patches/changeset_r48377.diff
patch -p2 -i $CWD/patches/changeset_r48462.diff
if [ "$ICU" = "no" ]; then
ICU_FLAGS=""
else

8
development/boost/boost.info
View file

@ -1,8 +1,8 @@
PRGNAM="boost"
VERSION="1.36.0"
VERSION="1.38.0"
HOMEPAGE="http://www.boost.org/"
DOWNLOAD="http://downloads.sourceforge.net/boost/boost_1_36_0.tar.bz2"
MD5SUM="328bfec66c312150e4c2a78dcecb504b"
DOWNLOAD="http://downloads.sourceforge.net/boost/boost_1_38_0.tar.bz2"
MD5SUM="5eca2116d39d61382b8f8235915cb267"
MAINTAINER="ppr:kut"
EMAIL="pprkut@liwjatan.at"
APPROVED="rworkman"
APPROVED="Michiel"

31
development/boost/patches/changeset_r48141.diff
View file

@ -1,31 +0,0 @@
Index: /trunk/boost/xpressive/detail/utility/hash_peek_bitset.hpp
===================================================================
--- /trunk/boost/xpressive/detail/utility/hash_peek_bitset.hpp (revision 43799)
+++ /trunk/boost/xpressive/detail/utility/hash_peek_bitset.hpp (revision 48141)
@@ -105,5 +105,8 @@
void set_bitset(hash_peek_bitset<Char> const &that)
{
- this->bset_ |= that.bset_;
+ if(this->test_icase_(that.icase()))
+ {
+ this->bset_ |= that.bset_;
+ }
}
Index: /trunk/libs/xpressive/test/regress.txt
===================================================================
--- /trunk/libs/xpressive/test/regress.txt (revision 47901)
+++ /trunk/libs/xpressive/test/regress.txt (revision 48141)
@@ -3739,2 +3739,12 @@
br0=c
[end]
+
+[nocasealternate]
+str=common HighLight and Blow this
+pat=highlight|blow
+flg=ig
+sub=<b>$&</b>
+res=common <b>HighLight</b> and <b>Blow</b> this
+br0=HighLight
+br1=Blow
+[end]

36
development/boost/patches/changeset_r48192.diff
View file

@ -1,36 +0,0 @@
Index: /trunk/boost/filesystem/operations.hpp
===================================================================
--- /trunk/boost/filesystem/operations.hpp (revision 47181)
+++ /trunk/boost/filesystem/operations.hpp (revision 48192)
@@ -1021,10 +1021,16 @@
void replace_filename( const string_type & s,
file_status st, file_status symlink_st )
- {
- m_path.remove_filename();
- m_path /= s;
- m_status = st;
- m_symlink_status = symlink_st;
- }
+ {
+ m_path.remove_filename();
+ m_path /= s;
+ m_status = st;
+ m_symlink_status = symlink_st;
+ }
+
+# ifndef BOOST_FILESYSTEM_NO_DEPRECATED
+ void replace_leaf( const string_type & s,
+ file_status st, file_status symlink_st )
+ { replace_filename( s, st, symlink_st ); }
+# endif
const Path & path() const { return m_path; }
@@ -1040,4 +1046,8 @@
// deprecated functions preserve common use cases in legacy code
typename Path::string_type filename() const
+ {
+ return path().filename();
+ }
+ typename Path::string_type leaf() const
{
return path().filename();

18
development/boost/patches/changeset_r48374.diff
View file

@ -1,18 +0,0 @@
Index: /trunk/boost/filesystem/path.hpp
===================================================================
--- /trunk/boost/filesystem/path.hpp (revision 47923)
+++ /trunk/boost/filesystem/path.hpp (revision 48374)
@@ -230,4 +230,6 @@
string_type leaf() const { return filename(); }
basic_path branch_path() const { return parent_path(); }
+ bool has_leaf() const { return !m_path.empty(); }
+ bool has_branch_path() const { return !parent_path().empty(); }
# endif
@@ -238,5 +240,5 @@
bool has_root_directory() const;
bool has_relative_path() const { return !relative_path().empty(); }
- bool has_filename() const { return !m_path.empty(); }
+ bool has_filename() const { return !m_path.empty(); }
bool has_parent_path() const { return !parent_path().empty(); }

337
development/boost/patches/changeset_r48377.diff
View file

@ -1,337 +0,0 @@
Index: /trunk/boost/filesystem/operations.hpp
===================================================================
--- /trunk/boost/filesystem/operations.hpp (revision 48192)
+++ /trunk/boost/filesystem/operations.hpp (revision 48377)
@@ -122,8 +122,4 @@
namespace detail
{
- // singular object used only as a tag; thus initialization and
- // thread-safety are not issues
- BOOST_FILESYSTEM_DECL extern system::error_code throws;
-
typedef std::pair< system::error_code, bool >
query_pair;
@@ -235,5 +231,8 @@
template<class Path>
- unsigned long remove_all_aux( const Path & ph );
+ bool remove_aux( const Path & ph, file_status f );
+
+ template<class Path>
+ unsigned long remove_all_aux( const Path & ph, file_status f );
} // namespace detail
@@ -475,17 +474,22 @@
}
- BOOST_FS_FUNC(void) remove( const Path & ph, system::error_code & ec = detail::throws )
- {
- system::error_code error( detail::remove_api(ph.external_file_string()) );
- if ( error && &ec == &detail::throws )
- boost::throw_exception( basic_filesystem_error<Path>(
- "boost::filesystem::remove", ph, error ) );
- ec = error;
+ BOOST_FS_FUNC(bool) remove( const Path & ph )
+ {
+ system::error_code ec;
+ file_status f = symlink_status( ph, ec );
+ if ( ec )
+ boost::throw_exception( basic_filesystem_error<Path>(
+ "boost::filesystem::remove", ph, ec ) );
+ return detail::remove_aux( ph, f );
}
BOOST_FS_FUNC(unsigned long) remove_all( const Path & ph )
{
- return exists( ph )|| is_symlink( ph )
- ? detail::remove_all_aux( ph ) : 0;
+ system::error_code ec;
+ file_status f = symlink_status( ph, ec );
+ if ( ec )
+ boost::throw_exception( basic_filesystem_error<Path>(
+ "boost::filesystem::remove_all", ph, ec ) );
+ return exists( f ) ? detail::remove_all_aux( ph, f ) : 0;
}
@@ -713,6 +717,8 @@
{ return create_symlink<wpath>( to_ph, from_ph, ec ); }
- inline void remove( const path & ph ) { remove<path>( ph ); }
- inline void remove( const wpath & ph ) { remove<wpath>( ph ); }
+ inline bool remove( const path & ph )
+ { return remove<path>( ph ); }
+ inline bool remove( const wpath & ph )
+ { return remove<wpath>( ph ); }
inline unsigned long remove_all( const path & ph )
@@ -763,18 +769,37 @@
{
template<class Path>
- unsigned long remove_all_aux( const Path & ph )
+ bool remove_aux( const Path & ph, file_status f )
+ {
+ if ( exists( f ) )
+ {
+ system::error_code ec = remove_api( ph.external_file_string() );
+ if ( ec )
+ boost::throw_exception( basic_filesystem_error<Path>(
+ "boost::filesystem::remove", ph, ec ) );
+ return true;
+ }
+ return false;
+ }
+
+ template<class Path>
+ unsigned long remove_all_aux( const Path & ph, file_status f )
{
static const boost::filesystem::basic_directory_iterator<Path> end_itr;
unsigned long count = 1;
- if ( !boost::filesystem::is_symlink( ph ) // don't recurse symbolic links
- && boost::filesystem::is_directory( ph ) )
+ if ( !boost::filesystem::is_symlink( f ) // don't recurse symbolic links
+ && boost::filesystem::is_directory( f ) )
{
for ( boost::filesystem::basic_directory_iterator<Path> itr( ph );
itr != end_itr; ++itr )
{
- count += remove_all_aux( itr->path() );
+ boost::system::error_code ec;
+ boost::filesystem::file_status fn = boost::filesystem::symlink_status( itr->path(), ec );
+ if ( ec )
+ boost::throw_exception( basic_filesystem_error<Path>(
+ "boost::filesystem:remove_all", ph, ec ) );
+ count += remove_all_aux( itr->path(), fn );
}
}
- boost::filesystem::remove( ph );
+ remove_aux( ph, f );
return count;
}
Index: /trunk/libs/filesystem/test/operations_test.cpp
===================================================================
--- /trunk/libs/filesystem/test/operations_test.cpp (revision 47181)
+++ /trunk/libs/filesystem/test/operations_test.cpp (revision 48377)
@@ -777,8 +777,8 @@
BOOST_CHECK( fs::exists( file_ph ) );
BOOST_CHECK( !fs::is_directory( file_ph ) );
- fs::remove( file_ph );
+ BOOST_CHECK( fs::remove( file_ph ) );
BOOST_CHECK( !fs::exists( file_ph ) );
- fs::remove( "no-such-file" );
- fs::remove( "no-such-directory/no-such-file" );
+ BOOST_CHECK( !fs::remove( "no-such-file" ) );
+ BOOST_CHECK( !fs::remove( "no-such-directory/no-such-file" ) );
// remove() directory
@@ -791,5 +791,5 @@
bad_remove_dir = dir;
BOOST_CHECK( CHECK_EXCEPTION( bad_remove, ENOTEMPTY ) );
- fs::remove( d1 );
+ BOOST_CHECK( fs::remove( d1 ) );
BOOST_CHECK( !fs::exists( d1 ) );
@@ -798,5 +798,5 @@
// remove() dangling symbolic link
fs::path link( "dangling_link" );
- fs::remove( link );
+ fs::remove( link ); // remove any residue from past tests
BOOST_CHECK( !fs::is_symlink( link ) );
BOOST_CHECK( !fs::exists( link ) );
@@ -804,14 +804,14 @@
BOOST_CHECK( !fs::exists( link ) );
BOOST_CHECK( fs::is_symlink( link ) );
- fs::remove( link );
+ BOOST_CHECK( fs::remove( link ) );
BOOST_CHECK( !fs::is_symlink( link ) );
// remove() self-refering symbolic link
link = "link_to_self";
- fs::remove( link );
+ fs::remove( link ); // remove any residue from past tests
BOOST_CHECK( !fs::is_symlink( link ) );
BOOST_CHECK( !fs::exists( link ) );
fs::create_symlink( link, link );
- fs::remove( link );
+ BOOST_CHECK( fs::remove( link ) );
BOOST_CHECK( !fs::exists( link ) );
BOOST_CHECK( !fs::is_symlink( link ) );
@@ -820,12 +820,12 @@
link = "link_to_a";
fs::path link2( "link_to_b" );
- fs::remove( link );
- fs::remove( link2 );
+ fs::remove( link ); // remove any residue from past tests
+ fs::remove( link2 ); // remove any residue from past tests
BOOST_CHECK( !fs::is_symlink( link ) );
BOOST_CHECK( !fs::exists( link ) );
fs::create_symlink( link, link2 );
fs::create_symlink( link2, link );
- fs::remove( link );
- fs::remove( link2 );
+ BOOST_CHECK( fs::remove( link ) );
+ BOOST_CHECK( fs::remove( link2 ) );
BOOST_CHECK( !fs::exists( link ) );
BOOST_CHECK( !fs::exists( link2 ) );
@@ -834,5 +834,5 @@
// remove() symbolic link to file
file_ph = "link_target";
- fs::remove( file_ph );
+ fs::remove( file_ph ); // remove any residue from past tests
BOOST_CHECK( !fs::exists( file_ph ) );
create_file( file_ph, "" );
@@ -846,9 +846,9 @@
BOOST_CHECK( fs::is_regular_file( link ) );
BOOST_CHECK( fs::is_symlink( link ) );
- fs::remove( link );
+ BOOST_CHECK( fs::remove( link ) );
BOOST_CHECK( fs::exists( file_ph ) );
BOOST_CHECK( !fs::exists( link ) );
BOOST_CHECK( !fs::is_symlink( link ) );
- fs::remove( file_ph );
+ BOOST_CHECK( fs::remove( file_ph ) );
BOOST_CHECK( !fs::exists( file_ph ) );
}
Index: /trunk/libs/filesystem/test/msvc/fstream_test/fstream_test.vcproj
===================================================================
--- /trunk/libs/filesystem/test/msvc/fstream_test/fstream_test.vcproj (revision 46750)
+++ /trunk/libs/filesystem/test/msvc/fstream_test/fstream_test.vcproj (revision 48377)
@@ -87,5 +87,5 @@
<Tool
Name="VCPostBuildEventTool"
- Description="Auto test run"
+ Description="run test"
CommandLine="&quot;$(TargetDir)\$(TargetName).exe&quot; --result_code=no --report_level=no"
/>
@@ -164,4 +164,6 @@
<Tool
Name="VCPostBuildEventTool"
+ Description="run test"
+ CommandLine="&quot;$(TargetDir)\$(TargetName).exe&quot; --result_code=no --report_level=no"
/>
</Configuration>
Index: /trunk/libs/filesystem/test/msvc/operations_test/operations_test.vcproj
===================================================================
--- /trunk/libs/filesystem/test/msvc/operations_test/operations_test.vcproj (revision 46750)
+++ /trunk/libs/filesystem/test/msvc/operations_test/operations_test.vcproj (revision 48377)
@@ -87,5 +87,5 @@
<Tool
Name="VCPostBuildEventTool"
- Description="Auto test run"
+ Description="run test"
CommandLine="&quot;$(TargetDir)\$(TargetName).exe&quot; --result_code=no --report_level=no"
/>
@@ -164,4 +164,6 @@
<Tool
Name="VCPostBuildEventTool"
+ Description="run test"
+ CommandLine="&quot;$(TargetDir)\$(TargetName).exe&quot; --result_code=no --report_level=no"
/>
</Configuration>
Index: /trunk/libs/filesystem/test/msvc/large_file_support_test/large_file_support_test.vcproj
===================================================================
--- /trunk/libs/filesystem/test/msvc/large_file_support_test/large_file_support_test.vcproj (revision 46750)
+++ /trunk/libs/filesystem/test/msvc/large_file_support_test/large_file_support_test.vcproj (revision 48377)
@@ -87,5 +87,5 @@
<Tool
Name="VCPostBuildEventTool"
- Description="Auto test run"
+ Description="run test"
CommandLine="&quot;$(TargetDir)\$(TargetName).exe&quot; --result_code=no --report_level=no"
/>
@@ -164,4 +164,6 @@
<Tool
Name="VCPostBuildEventTool"
+ Description="run test"
+ CommandLine="&quot;$(TargetDir)\$(TargetName).exe&quot; --result_code=no --report_level=no"
/>
</Configuration>
Index: /trunk/libs/filesystem/test/msvc/simple_ls/simple_ls.vcproj
===================================================================
--- /trunk/libs/filesystem/test/msvc/simple_ls/simple_ls.vcproj (revision 46750)
+++ /trunk/libs/filesystem/test/msvc/simple_ls/simple_ls.vcproj (revision 48377)
@@ -87,4 +87,6 @@
<Tool
Name="VCPostBuildEventTool"
+ Description=""
+ CommandLine=""
/>
</Configuration>
@@ -162,4 +164,6 @@
<Tool
Name="VCPostBuildEventTool"
+ Description=""
+ CommandLine=""
/>
</Configuration>
Index: /trunk/libs/filesystem/test/msvc/wide_test/wide_test.vcproj
===================================================================
--- /trunk/libs/filesystem/test/msvc/wide_test/wide_test.vcproj (revision 46750)
+++ /trunk/libs/filesystem/test/msvc/wide_test/wide_test.vcproj (revision 48377)
@@ -87,5 +87,5 @@
<Tool
Name="VCPostBuildEventTool"
- Description="Auto test run"
+ Description="run test"
CommandLine="&quot;$(TargetDir)\$(TargetName).exe&quot; --result_code=no --report_level=no"
/>
@@ -164,4 +164,6 @@
<Tool
Name="VCPostBuildEventTool"
+ Description="run test"
+ CommandLine="&quot;$(TargetDir)\$(TargetName).exe&quot; --result_code=no --report_level=no"
/>
</Configuration>
Index: /trunk/libs/filesystem/test/msvc/mbcopy/mbcopy.vcproj
===================================================================
--- /trunk/libs/filesystem/test/msvc/mbcopy/mbcopy.vcproj (revision 46750)
+++ /trunk/libs/filesystem/test/msvc/mbcopy/mbcopy.vcproj (revision 48377)
@@ -87,4 +87,6 @@
<Tool
Name="VCPostBuildEventTool"
+ Description="run test"
+ CommandLine="&quot;$(TargetDir)\$(TargetName).exe&quot; --result_code=no --report_level=no"
/>
</Configuration>
@@ -162,4 +164,6 @@
<Tool
Name="VCPostBuildEventTool"
+ Description="run test"
+ CommandLine="&quot;$(TargetDir)\$(TargetName).exe&quot; --result_code=no --report_level=no"
/>
</Configuration>
Index: /trunk/libs/filesystem/test/msvc/convenience_test/convenience_test.vcproj
===================================================================
--- /trunk/libs/filesystem/test/msvc/convenience_test/convenience_test.vcproj (revision 46750)
+++ /trunk/libs/filesystem/test/msvc/convenience_test/convenience_test.vcproj (revision 48377)
@@ -87,5 +87,5 @@
<Tool
Name="VCPostBuildEventTool"
- Description="Auto test run"
+ Description="run test"
CommandLine="&quot;$(TargetDir)\$(TargetName).exe&quot; --result_code=no --report_level=no"
/>
@@ -164,4 +164,6 @@
<Tool
Name="VCPostBuildEventTool"
+ Description="run test"
+ CommandLine="&quot;$(TargetDir)\$(TargetName).exe&quot; --result_code=no --report_level=no"
/>
</Configuration>
Index: /trunk/libs/filesystem/test/msvc/path_test/path_test.vcproj
===================================================================
--- /trunk/libs/filesystem/test/msvc/path_test/path_test.vcproj (revision 46750)
+++ /trunk/libs/filesystem/test/msvc/path_test/path_test.vcproj (revision 48377)
@@ -87,5 +87,5 @@
<Tool
Name="VCPostBuildEventTool"
- Description="Auto test run"
+ Description="run test"
CommandLine="&quot;$(TargetDir)\$(TargetName).exe&quot; --result_code=no --report_level=no"
/>
@@ -164,4 +164,6 @@
<Tool
Name="VCPostBuildEventTool"
+ Description="run test"
+ CommandLine="&quot;$(TargetDir)\$(TargetName).exe&quot; --result_code=no --report_level=no"
/>
</Configuration>

16
development/boost/patches/changeset_r48462.diff
View file

@ -1,16 +0,0 @@
Index: /trunk/boost/filesystem/convenience.hpp
===================================================================
--- /trunk/boost/filesystem/convenience.hpp (revision 47181)
+++ /trunk/boost/filesystem/convenience.hpp (revision 48462)
@@ -95,4 +95,5 @@
{ return create_directories<wpath>(ph); }
+# ifndef BOOST_FILESYSTEM_NO_DEPRECATED
inline std::string extension(const path& ph)
{ return extension<path>(ph); }
@@ -109,4 +110,5 @@
inline wpath change_extension( const wpath & ph, const std::wstring& new_ex )
{ return change_extension<wpath>( ph, new_ex ); }
+# endif
# endif