[ooo-build-commit] 2 commits - patches/dev300
René Engelhard
rene at kemper.freedesktop.org
Sun Oct 11 18:16:55 PDT 2009
patches/dev300/apply | 27 --
patches/dev300/boost-patch.diff | 394 ----------------------------------------
2 files changed, 8 insertions(+), 413 deletions(-)
New commits:
commit ff889524138a63fadf9baa0d6e0af0eaa2c7176e
Author: Rene Engelhard <rene at debian.org>
Date: Mon Oct 12 02:52:40 2009 +0200
more updated conditionals, remove boost-patch.diff which was < dev300-m60
* patches/dev300/apply:
* patches/dev300/boost-patch.diff:
diff --git a/patches/dev300/apply b/patches/dev300/apply
index 5de511e..412dd46 100644
--- a/patches/dev300/apply
+++ b/patches/dev300/apply
@@ -262,7 +262,7 @@ linkoo-dev300.diff, jholesov
# until the internal compiler error is fixed
# buildfix-gcc-4.3-compiler-error.diff, n#370383, pmladek
-[ TemporaryHacks >= dev300-m60 ]
+[ TemporaryHacks ]
# Make the historically very verbose build quieter, helps us see warnings.
# From the upstream buildverbosity01 CWS
@@ -546,7 +546,7 @@ cws-webdavandgvfslocking1-tools.diff
cws-webdavandgvfslocking1-ucb.diff
cws-webdavandgvfslocking1-unotools.diff
-[ WebDAV >= dev300-m60 ]
+[ WebDAV ]
SectionOwner => jholesov
SectionIssue => i#29152
@@ -1117,11 +1117,9 @@ installer-get-path-correctly.diff, pmladek
# allow to use the prebuilt jsr173_1.0_api.jar
build-prebuilt-stax.diff, i#93116, pmladek
-[ BuildBits ]
# fix build with neon-0.24
ucb-neon-0.24.diff, pmladek
-[ BuildBits >= dev300-m60 ]
# it builds fine with boost-1,36 here
build-enable-boost-1.36.diff, i#105772, pmladek
@@ -1510,13 +1508,6 @@ win32-gw-send-mail.diff, i#34264, n#418407, tml
# This is a pretty nasty IE problem i#19510, i#65209
win32-activex-disable.diff, i#65209, i#19510, n#168534, tml
-[ Win32Only < dev300-m60 ]
-
-# This enables building scsolver on Win32
-boost-patch.diff, tml
-
-[ Win32Only ]
-
# fixes for visual studio express 2005 ( ooo-build only )
2005-express-stl-remove.diff, noelpwer, i#71404
@@ -3367,11 +3358,11 @@ svx-ppt-import-fix-bullet-size.diff, n#515972, rodo
basegfx-svgpolygon-speedup.diff, n#535304, thorsten
o3tl-vector-pool.diff, n#535304, thorsten
-[ Fixes >= dev300-m60 ]
+[ Fixes ]
# deliver extra headers for svg import filter.
boost-1.39-extra-header.diff, kohei
-[ Win32Only >= dev300-m60 ]
+[ Win32Only ]
win32-boost-crack.diff
[ NovellOnly ]
diff --git a/patches/dev300/boost-patch.diff b/patches/dev300/boost-patch.diff
deleted file mode 100644
index f14dc79..0000000
--- a/patches/dev300/boost-patch.diff
+++ /dev/null
@@ -1,394 +0,0 @@
---- 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,364 @@
- return tok_;
- }
- template <class Iterator>
-+*** misc/boost-1.30.2/boost/numeric/ublas/matrix.hpp Sat Mar 1 15:23:52 2003
-+--- misc/build/boost-1.30.2/boost/numeric/ublas/matrix.hpp Tue Feb 14 15:01:57 2006
-+***************
-+*** 402,412 ****
-+--- 402,414 ----
-+ }
-+
-+ BOOST_UBLAS_INLINE
-++ typename self_type::
-+ const_iterator2 begin () const {
-+ const self_type &m = (*this) ();
-+ return m.find_first2 (1, index1 (), 0);
-+ }
-+ BOOST_UBLAS_INLINE
-++ typename self_type::
-+ const_iterator2 end () const {
-+ const self_type &m = (*this) ();
-+ return m.find_first2 (1, index1 (), m.size2 ());
-+***************
-+*** 528,538 ****
-+--- 530,542 ----
-+ }
-+
-+ BOOST_UBLAS_INLINE
-++ typename self_type::
-+ iterator2 begin () const {
-+ self_type &m = (*this) ();
-+ return m.find_first2 (1, index1 (), 0);
-+ }
-+ BOOST_UBLAS_INLINE
-++ typename self_type::
-+ iterator2 end () const {
-+ self_type &m = (*this) ();
-+ return m.find_first2 (1, index1 (), m.size2 ());
-+***************
-+*** 1291,1301 ****
-+--- 1295,1307 ----
-+ }
-+
-+ BOOST_UBLAS_INLINE
-++ typename self_type::
-+ const_iterator2 begin () const {
-+ const self_type &m = (*this) ();
-+ return m.find_first2 (1, index1 (), 0);
-+ }
-+ BOOST_UBLAS_INLINE
-++ typename self_type::
-+ const_iterator2 end () const {
-+ const self_type &m = (*this) ();
-+ return m.find_first2 (1, index1 (), m.size2 ());
-+***************
-+*** 1434,1444 ****
-+--- 1440,1452 ----
-+ }
-+
-+ BOOST_UBLAS_INLINE
-++ typename self_type::
-+ iterator2 begin () const {
-+ self_type &m = (*this) ();
-+ return m.find_first2 (1, index1 (), 0);
-+ }
-+ BOOST_UBLAS_INLINE
-++ typename self_type::
-+ iterator2 end () const {
-+ self_type &m = (*this) ();
-+ return m.find_first2 (1, index1 (), m.size2 ());
-+***************
-+*** 2057,2067 ****
-+--- 2065,2077 ----
-+ }
-+
-+ BOOST_UBLAS_INLINE
-++ typename self_type::
-+ const_iterator2 begin () const {
-+ const self_type &m = (*this) ();
-+ return m.find_first2 (1, index1 (), 0);
-+ }
-+ BOOST_UBLAS_INLINE
-++ typename self_type::
-+ const_iterator2 end () const {
-+ const self_type &m = (*this) ();
-+ return m.find_first2 (1, index1 (), m.size2 ());
-+***************
-+*** 2500,2510 ****
-+--- 2510,2522 ----
-+ }
-+
-+ BOOST_UBLAS_INLINE
-++ typename self_type::
-+ const_iterator2 begin () const {
-+ const self_type &m = (*this) ();
-+ return m.find_first2 (1, index1 (), 0);
-+ }
-+ BOOST_UBLAS_INLINE
-++ typename self_type::
-+ const_iterator2 end () const {
-+ const self_type &m = (*this) ();
-+ return m.find_first2 (1, index1 (), m.size2 ());
-+***************
-+*** 2928,2938 ****
-+--- 2940,2952 ----
-+ }
-+
-+ BOOST_UBLAS_INLINE
-++ typename self_type::
-+ const_iterator2 begin () const {
-+ const scalar_matrix &m = (*this) ();
-+ return m.find_first2 (1, index1 (), 0);
-+ }
-+ BOOST_UBLAS_INLINE
-++ typename self_type::
-+ const_iterator2 end () const {
-+ const scalar_matrix &m = (*this) ();
-+ return m.find_first2 (1, index1 (), m.size2 ());
-+***************
-+*** 3542,3552 ****
-+--- 3556,3568 ----
-+ }
-+
-+ BOOST_UBLAS_INLINE
-++ typename self_type::
-+ const_iterator2 begin () const {
-+ const self_type &m = (*this) ();
-+ return m.find_first2 (1, index1 (), 0);
-+ }
-+ BOOST_UBLAS_INLINE
-++ typename self_type::
-+ const_iterator2 end () const {
-+ const self_type &m = (*this) ();
-+ return m.find_first2 (1, index1 (), m.size2 ());
-+***************
-+*** 3668,3678 ****
-+--- 3684,3696 ----
-+ }
-+
-+ BOOST_UBLAS_INLINE
-++ typename self_type::
-+ iterator2 begin () const {
-+ self_type &m = (*this) ();
-+ return m.find_first2 (1, index1 (), 0);
-+ }
-+ BOOST_UBLAS_INLINE
-++ typename self_type::
-+ iterator2 end () const {
-+ self_type &m = (*this) ();
-+ return m.find_first2 (1, index1 (), m.size2 ());
-+*** misc/boost-1.30.2/boost/numeric/ublas/matrix_expression.hpp Tue Feb 18 09:32:46 2003
-+--- misc/build/boost-1.30.2/boost/numeric/ublas/matrix_expression.hpp Tue Feb 14 14:55:04 2006
-+***************
-+*** 778,787 ****
-+--- 778,789 ----
-+ }
-+
-+ BOOST_UBLAS_INLINE
-++ typename self_type::
-+ const_iterator2 begin () const {
-+ return (*this) ().find_first2 (1, index1 (), 0);
-+ }
-+ BOOST_UBLAS_INLINE
-++ typename self_type::
-+ const_iterator2 end () const {
-+ return (*this) ().find_first2 (1, index1 (), (*this) ().size2 ());
-+ }
-+***************
-+*** 1232,1241 ****
-+--- 1234,1245 ----
-+ }
-+
-+ BOOST_UBLAS_INLINE
-++ typename self_type::
-+ const_iterator2 begin () const {
-+ return (*this) ().find_first2 (1, index1 (), 0);
-+ }
-+ BOOST_UBLAS_INLINE
-++ typename self_type::
-+ const_iterator2 end () const {
-+ return (*this) ().find_first2 (1, index1 (), (*this) ().size2 ());
-+ }
-+***************
-+*** 1666,1675 ****
-+--- 1670,1681 ----
-+ }
-+
-+ BOOST_UBLAS_INLINE
-++ typename self_type::
-+ const_iterator2 begin () const {
-+ return (*this) ().find_first2 (1, index1 (), 0);
-+ }
-+ BOOST_UBLAS_INLINE
-++ typename self_type::
-+ const_iterator2 end () const {
-+ return (*this) ().find_first2 (1, index1 (), (*this) ().size2 ());
-+ }
-+***************
-+*** 2234,2243 ****
-+--- 2240,2251 ----
-+ }
-+
-+ BOOST_UBLAS_INLINE
-++ typename self_type::
-+ const_iterator2 begin () const {
-+ return (*this) ().find_first2 (1, index1 (), 0);
-+ }
-+ BOOST_UBLAS_INLINE
-++ typename self_type::
-+ const_iterator2 end () const {
-+ return (*this) ().find_first2 (1, index1 (), (*this) ().size2 ());
-+ }
-+***************
-+*** 2808,2817 ****
-+--- 2816,2827 ----
-+ }
-+
-+ BOOST_UBLAS_INLINE
-++ typename self_type::
-+ const_iterator2 begin () const {
-+ return (*this) ().find_first2 (1, index1 (), 0);
-+ }
-+ BOOST_UBLAS_INLINE
-++ typename self_type::
-+ const_iterator2 end () const {
-+ return (*this) ().find_first2 (1, index1 (), (*this) ().size2 ());
-+ }
-+***************
-+*** 3240,3249 ****
-+--- 3250,3261 ----
-+ }
-+
-+ BOOST_UBLAS_INLINE
-++ typename self_type::
-+ const_iterator2 begin () const {
-+ return (*this) ().find_first2 (1, index1 (), 0);
-+ }
-+ BOOST_UBLAS_INLINE
-++ typename self_type::
-+ const_iterator2 end () const {
-+ return (*this) ().find_first2 (1, index1 (), (*this) ().size2 ());
-+ }
-+***************
-+*** 4530,4539 ****
-+--- 4542,4553 ----
-+ }
-+
-+ BOOST_UBLAS_INLINE
-++ typename self_type::
-+ const_iterator2 begin () const {
-+ return (*this) ().find_first2 (1, index1 (), 0);
-+ }
-+ BOOST_UBLAS_INLINE
-++ typename self_type::
-+ const_iterator2 end () const {
-+ return (*this) ().find_first2 (1, index1 (), (*this) ().size2 ());
-+ }
-+*** misc/boost-1.30.2/boost/numeric/ublas/matrix_proxy.hpp Sat Mar 1 15:23:52 2003
-+--- misc/build/boost-1.30.2/boost/numeric/ublas/matrix_proxy.hpp Tue Feb 14 14:57:56 2006
-+***************
-+*** 2998,3008 ****
-+--- 2998,3010 ----
-+ }
-+
-+ BOOST_UBLAS_INLINE
-++ typename self_type::
-+ const_iterator2 begin () const {
-+ const self_type &mr = (*this) ();
-+ return mr.find_first2 (1, index1 (), 0);
-+ }
-+ BOOST_UBLAS_INLINE
-++ typename self_type::
-+ const_iterator2 end () const {
-+ const self_type &mr = (*this) ();
-+ return mr.find_first2 (1, index1 (), mr.size2 ());
-+***************
-+*** 3126,3136 ****
-+--- 3128,3140 ----
-+ }
-+
-+ BOOST_UBLAS_INLINE
-++ typename self_type::
-+ iterator2 begin () const {
-+ self_type &mr = (*this) ();
-+ return mr.find_first2 (1, index1 (), 0);
-+ }
-+ BOOST_UBLAS_INLINE
-++ typename self_type::
-+ iterator2 end () const {
-+ self_type &mr = (*this) ();
-+ return mr.find_first2 (1, index1 (), mr.size2 ());
-+***************
-+*** 3906,3915 ****
-+--- 3910,3921 ----
-+ }
-+
-+ BOOST_UBLAS_INLINE
-++ typename self_type::
-+ const_iterator2 begin () const {
-+ return const_iterator2 ((*this) (), it1_, it2_ ().begin ());
-+ }
-+ BOOST_UBLAS_INLINE
-++ typename self_type::
-+ const_iterator2 end () const {
-+ return const_iterator2 ((*this) (), it1_, it2_ ().end ());
-+ }
-+***************
-+*** 4032,4041 ****
-+--- 4038,4049 ----
-+ }
-+
-+ BOOST_UBLAS_INLINE
-++ typename self_type::
-+ iterator2 begin () const {
-+ return iterator2 ((*this) (), it1_, it2_ ().begin ());
-+ }
-+ BOOST_UBLAS_INLINE
-++ typename self_type::
-+ iterator2 end () const {
-+ return iterator2 ((*this) (), it1_, it2_ ().end ());
-+ }
-+***************
-+*** 4816,4825 ****
-+--- 4824,4835 ----
-+ }
-+
-+ BOOST_UBLAS_INLINE
-++ typename self_type::
-+ const_iterator2 begin () const {
-+ return const_iterator2 ((*this) (), it1_, it2_ ().begin ());
-+ }
-+ BOOST_UBLAS_INLINE
-++ typename self_type::
-+ const_iterator2 end () const {
-+ return const_iterator2 ((*this) (), it1_, it2_ ().end ());
-+ }
-+***************
-+*** 4942,4951 ****
-+--- 4952,4963 ----
-+ }
-+
-+ BOOST_UBLAS_INLINE
-++ typename self_type::
-+ iterator2 begin () const {
-+ return iterator2 ((*this) (), it1_, it2_ ().begin ());
-+ }
-+ BOOST_UBLAS_INLINE
-++ typename self_type::
-+ 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 @@
-
- #endif // #ifndef BOOST_WEAK_PTR_HPP_INCLUDED
- --- 180,184 ----
-+--- 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
-+
-+ #if defined(BOOST_NO_STD_ITERATOR_TRAITS)
-++#ifdef BOOST_MSVC
-++#if BOOST_WORKAROUND(BOOST_MSVC, <= 1300)
-+ #define BOOST_SPIRIT_IT_NS impl
-+ #else
-+ #define BOOST_SPIRIT_IT_NS std
-+ #endif
-++#else
-++#define BOOST_SPIRIT_IT_NS impl
-++#endif
-++#else
-++#define BOOST_SPIRIT_IT_NS std
-++#endif
-+
-+ ///////////////////////////////////////////////////////////////////////////////
-+ namespace boost { namespace spirit {
commit 536bf188db66b2e136f503d16d814321c1d47917
Author: Rene Engelhard <rene at debian.org>
Date: Mon Oct 12 02:48:30 2009 +0200
remove obsolete conditional, remove obsolete FIXME comment
* patches/dev300/apply:
diff --git a/patches/dev300/apply b/patches/dev300/apply
index 0658f9f..5de511e 100644
--- a/patches/dev300/apply
+++ b/patches/dev300/apply
@@ -607,15 +607,14 @@ unxsplash-3layer.diff, i#60696, jholesov
# fix bitmap reading; the lines are aliased to 4 bytes
unxsplash-bmp-alias.diff, i#60696, jholesov
-[ WriterFixes < dev300-m60 ]
-# Allows to copy/paste html text which is between 2 unknown tags.
-# FIXME: This one applies, but doesn't build in dev300-m60.
-sw-html-insert-unknown-tags.diff, i#59064, mloiseleur
-
[ WriterFixes ]
# Some WW8 fields weren't imported at all
sw-ww8-field-fix.diff, i#61075, i#89667, cbosdo
+# Allows to copy/paste html text which is between 2 unknown tags.
+# FIXME: This one applies, but doesn't build in dev300-m60.
+#sw-html-insert-unknown-tags.diff, i#59064, mloiseleur
+
[ CalcFixes ]
# Replace usability numb Zoom dialog with a Combo Box
@@ -2805,7 +2804,6 @@ fix-ppt-linespacing-import-export.diff, n#355302, rodo
sw-allow-negative-spacing.diff, n#364534, freuter
-# FIXME: These patches no longer apply against dev300-m60.
field-patch.diff, n#248354, freuter
field-patch-uno-fix.diff, cbosdo
More information about the ooo-build-commit
mailing list