[ooo-build-commit] patches/dev300

[Tor Lillqvist]

 patches/dev300/apply                  |    3 +++
 patches/dev300/win32-boost-crack.diff |   17 +++++++++++++++++
 2 files changed, 20 insertions(+)

New commits:
commit c75388e0c938e97f317f550bc4904def6737deae
Author: Tor Lillqvist <tlillqvist at novell.com>
Date:   Wed Oct 7 18:49:25 2009 +0300

    Try to work around boost crack
    
    * patches/dev300/win32-boost-crack.diff: New file. Patch
      bind/bind.hpp to use the simple workaround code for less capable
      compilers also with MSVC(9), even if MSVC as such is supposed to
      have the capabilities the non-workaround code path requires. Helps
      compilation of our code additions in slideshow.
    
    * patches/dev300/apply: Add it to Win32Only.

diff --git a/patches/dev300/apply b/patches/dev300/apply
index 738a18d..a946133 100644
--- a/patches/dev300/apply
+++ b/patches/dev300/apply
@@ -3394,3 +3394,6 @@ o3tl-vector-pool.diff, n#535304, thorsten
 [ Fixes >= dev300-m60 ]
 # deliver extra headers for svg import filter.
 boost-1.39-extra-header.diff, kohei
+
+[ Win32Only >= dev300-m60 ]
+win32-boost-crack.diff
diff --git a/patches/dev300/win32-boost-crack.diff b/patches/dev300/win32-boost-crack.diff
new file mode 100644
index 0000000..14ca99e
--- /dev/null
+++ b/patches/dev300/win32-boost-crack.diff
@@ -0,0 +1,17 @@
+--- boost/boost_1_39_0.patch
++++ boost/boost_1_39_0.patch
+@@ -181,3 +181,14 @@
+          }
+  
+          template <typename ScannerT>
++--- misc/build/boost_1_39_0/boost/bind/bind.hpp
+++++ misc/build/boost_1_39_0/boost/bind/bind.hpp
++@@ -1628,7 +1628,7 @@
++ 
++ // data member pointers
++ 
++-#if defined(BOOST_NO_TEMPLATE_PARTIAL_SPECIALIZATION) || defined(BOOST_NO_FUNCTION_TEMPLATE_ORDERING) \
+++#if 1 || defined(BOOST_NO_TEMPLATE_PARTIAL_SPECIALIZATION) || defined(BOOST_NO_FUNCTION_TEMPLATE_ORDERING) \
++     || ( defined(__BORLANDC__) && BOOST_WORKAROUND( __BORLANDC__, <= 0x610 ) )
++ 
++ template<class R, class T, class A1>