mdds/0001-Workaround-for-gcc-bug.patch | 27 +++++++++ mdds/0001-fix-linking-error-with-boost-1.50.patch | 27 --------- mdds/makefile.mk | 10 +-- mdds/mdds_0.5.3.patch | 62 ---------------------- mdds/mdds_0.6.0.patch | 54 +++++++++++++++++++ ooo.lst.in | 2 6 files changed, 87 insertions(+), 95 deletions(-)
New commits: commit ff1739ea32ca98c9516e6d9bf7c131f9787a7220 Author: Kohei Yoshida <[email protected]> Date: Tue Sep 18 10:14:45 2012 -0400 Update mdds to 0.6.1. Change-Id: Ic400620f1bab54cf9b535193b62840243cdede77 Signed-off-by: Markus Mohrhard <[email protected]> diff --git a/mdds/0001-Workaround-for-gcc-bug.patch b/mdds/0001-Workaround-for-gcc-bug.patch new file mode 100644 index 0000000..4205ea5 --- /dev/null +++ b/mdds/0001-Workaround-for-gcc-bug.patch @@ -0,0 +1,27 @@ +From e1c795c8734119985ea09bf4d9f860d11e440b2a Mon Sep 17 00:00:00 2001 +From: Kohei Yoshida <[email protected]> +Date: Mon, 30 Jul 2012 14:36:24 -0400 +Subject: [PATCH] Workaround for gcc bug. + +c.f. http://gcc.gnu.org/bugzilla/show_bug.cgi?id=44963 +--- + include/mdds/multi_type_vector_types.hpp | 3 ++- + 1 files changed, 2 insertions(+), 1 deletions(-) + +diff --git a/include/mdds/multi_type_vector_types.hpp b/include/mdds/multi_type_vector_types.hpp +index 78f18cb..6189139 100644 +--- a/include/mdds/multi_type_vector_types.hpp ++++ misc/build/mdds_0.6.1/include/mdds/multi_type_vector_types.hpp +@@ -218,7 +218,8 @@ public: + typename store_type::const_iterator it_end = it; + std::advance(it_end, len); + d.reserve(d.size() + len); +- std::copy(it, it_end, std::back_inserter(d)); ++ for (; it != it_end; ++it) ++ d.push_back(*it); + } + + static void assign_values_from_block( +-- +1.7.7 + diff --git a/mdds/0001-fix-linking-error-with-boost-1.50.patch b/mdds/0001-fix-linking-error-with-boost-1.50.patch deleted file mode 100644 index c5a4afc..0000000 --- a/mdds/0001-fix-linking-error-with-boost-1.50.patch +++ /dev/null @@ -1,27 +0,0 @@ -From 09937e5d6b4b82efbff40da2aa50fb02f2250bb2 Mon Sep 17 00:00:00 2001 -From: David Tardon <[email protected]> -Date: Sat, 28 Jul 2012 14:32:47 +0200 -Subject: [PATCH] fix linking error with boost 1.50 - ---- - include/mdds/mixed_type_matrix_storage.hpp | 4 ++++ - 1 file changed, 4 insertions(+) - -diff --git a/include/mdds/mixed_type_matrix_storage.hpp b/include/mdds/mixed_type_matrix_storage.hpp -index fa0bf25..bb4e354 100644 ---- a/include/mdds/mixed_type_matrix_storage.hpp -+++ misc/build/mdds_0.5.3/include/mdds/mixed_type_matrix_storage.hpp -@@ -32,6 +32,10 @@ - - #include <boost/ptr_container/ptr_vector.hpp> - #include <boost/ptr_container/ptr_map.hpp> -+// Boost.Pool indirectly pulls in Boost.System, causing linking error -+// with Boost 1.50, because some (deprecated) symbols from System are -+// not found. -+#define BOOST_SYSTEM_NO_DEPRECATED - #include <boost/pool/object_pool.hpp> - - namespace mdds { --- -1.7.11.2 - diff --git a/mdds/makefile.mk b/mdds/makefile.mk index 0063870..7338e0a 100644 --- a/mdds/makefile.mk +++ b/mdds/makefile.mk @@ -36,11 +36,11 @@ TARGET=mdds # --- Files -------------------------------------------------------- -TARFILE_NAME=mdds_0.5.3 -TARFILE_MD5=0ff7d225d087793c8c2c680d77aac3e7 -PATCH_FILES=mdds_0.5.3.patch -PATCH_FILES=\ - 0001-fix-linking-error-with-boost-1.50.patch \ +TARFILE_NAME=mdds_0.6.1 +TARFILE_MD5=9f9e15966b5624834157fe3d748312bc + +PATCH_FILES=mdds_0.6.0.patch \ + 0001-Workaround-for-gcc-bug.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..d1d997c --- /dev/null +++ b/mdds/mdds_0.6.0.patch @@ -0,0 +1,54 @@ +--- misc/mdds_0.6.1/include/mdds/mixed_type_matrix_def.inl 2011-07-13 13:26:27.000000000 -0600 ++++ misc/build/mdds_0.6.1/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.1/include/mdds/mixed_type_matrix_storage_filled_linear.inl 2011-07-13 13:26:27.000000000 -0600 ++++ misc/build/mdds_0.6.1/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.1/include/mdds/point_quad_tree.hpp 2011-07-13 13:26:27.000000000 -0600 ++++ misc/build/mdds_0.6.1/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 9a8bf74..f4d8db9 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 +9f9e15966b5624834157fe3d748312bc-mdds_0.6.1.tar.bz2 f02578f5218f217a9f20e9c30e119c6a-boost_1_44_0.tar.bz2 3121aaf3e13e5d88dfff13fb4a5f1ab8-hunspell-1.3.2.tar.gz 3bf481ca95109b14435125c0dd1f2217-graphite2-1.0.3.tgz _______________________________________________ Libreoffice-commits mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
