ooo-build r11764 - in trunk: . patches/src680

[tml svn gnome org]

Author: tml
Date: Fri Feb 29 18:47:43 2008
New Revision: 11764
URL: http://svn.gnome.org/viewvc/ooo-build?rev=11764&view=rev

Log:
2008-02-29  Tor Lillqvist  <tml novell com>

	* patches/src680/boost-patch.diff: The patch for
	boost/spirit/iterator/position_iterator.hpp needs to be in
	spirit-1.6.1.patch, not boost-1.30.2.patch. To avoid unnecessary
	clarity and add some interestingness, the same header files are
	unpacked both from the boost tarball and spirit tarball. It is the
	spirit files from the spirit tarball that actually get delivered
	and it is in there that we need to patch position_iterator.hpp.



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

Modified: trunk/patches/src680/boost-patch.diff
==============================================================================
--- trunk/patches/src680/boost-patch.diff	(original)
+++ trunk/patches/src680/boost-patch.diff	Fri Feb 29 18:47:43 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,371 @@
+@@ -710,3 +710,350 @@
                    return tok_;
                }   
                template <class Iterator>
@@ -351,8 +351,14 @@
 +              iterator2 end () const {
 +                  return iterator2 ((*this) (), it1_, it2_ ().end ());
 +              }
-+--- misc/build/boost-1.30.2/boost/spirit/iterator/position_iterator.hpp
-++++ misc/build/boost-1.30.2/boost/spirit/iterator/position_iterator.hpp
+--- boost/spirit-1.6.1.patch
++++ boost/spirit-1.6.1.patch
+@@ -1716,3 +1716,24 @@
+   class type_with_alignment
+   {
+       typedef detail::lower_alignment<Align> t1;
++--- misc/build/spirit-1.6.1/boost/spirit/iterator/position_iterator.hpp
+++++ misc/build/spirit-1.6.1/boost/spirit/iterator/position_iterator.hpp
 +@@ -25,10 +25,18 @@
 + #endif
 +