configure.ac | 2 download.lst | 2 mdds/0001-Avoid-crash-when-_GLIBCXX_DEBUG-is-defined.patch | 31 ------------- mdds/0001-Workaround-for-an-old-gcc-bug.patch | 27 +++++++++++ mdds/0001-Workaround-for-gcc-bug.patch | 27 ----------- mdds/UnpackedTarball_mdds.mk | 4 - mdds/mdds_0.7.0_unreachable_warning.patch.1 | 13 ----- 7 files changed, 30 insertions(+), 76 deletions(-)
New commits: commit 37db2f5346841ee58df45f83826c51f1991ee568 Author: Kohei Yoshida <[email protected]> Date: Sat Jun 22 21:32:07 2013 -0400 Adjusted the patch against mdds 0.9.0. Change-Id: Ia68f49996d4d50142c04d35ef2babb321afc4b3f diff --git a/mdds/0001-Workaround-for-an-old-gcc-bug.patch b/mdds/0001-Workaround-for-an-old-gcc-bug.patch new file mode 100644 index 0000000..8529fbf --- /dev/null +++ b/mdds/0001-Workaround-for-an-old-gcc-bug.patch @@ -0,0 +1,27 @@ +From 3e3a5c483217fe05b5bd556bf1b2c6f3ec297cb1 Mon Sep 17 00:00:00 2001 +From: Kohei Yoshida <[email protected]> +Date: Sat, 22 Jun 2013 21:30:13 -0400 +Subject: [PATCH] Workaround for an old gcc bug. + +c.f. http://gcc.gnu.org/bugzilla/show_bug.cgi?id=44963 +--- + include/mdds/multi_type_vector_types.hpp | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git a/include/mdds/multi_type_vector_types.hpp b/include/mdds/multi_type_vector_types.hpp +index c4b2772..44af655 100644 +--- a/include/mdds/multi_type_vector_types.hpp ++++ b/c/d/include/mdds/multi_type_vector_types.hpp +@@ -278,7 +278,8 @@ public: + #ifndef MDDS_MULTI_TYPE_VECTOR_USE_DEQUE + d.reserve(d.size() + len); + #endif +- std::copy(its.first, its.second, std::back_inserter(d)); ++ for (; its.first != its.second; ++its.first) ++ d.push_back(*its.first); + } + + static void assign_values_from_block( +-- +1.8.1.4 + diff --git a/mdds/0001-Workaround-for-gcc-bug.patch b/mdds/0001-Workaround-for-gcc-bug.patch deleted file mode 100644 index ef6572c..0000000 --- a/mdds/0001-Workaround-for-gcc-bug.patch +++ /dev/null @@ -1,27 +0,0 @@ -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.0/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/UnpackedTarball_mdds.mk b/mdds/UnpackedTarball_mdds.mk index c2a61ce..69fbf18 100644 --- a/mdds/UnpackedTarball_mdds.mk +++ b/mdds/UnpackedTarball_mdds.mk @@ -15,7 +15,7 @@ $(eval $(call gb_UnpackedTarball_set_patchlevel,mdds,3)) $(eval $(call gb_UnpackedTarball_add_patches,mdds,\ mdds/mdds_0.6.0.patch \ - mdds/0001-Workaround-for-gcc-bug.patch \ + mdds/0001-Workaround-for-an-old-gcc-bug.patch \ )) # vim: set noet sw=4 ts=4: commit fbecf12259b7c4237b83144d87ce19305a946d29 Author: Kohei Yoshida <[email protected]> Date: Sat Jun 22 21:26:00 2013 -0400 These patches are in the upstream. Change-Id: Ie5dc6b93fbcd65d7763fb9232a984236fb7bd745 diff --git a/mdds/0001-Avoid-crash-when-_GLIBCXX_DEBUG-is-defined.patch b/mdds/0001-Avoid-crash-when-_GLIBCXX_DEBUG-is-defined.patch deleted file mode 100644 index acddb8b..0000000 --- a/mdds/0001-Avoid-crash-when-_GLIBCXX_DEBUG-is-defined.patch +++ /dev/null @@ -1,31 +0,0 @@ -From e77d3ba18a2fd53488048b78264be011db5423f6 Mon Sep 17 00:00:00 2001 -From: Kohei Yoshida <[email protected]> -Date: Tue, 21 May 2013 15:38:51 -0400 -Subject: [PATCH] Avoid crash when _GLIBCXX_DEBUG is defined. - -I'm not sure why gcc's STL debug complains when swapping two iterators -when one of them is a singular, but doesn't when I assign one to the -other via assignment. But whichever works.... ---- - include/mdds/multi_type_vector_itr.hpp | 5 +++-- - 1 file changed, 3 insertions(+), 2 deletions(-) - -diff --git a/include/mdds/multi_type_vector_itr.hpp b/include/mdds/multi_type_vector_itr.hpp -index a7954d2..7923a22 100644 ---- a/b/include/mdds/multi_type_vector_itr.hpp -+++ u/r/screwed/include/mdds/multi_type_vector_itr.hpp -@@ -216,8 +216,9 @@ public: - - iterator_common_base& operator= (const iterator_common_base& other) - { -- iterator_common_base assigned(other); -- swap(assigned); -+ m_cur_node = other.m_cur_node; -+ m_pos = other.m_pos; -+ m_end = other.m_end; - return *this; - } - --- -1.8.0 - diff --git a/mdds/UnpackedTarball_mdds.mk b/mdds/UnpackedTarball_mdds.mk index 1891f29..c2a61ce 100644 --- a/mdds/UnpackedTarball_mdds.mk +++ b/mdds/UnpackedTarball_mdds.mk @@ -16,8 +16,6 @@ $(eval $(call gb_UnpackedTarball_set_patchlevel,mdds,3)) $(eval $(call gb_UnpackedTarball_add_patches,mdds,\ mdds/mdds_0.6.0.patch \ mdds/0001-Workaround-for-gcc-bug.patch \ - mdds/mdds_0.7.0_unreachable_warning.patch.1 \ - mdds/0001-Avoid-crash-when-_GLIBCXX_DEBUG-is-defined.patch \ )) # vim: set noet sw=4 ts=4: diff --git a/mdds/mdds_0.7.0_unreachable_warning.patch.1 b/mdds/mdds_0.7.0_unreachable_warning.patch.1 deleted file mode 100644 index 35819ae..0000000 --- a/mdds/mdds_0.7.0_unreachable_warning.patch.1 +++ /dev/null @@ -1,13 +0,0 @@ -diff -ru mdds.old/include/mdds/multi_type_vector_def.inl mdds/include/mdds/multi_type_vector_def.inl ---- mdds.old/include/mdds/multi_type_vector_def.inl 2013-03-12 21:18:16.340506918 +0100 -+++ mdds/include/mdds/multi_type_vector_def.inl 2013-03-14 17:56:07.275475086 +0100 -@@ -652,7 +652,9 @@ - } - } - -+#ifndef _MSC_VER // MSVC is too smart and warns about unreachable code - assert(!"this code path should never be reached!"); -+#endif - } - - // This empty block is right below a non-empty block. commit b86fc6678114cebe1510c6ddfe53f1c8f82d231e Author: Kohei Yoshida <[email protected]> Date: Sat Jun 22 21:20:36 2013 -0400 Update internal mdds to 0.9.0. Change-Id: I2f299dd7244e7418959f82f94a56d8cc1749aaba diff --git a/configure.ac b/configure.ac index bb603a9..f024be9 100644 --- a/configure.ac +++ b/configure.ac @@ -8046,7 +8046,7 @@ AC_SUBST(SYSTEM_BOOST) dnl =================================================================== dnl Check for system mdds dnl =================================================================== -libo_CHECK_SYSTEM_MODULE([mdds], [MDDS], [mdds >= 0.8.1]) +libo_CHECK_SYSTEM_MODULE([mdds], [MDDS], [mdds >= 0.9.0]) dnl =================================================================== dnl Determine which hash container mdds shall use diff --git a/download.lst b/download.lst index 38466ab..b85b99b 100644 --- a/download.lst +++ b/download.lst @@ -63,7 +63,7 @@ export LIBXML_TARBALL := 7740a8ec23878a2f50120e1faa2730f2-libxml2-2.7.6.tar.gz export LIBXSLT_TARBALL := e61d0364a30146aaa3001296f853b2b9-libxslt-1.1.26.tar.gz export LPSOLVE_TARBALL := 26b3e95ddf3d9c077c480ea45874b3b8-lp_solve_5.5.tar.gz export MARIADB_TARBALL := 05f84c95b610c21c5fd510d10debcabf-mariadb-native-client-1.0.0.tar.bz2 -export MDDS_TARBALL := 08c85a6d6d793daee14e10e22eefdc4b-mdds_0.8.1.tar.bz2 +export MDDS_TARBALL := 782735c43c742a27ebe19fb1871fed8f-mdds_0.9.0.tar.bz2 export MYSQLCPPCONN_TARBALL := 0981bda6548a8c8233ffce2b6e4b2a23-mysql-connector-c++-1.1.0.tar.gz export MYTHES_TARBALL := 46e92b68e31e858512b680b3b61dc4c1-mythes-1.2.3.tar.gz export NEON_TARBALL := ff369e69ef0f0143beb5626164e87ae2-neon-0.29.5.tar.gz _______________________________________________ Libreoffice-commits mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
