-
-
Notifications
You must be signed in to change notification settings - Fork 0
/
libreoffice-5.1.0.1-mdds1.0.patch
190 lines (184 loc) · 8.11 KB
/
libreoffice-5.1.0.1-mdds1.0.patch
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
From a7c3a2a9be83686657c06f37d521f9f6d2004ddd Mon Sep 17 00:00:00 2001
From: Markus Mohrhard <markus.mohrhard@googlemail.com>
Date: Fri, 9 Oct 2015 01:03:29 +0200
Subject: update to mdds 1.0
Change-Id: I5b6e928ab5a5f2bf84d50f3f0221c0585670d972
Reviewed-on: https://gerrit.libreoffice.org/20251
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Markus Mohrhard <markus.mohrhard@googlemail.com>
Tested-by: Markus Mohrhard <markus.mohrhard@googlemail.com>
diff --git a/configure.ac b/configure.ac
index 57a41f7..e00df959 100644
--- a/configure.ac
+++ b/configure.ac
@@ -8759,7 +8759,7 @@ AC_SUBST(SYSTEM_BOOST)
dnl ===================================================================
dnl Check for system mdds
dnl ===================================================================
-libo_CHECK_SYSTEM_MODULE([mdds], [MDDS], [mdds >= 0.12.0], ["-I${WORKDIR}/UnpackedTarball/mdds/include"])
+libo_CHECK_SYSTEM_MODULE([mdds], [MDDS], [mdds-1.0 >= 1.0.0], ["-I${WORKDIR}/UnpackedTarball/mdds/include"])
dnl ===================================================================
dnl Check for system glm
diff --git a/download.lst b/download.lst
index eabdbcf..8774343 100755
--- a/download.lst
+++ b/download.lst
@@ -93,8 +93,8 @@ export LIBXML_TARBALL := daece17e045f1c107610e137ab50c179-libxml2-2.9.3.tar.gz
export LIBXSLT_TARBALL := 9667bf6f9310b957254fdcf6596600b7-libxslt-1.1.28.tar.gz
export LPSOLVE_TARBALL := 26b3e95ddf3d9c077c480ea45874b3b8-lp_solve_5.5.tar.gz
export MARIADB_TARBALL := a233181e03d3c307668b4c722d881661-mariadb_client-2.0.0-src.tar.gz
-export MDDS_MD5SUM := ef2560ed5416652a7fe195305b14cebe
-export MDDS_TARBALL := mdds_0.12.1.tar.bz2
+export MDDS_MD5SUM := 74e0a81c5af4137285fe6a52217f71e4
+export MDDS_TARBALL := mdds_1.0.0.tar.bz2
export MSPUB_MD5SUM := ff9d0f9dd8fbc523408ea1953d5bde41
export MSPUB_TARBALL := libmspub-0.1.2.tar.bz2
export MWAW_MD5SUM := 4a8a53a9d997cf0e2bd208178797dbfb
diff --git a/external/libetonyek/ExternalProject_libetonyek.mk b/external/libetonyek/ExternalProject_libetonyek.mk
index d296a1e..c98889b 100644
--- a/external/libetonyek/ExternalProject_libetonyek.mk
+++ b/external/libetonyek/ExternalProject_libetonyek.mk
@@ -40,7 +40,7 @@ $(call gb_ExternalProject_get_state_target,libetonyek,build) :
--disable-werror \
--disable-weffc \
--without-tools \
- --with-mdds=0.x \
+ --with-mdds=1.0 \
$(if $(filter WNT,$(OS_FOR_BUILD)),MKDIR_P="$(shell cygpath -m /usr/bin/mkdir) -p") \
$(if $(verbose),--disable-silent-rules,--enable-silent-rules) \
$(if $(filter LINUX,$(OS)), \
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
deleted file mode 100644
index bed9c9c..0000000
--- a/external/mdds/0001-another-step-to-allow-fst-to-use-any-value-type.patch.1
+++ /dev/null
@@ -1,55 +0,0 @@
-From 5fc9214fb94595e1a2c0b9e0285037f5a2fa59bf Mon Sep 17 00:00:00 2001
-From: David Tardon <dtardon@redhat.com>
-Date: Mon, 29 Jun 2015 14:28:42 +0200
-Subject: [PATCH] another step to allow fst to use any value type
-
-For some reason this is not a problem on modern compilers...
----
- include/mdds/flat_segment_tree.hpp | 1 -
- include/mdds/flat_segment_tree_def.inl | 2 +-
- src/flat_segment_tree_test.cpp | 4 ++++
- 3 files changed, 5 insertions(+), 2 deletions(-)
-
-diff --git a/include/mdds/flat_segment_tree.hpp b/include/mdds/flat_segment_tree.hpp
-index b656bc3..02cf87e 100644
---- a/include/mdds/flat_segment_tree.hpp
-+++ b/include/mdds/flat_segment_tree.hpp
-@@ -32,7 +32,6 @@
- #include <sstream>
- #include <utility>
- #include <cassert>
--#include <limits>
-
- #include "mdds/node.hpp"
- #include "mdds/flat_segment_tree_itr.hpp"
-diff --git a/include/mdds/flat_segment_tree_def.inl b/include/mdds/flat_segment_tree_def.inl
-index ebfee99..5fef1c3 100644
---- a/include/mdds/flat_segment_tree_def.inl
-+++ b/include/mdds/flat_segment_tree_def.inl
-@@ -46,7 +46,7 @@ flat_segment_tree<_Key, _Value>::flat_segment_tree(key_type min_val, key_type ma
- // We don't ever use the value of the right leaf node, but we need the
- // value to be always the same, to make it easier to check for
- // equality.
-- m_right_leaf->value_leaf.value = ::std::numeric_limits<value_type>::max();
-+ m_right_leaf->value_leaf.value = init_val;
- }
-
- template<typename _Key, typename _Value>
-diff --git a/src/flat_segment_tree_test.cpp b/src/flat_segment_tree_test.cpp
-index 81858f5..f7aead7 100644
---- a/src/flat_segment_tree_test.cpp
-+++ b/src/flat_segment_tree_test.cpp
-@@ -1943,6 +1943,10 @@ void fst_test_non_numeric_value()
- db.search(1, result);
-
- assert(result == "hello world");
-+
-+ db_type db2(db);
-+
-+ assert(db == db2);
- }
-
- void fst_test_non_numeric_key()
---
-2.4.2
-
diff --git a/external/mdds/UnpackedTarball_mdds.mk b/external/mdds/UnpackedTarball_mdds.mk
index 504406b..2627257 100644
--- a/external/mdds/UnpackedTarball_mdds.mk
+++ b/external/mdds/UnpackedTarball_mdds.mk
@@ -14,9 +14,7 @@ $(eval $(call gb_UnpackedTarball_set_tarball,mdds,$(MDDS_TARBALL)))
$(eval $(call gb_UnpackedTarball_set_patchlevel,mdds,3))
$(eval $(call gb_UnpackedTarball_add_patches,mdds,\
- external/mdds/mdds_0.6.0.patch \
external/mdds/mdds-c++98.patch.0 \
- external/mdds/0001-another-step-to-allow-fst-to-use-any-value-type.patch.1 \
))
# vim: set noet sw=4 ts=4:
diff --git a/external/mdds/mdds_0.6.0.patch b/external/mdds/mdds_0.6.0.patch
deleted file mode 100644
index fba1502..0000000
--- a/external/mdds/mdds_0.6.0.patch
+++ /dev/null
@@ -1,54 +0,0 @@
---- 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)
- {
--
cgit v0.10.2