ooo-build r13591 - in trunk: . patches/dev300

[tml svn gnome org]

Author: tml
Date: Fri Aug 15 13:45:39 2008
New Revision: 13591
URL: http://svn.gnome.org/viewvc/ooo-build?rev=13591&view=rev

Log:
2008-08-15  Tor Lillqvist  <tml novell com>

	* patches/src680/boost-patch.diff: Patch boost harder. With
	MSVS2008 a.k.a WNTMSCI12 apparently the BOOST_MSVC_STD_ITERATOR
	workaround is not needed any more (and using it in fact causes
	compilation errors in scsolver).



Modified:
   trunk/ChangeLog
   trunk/patches/dev300/boost-patch.diff

Modified: trunk/patches/dev300/boost-patch.diff
==============================================================================
--- trunk/patches/dev300/boost-patch.diff	(original)
+++ trunk/patches/dev300/boost-patch.diff	Fri Aug 15 13:45:39 2008
@@ -1,6 +1,6 @@
 --- boost/boost-1.30.2.patch.OLD	2005-10-11 11:58:51.000000000 +0300
 +++ boost/boost-1.30.2.patch	2006-02-16 17:23:14.000000000 +0200
-@@ -710,3 +710,350 @@
+@@ -710,3 +710,364 @@
                    return tok_;
                }   
                template <class Iterator>
@@ -351,6 +351,20 @@
 +              iterator2 end () const {
 +                  return iterator2 ((*this) (), it1_, it2_ ().end ());
 +              }
++--- misc/build/boost-1.30.2/boost/numeric/ublas/config.hpp
+++++ misc/build/boost-1.30.2/boost/numeric/ublas/config.hpp
++@@ -97,11 +97,6 @@
++ // }
++ // But boost provides it for us.
++ 
++-// This seems to be a problem in boost.config, but won't be fixed.
++-#ifdef __SGI_STL_PORT
++-#define BOOST_MSVC_STD_ITERATOR
++-#endif
++-
++ #endif
++ 
++ 
 --- boost/spirit-1.6.1.patch
 +++ boost/spirit-1.6.1.patch
 @@ -1716,3 +1716,24 @@