1 From a7c3a2a9be83686657c06f37d521f9f6d2004ddd Mon Sep 17 00:00:00 2001
2 From: Markus Mohrhard <markus.mohrhard@googlemail.com>
3 Date: Fri, 9 Oct 2015 01:03:29 +0200
4 Subject: update to mdds 1.0
6 Change-Id: I5b6e928ab5a5f2bf84d50f3f0221c0585670d972
7 Reviewed-on: https://gerrit.libreoffice.org/20251
8 Tested-by: Jenkins <ci@libreoffice.org>
9 Reviewed-by: Markus Mohrhard <markus.mohrhard@googlemail.com>
10 Tested-by: Markus Mohrhard <markus.mohrhard@googlemail.com>
12 diff --git a/configure.ac b/configure.ac
13 index 57a41f7..e00df959 100644
16 @@ -8759,7 +8759,7 @@ AC_SUBST(SYSTEM_BOOST)
17 dnl ===================================================================
18 dnl Check for system mdds
19 dnl ===================================================================
20 -libo_CHECK_SYSTEM_MODULE([mdds], [MDDS], [mdds >= 0.12.0], ["-I${WORKDIR}/UnpackedTarball/mdds/include"])
21 +libo_CHECK_SYSTEM_MODULE([mdds], [MDDS], [mdds-1.0 >= 1.0.0], ["-I${WORKDIR}/UnpackedTarball/mdds/include"])
23 dnl ===================================================================
24 dnl Check for system glm
25 diff --git a/download.lst b/download.lst
26 index eabdbcf..8774343 100755
29 @@ -93,8 +93,8 @@ export LIBXML_TARBALL := daece17e045f1c107610e137ab50c179-libxml2-2.9.3.tar.gz
30 export LIBXSLT_TARBALL := 9667bf6f9310b957254fdcf6596600b7-libxslt-1.1.28.tar.gz
31 export LPSOLVE_TARBALL := 26b3e95ddf3d9c077c480ea45874b3b8-lp_solve_5.5.tar.gz
32 export MARIADB_TARBALL := a233181e03d3c307668b4c722d881661-mariadb_client-2.0.0-src.tar.gz
33 -export MDDS_MD5SUM := ef2560ed5416652a7fe195305b14cebe
34 -export MDDS_TARBALL := mdds_0.12.1.tar.bz2
35 +export MDDS_MD5SUM := 74e0a81c5af4137285fe6a52217f71e4
36 +export MDDS_TARBALL := mdds_1.0.0.tar.bz2
37 export MSPUB_MD5SUM := ff9d0f9dd8fbc523408ea1953d5bde41
38 export MSPUB_TARBALL := libmspub-0.1.2.tar.bz2
39 export MWAW_MD5SUM := 4a8a53a9d997cf0e2bd208178797dbfb
40 diff --git a/external/libetonyek/ExternalProject_libetonyek.mk b/external/libetonyek/ExternalProject_libetonyek.mk
41 index d296a1e..c98889b 100644
42 --- a/external/libetonyek/ExternalProject_libetonyek.mk
43 +++ b/external/libetonyek/ExternalProject_libetonyek.mk
44 @@ -40,7 +40,7 @@ $(call gb_ExternalProject_get_state_target,libetonyek,build) :
50 $(if $(filter WNT,$(OS_FOR_BUILD)),MKDIR_P="$(shell cygpath -m /usr/bin/mkdir) -p") \
51 $(if $(verbose),--disable-silent-rules,--enable-silent-rules) \
52 $(if $(filter LINUX,$(OS)), \
53 diff --git a/external/mdds/0001-another-step-to-allow-fst-to-use-any-value-type.patch.1 b/external/mdds/0001-another-step-to-allow-fst-to-use-any-value-type.patch.1
54 deleted file mode 100644
55 index bed9c9c..0000000
56 --- a/external/mdds/0001-another-step-to-allow-fst-to-use-any-value-type.patch.1
59 -From 5fc9214fb94595e1a2c0b9e0285037f5a2fa59bf Mon Sep 17 00:00:00 2001
60 -From: David Tardon <dtardon@redhat.com>
61 -Date: Mon, 29 Jun 2015 14:28:42 +0200
62 -Subject: [PATCH] another step to allow fst to use any value type
64 -For some reason this is not a problem on modern compilers...
66 - include/mdds/flat_segment_tree.hpp | 1 -
67 - include/mdds/flat_segment_tree_def.inl | 2 +-
68 - src/flat_segment_tree_test.cpp | 4 ++++
69 - 3 files changed, 5 insertions(+), 2 deletions(-)
71 -diff --git a/include/mdds/flat_segment_tree.hpp b/include/mdds/flat_segment_tree.hpp
72 -index b656bc3..02cf87e 100644
73 ---- a/include/mdds/flat_segment_tree.hpp
74 -+++ b/include/mdds/flat_segment_tree.hpp
81 - #include "mdds/node.hpp"
82 - #include "mdds/flat_segment_tree_itr.hpp"
83 -diff --git a/include/mdds/flat_segment_tree_def.inl b/include/mdds/flat_segment_tree_def.inl
84 -index ebfee99..5fef1c3 100644
85 ---- a/include/mdds/flat_segment_tree_def.inl
86 -+++ b/include/mdds/flat_segment_tree_def.inl
87 -@@ -46,7 +46,7 @@ flat_segment_tree<_Key, _Value>::flat_segment_tree(key_type min_val, key_type ma
88 - // We don't ever use the value of the right leaf node, but we need the
89 - // value to be always the same, to make it easier to check for
91 -- m_right_leaf->value_leaf.value = ::std::numeric_limits<value_type>::max();
92 -+ m_right_leaf->value_leaf.value = init_val;
95 - template<typename _Key, typename _Value>
96 -diff --git a/src/flat_segment_tree_test.cpp b/src/flat_segment_tree_test.cpp
97 -index 81858f5..f7aead7 100644
98 ---- a/src/flat_segment_tree_test.cpp
99 -+++ b/src/flat_segment_tree_test.cpp
100 -@@ -1943,6 +1943,10 @@ void fst_test_non_numeric_value()
101 - db.search(1, result);
103 - assert(result == "hello world");
107 -+ assert(db == db2);
110 - void fst_test_non_numeric_key()
114 diff --git a/external/mdds/UnpackedTarball_mdds.mk b/external/mdds/UnpackedTarball_mdds.mk
115 index 504406b..2627257 100644
116 --- a/external/mdds/UnpackedTarball_mdds.mk
117 +++ b/external/mdds/UnpackedTarball_mdds.mk
118 @@ -14,9 +14,7 @@ $(eval $(call gb_UnpackedTarball_set_tarball,mdds,$(MDDS_TARBALL)))
119 $(eval $(call gb_UnpackedTarball_set_patchlevel,mdds,3))
121 $(eval $(call gb_UnpackedTarball_add_patches,mdds,\
122 - external/mdds/mdds_0.6.0.patch \
123 external/mdds/mdds-c++98.patch.0 \
124 - external/mdds/0001-another-step-to-allow-fst-to-use-any-value-type.patch.1 \
127 # vim: set noet sw=4 ts=4:
128 diff --git a/external/mdds/mdds_0.6.0.patch b/external/mdds/mdds_0.6.0.patch
129 deleted file mode 100644
130 index fba1502..0000000
131 --- a/external/mdds/mdds_0.6.0.patch
134 ---- misc/mdds_0.6.0/include/mdds/mixed_type_matrix_def.inl 2011-07-13 13:26:27.000000000 -0600
135 -+++ misc/build/mdds_0.6.0/include/mdds/mixed_type_matrix_def.inl 2011-07-20 02:02:21.164198900 -0600
137 - // assignment to self.
140 -- size_t row_count = ::std::min(mp_storage->rows(), r.mp_storage->rows());
141 -- size_t col_count = ::std::min(mp_storage->cols(), r.mp_storage->cols());
142 -+ size_t row_count = (::std::min)(mp_storage->rows(), r.mp_storage->rows());
143 -+ size_t col_count = (::std::min)(mp_storage->cols(), r.mp_storage->cols());
144 - for (size_t i = 0; i < row_count; ++i)
145 - for (size_t j = 0; j < col_count; ++j)
146 - mp_storage->get_element(i, j) = r.mp_storage->get_element(i, j);
147 ---- misc/mdds_0.6.0/include/mdds/mixed_type_matrix_storage_filled_linear.inl 2011-07-13 13:26:27.000000000 -0600
148 -+++ misc/build/mdds_0.6.0/include/mdds/mixed_type_matrix_storage_filled_linear.inl 2011-07-20 02:02:21.179798900 -0600
152 - array_type new_array(new_size, &m_init_elem);
153 -- size_t min_rows = ::std::min(row, m_rows);
154 -- size_t min_cols = ::std::min(col, m_cols);
155 -+ size_t min_rows = (::std::min)(row, m_rows);
156 -+ size_t min_cols = (::std::min)(col, m_cols);
157 - for (size_t i = 0; i < min_rows; ++i)
159 - for (size_t j = 0; j < min_cols; ++j)
163 - array_type new_array(new_size, element(0.0));
164 -- size_t min_rows = ::std::min(row, m_rows);
165 -- size_t min_cols = ::std::min(col, m_cols);
166 -+ size_t min_rows = (::std::min)(row, m_rows);
167 -+ size_t min_cols = (::std::min)(col, m_cols);
168 - for (size_t i = 0; i < min_rows; ++i)
170 - for (size_t j = 0; j < min_cols; ++j)
171 ---- misc/mdds_0.6.0/include/mdds/point_quad_tree.hpp 2011-07-13 13:26:27.000000000 -0600
172 -+++ misc/build/mdds_0.6.0/include/mdds/point_quad_tree.hpp 2011-07-20 02:04:36.088835900 -0600
173 -@@ -623,10 +623,10 @@
174 - template<typename _Key, typename _Data>
175 - void point_quad_tree<_Key,_Data>::insert(key_type x, key_type y, data_type data)
177 -- m_xrange.first = ::std::min(m_xrange.first, x);
178 -- m_xrange.second = ::std::max(m_xrange.second, x);
179 -- m_yrange.first = ::std::min(m_yrange.first, y);
180 -- m_yrange.second = ::std::max(m_yrange.second, y);
181 -+ m_xrange.first = (::std::min)(m_xrange.first, x);
182 -+ m_xrange.second = (::std::max)(m_xrange.second, x);
183 -+ m_yrange.first = (::std::min)(m_yrange.first, y);
184 -+ m_yrange.second = (::std::max)(m_yrange.second, y);