[Libreoffice-commits] .: mdds/makefile.mk mdds/mdds_0.5.3.patch mdds/mdds_0.6.0.patch ooo.lst.in
Kohei Yoshida
kohei at kemper.freedesktop.org
Thu Jul 19 10:43:51 PDT 2012
mdds/makefile.mk | 6 ++--
mdds/mdds_0.5.3.patch | 62 --------------------------------------------------
mdds/mdds_0.6.0.patch | 54 +++++++++++++++++++++++++++++++++++++++++++
ooo.lst.in | 2 -
4 files changed, 58 insertions(+), 66 deletions(-)
New commits:
commit e5e5c0c0c4b9c369543f09ab44e9d3c87dc93ca1
Author: Kohei Yoshida <kohei.yoshida at gmail.com>
Date: Thu Jul 19 13:36:05 2012 -0400
Update mdds package to 0.6.0. It builds for me.
Change-Id: I66663f35f6f607e4a2fc40c6ecb5a52682cbc934
diff --git a/mdds/makefile.mk b/mdds/makefile.mk
index dea3514..f7b83f4 100644
--- a/mdds/makefile.mk
+++ b/mdds/makefile.mk
@@ -27,9 +27,9 @@ TARGET=mdds
# --- Files --------------------------------------------------------
-TARFILE_NAME=mdds_0.5.3
-TARFILE_MD5=0ff7d225d087793c8c2c680d77aac3e7
-PATCH_FILES=mdds_0.5.3.patch
+TARFILE_NAME=mdds_0.6.0
+TARFILE_MD5=3e89a35f253a4f1c7de68c57d851ef38
+PATCH_FILES=mdds_0.6.0.patch
CONFIGURE_DIR=
CONFIGURE_ACTION=
diff --git a/mdds/mdds_0.5.3.patch b/mdds/mdds_0.5.3.patch
deleted file mode 100644
index 40aedb1..0000000
--- a/mdds/mdds_0.5.3.patch
+++ /dev/null
@@ -1,62 +0,0 @@
---- 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
-@@ -44,7 +44,6 @@
- default:
- throw matrix_error("unknown density type");
- }
-- return NULL;
- }
-
- template<typename _String, typename _Flag>
-@@ -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)
- {
diff --git a/mdds/mdds_0.6.0.patch b/mdds/mdds_0.6.0.patch
new file mode 100644
index 0000000..fba1502
--- /dev/null
+++ b/mdds/mdds_0.6.0.patch
@@ -0,0 +1,54 @@
+--- misc/mdds_0.6.0/include/mdds/mixed_type_matrix_def.inl 2011-07-13 13:26:27.000000000 -0600
++++ misc/build/mdds_0.6.0/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.6.0/include/mdds/mixed_type_matrix_storage_filled_linear.inl 2011-07-13 13:26:27.000000000 -0600
++++ misc/build/mdds_0.6.0/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.6.0/include/mdds/point_quad_tree.hpp 2011-07-13 13:26:27.000000000 -0600
++++ misc/build/mdds_0.6.0/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)
+ {
diff --git a/ooo.lst.in b/ooo.lst.in
index b8e1589..86f470a 100644
--- a/ooo.lst.in
+++ b/ooo.lst.in
@@ -83,7 +83,7 @@ a0a861f539f0e7a91d05e6b9457e4db1-nss-3.13.5-with-nspr-4.9.1.tar.gz
9d283e02441d8cebdcd1e5d9df227d67-libwpg-0.2.1.tar.bz2
c01351d7db2b205de755d58769288224-libwpd-0.9.4.tar.bz2
d197bd6211669a2fa4ca648faf04bcb1-libwps-0.2.7.tar.bz2
-0ff7d225d087793c8c2c680d77aac3e7-mdds_0.5.3.tar.bz2
+3e89a35f253a4f1c7de68c57d851ef38-mdds_0.6.0.tar.bz2
f02578f5218f217a9f20e9c30e119c6a-boost_1_44_0.tar.bz2
3121aaf3e13e5d88dfff13fb4a5f1ab8-hunspell-1.3.2.tar.gz
3bf481ca95109b14435125c0dd1f2217-graphite2-1.0.3.tgz
More information about the Libreoffice-commits
mailing list