[Libreoffice-commits] .: 8 commits -

[Jan Holesovsky]

 0 files changed

New commits:
commit c3126d39bd044c539657e25e0bb18c71b88cb8c8
Merge: 1022b20... 7e4e00f...
Author: Jan Holesovsky <kendy at suse.cz>
Date:   Thu Jul 28 10:14:01 2011 +0200

    Merge commit 'libreoffice-3.4.2.3'

commit 7e4e00fccc6ec79960709e5e29223dfcd589a734
Author: Petr Mladek <pmladek at suse.cz>
Date:   Mon Jul 25 20:28:43 2011 +0200

    Version 3.4.2.3, tag libreoffice-3.4.2.3 (3.4.2-rc3)
commit 2f97274c8992b25fa73ed943667494c4ee358dc3
Author: Petr Mladek <pmladek at suse.cz>
Date:   Thu Jul 21 14:14:14 2011 +0200

    Version 3.4.2.2, tag libreoffice-3.4.2.2-buildfix1 (3.4.2-rc2)
commit e6bc20e13cfaeb0ce8812d68b920c34c8eeb0e60
Author: Fridrich Strba <fridrich.strba at bluewin.ch>
Date:   Wed Jul 20 02:18:29 2011 -0600

    Fix Windows build
    
    Signed-off-by: Markus Mohrhard <markus.mohrhard at googlemail.com>

diff --git a/mdds/makefile.mk b/mdds/makefile.mk
index fc0bc75..b759886 100644
--- a/mdds/makefile.mk
+++ b/mdds/makefile.mk
@@ -38,7 +38,7 @@ TARGET=mdds
 
 TARFILE_NAME=mdds_0.5.3
 TARFILE_MD5=0ff7d225d087793c8c2c680d77aac3e7
-PATCH_FILES=
+PATCH_FILES=mdds_0.5.3.patch
 
 CONFIGURE_DIR=
 CONFIGURE_ACTION=
diff --git a/mdds/mdds_0.5.3.patch b/mdds/mdds_0.5.3.patch
new file mode 100644
index 0000000..7903431
--- /dev/null
+++ b/mdds/mdds_0.5.3.patch
@@ -0,0 +1,54 @@
+--- misc/mdds_0.5.3/include/mdds/mixed_type_matrix_def.inl	2011-07-13 13:26:27.000000000 -0600
++++ misc/build/mdds_0.5.3/include/mdds/mixed_type_matrix_def.inl	2011-07-20 02:02:21.164198900 -0600
+@@ -216,8 +216,8 @@
+         // assignment to self.
+         return;
+ 
+-    size_t row_count = ::std::min(mp_storage->rows(), r.mp_storage->rows());
+-    size_t col_count = ::std::min(mp_storage->cols(), r.mp_storage->cols());
++    size_t row_count = (::std::min)(mp_storage->rows(), r.mp_storage->rows());
++    size_t col_count = (::std::min)(mp_storage->cols(), r.mp_storage->cols());
+     for (size_t i = 0; i < row_count; ++i)
+         for (size_t j = 0; j < col_count; ++j)
+             mp_storage->get_element(i, j) = r.mp_storage->get_element(i, j);
+--- misc/mdds_0.5.3/include/mdds/mixed_type_matrix_storage_filled_linear.inl	2011-07-13 13:26:27.000000000 -0600
++++ misc/build/mdds_0.5.3/include/mdds/mixed_type_matrix_storage_filled_linear.inl	2011-07-20 02:02:21.179798900 -0600
+@@ -354,8 +354,8 @@
+         }
+ 
+         array_type new_array(new_size, &m_init_elem);
+-        size_t min_rows = ::std::min(row, m_rows);
+-        size_t min_cols = ::std::min(col, m_cols);
++        size_t min_rows = (::std::min)(row, m_rows);
++        size_t min_cols = (::std::min)(col, m_cols);
+         for (size_t i = 0; i < min_rows; ++i)
+         {
+             for (size_t j = 0; j < min_cols; ++j)
+@@ -612,8 +612,8 @@
+         }
+ 
+         array_type new_array(new_size, element(0.0));
+-        size_t min_rows = ::std::min(row, m_rows);
+-        size_t min_cols = ::std::min(col, m_cols);
++        size_t min_rows = (::std::min)(row, m_rows);
++        size_t min_cols = (::std::min)(col, m_cols);
+         for (size_t i = 0; i < min_rows; ++i)
+         {
+             for (size_t j = 0; j < min_cols; ++j)
+--- misc/mdds_0.5.3/include/mdds/point_quad_tree.hpp	2011-07-13 13:26:27.000000000 -0600
++++ misc/build/mdds_0.5.3/include/mdds/point_quad_tree.hpp	2011-07-20 02:04:36.088835900 -0600
+@@ -623,10 +623,10 @@
+ template<typename _Key, typename _Data>
+ void point_quad_tree<_Key,_Data>::insert(key_type x, key_type y, data_type data)
+ {
+-    m_xrange.first  = ::std::min(m_xrange.first,  x);
+-    m_xrange.second = ::std::max(m_xrange.second, x);
+-    m_yrange.first  = ::std::min(m_yrange.first,  y);
+-    m_yrange.second = ::std::max(m_yrange.second, y);
++    m_xrange.first  = (::std::min)(m_xrange.first,  x);
++    m_xrange.second = (::std::max)(m_xrange.second, x);
++    m_yrange.first  = (::std::min)(m_yrange.first,  y);
++    m_yrange.second = (::std::max)(m_yrange.second, y);
+ 
+     if (!m_root)
+     {
commit 8106f5a24b753740c5009b2a3d920634782ff192
Author: Petr Mladek <pmladek at suse.cz>
Date:   Tue Jul 19 17:08:00 2011 +0200

    Version 3.4.2.2, tag libreoffice-3.4.2.2 (3.4.2-rc2)
commit 806a1b6641113d06b303e8da1e578da1560aa702
Author: Kohei Yoshida <kyoshida at novell.com>
Date:   Wed Jul 13 15:54:52 2011 -0400

    Updated mdds to 0.5.3.
    
    Signed-off-by: David Tardon <dtardon at redhat.com>
    Signed-off-by: Michael Meeks <michael.meeks at novell.com>

diff --git a/mdds/makefile.mk b/mdds/makefile.mk
index ed8f18b..fc0bc75 100644
--- a/mdds/makefile.mk
+++ b/mdds/makefile.mk
@@ -36,8 +36,8 @@ TARGET=mdds
 
 # --- Files --------------------------------------------------------
 
-TARFILE_NAME=mdds_0.5.2
-TARFILE_MD5=7a0dcb3fe1e8c7229ab4fb868b7325e6
+TARFILE_NAME=mdds_0.5.3
+TARFILE_MD5=0ff7d225d087793c8c2c680d77aac3e7
 PATCH_FILES=
 
 CONFIGURE_DIR=
commit 3b8b82e0af66f238fd9c4a47593d6f2323a58146
Author: Petr Mladek <pmladek at suse.cz>
Date:   Tue Jul 12 16:41:11 2011 +0200

    Branch libreoffice-3-4-2
    
    This is 'libreoffice-3-4-2' - the stable branch for the 3.4.2 release.
    Only very safe changes, reviewed by three people are allowed.
    
    If you want to commit more complicated fix for the next 3.4.x release,
    please use the 'libreoffice-3-4' branch.
    
    If you want to build something cool, unstable, and risky, use master.
commit db1427a7118e7df98a144f68f6b2c8d785e433cb
Author: Petr Mladek <pmladek at suse.cz>
Date:   Tue Jul 12 15:49:41 2011 +0200

    Version 3.4.2.1, tag libreoffice-3.4.2.1 (3.4.2-rc1)