[Libreoffice-commits] core.git: configure.ac download.lst external/mdds

[Kohei Yoshida]

 configure.ac                                   |    2 -
 download.lst                                   |    4 +-
 external/mdds/0001-Fix-some-build-snuffs.patch |   38 +++++++++++++++++++++++++
 external/mdds/UnpackedTarball_mdds.mk          |    4 +-
 4 files changed, 43 insertions(+), 5 deletions(-)

New commits:
commit 6cc5d37d87406671ac76e94a43f8a57f346caaaf
Author: Kohei Yoshida <kohei.yoshida at gmail.com>
Date:   Thu Feb 11 21:51:12 2016 -0500

    Update mdds to 1.1.0.
    
    Change-Id: I89b9b2e562f5e934df25498f5587a339db23388f
    Reviewed-on: https://gerrit.libreoffice.org/22304
    Reviewed-by: Kohei Yoshida <libreoffice at kohei.us>
    Tested-by: Kohei Yoshida <libreoffice at kohei.us>

diff --git a/configure.ac b/configure.ac
index 3b780b6..07bf6fd 100644
--- a/configure.ac
+++ b/configure.ac
@@ -8779,7 +8779,7 @@ AC_SUBST(SYSTEM_BOOST)
 dnl ===================================================================
 dnl Check for system mdds
 dnl ===================================================================
-libo_CHECK_SYSTEM_MODULE([mdds], [MDDS], [mdds-1.0 >= 1.0.0], ["-I${WORKDIR}/UnpackedTarball/mdds/include"])
+libo_CHECK_SYSTEM_MODULE([mdds], [MDDS], [mdds-1.0 >= 1.1.0], ["-I${WORKDIR}/UnpackedTarball/mdds/include"])
 
 dnl ===================================================================
 dnl Check for system glm
diff --git a/download.lst b/download.lst
index 051c20e..815fba0 100644
--- 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 := 74e0a81c5af4137285fe6a52217f71e4
-export MDDS_TARBALL := mdds_1.0.0.tar.bz2
+export MDDS_MD5SUM := c300541adac09008aa4a305eacd1dca6
+export MDDS_TARBALL := mdds-1.1.0.tar.bz2
 export MDNSRESPONDER_MD5SUM := 940057ac8b513b00e8e9ca12ef796762
 export MDNSRESPONDER_TARBALL := mDNSResponder-576.30.4.tar.gz
 export MSPUB_MD5SUM := ff9d0f9dd8fbc523408ea1953d5bde41
diff --git a/external/mdds/0001-Fix-some-build-snuffs.patch b/external/mdds/0001-Fix-some-build-snuffs.patch
new file mode 100644
index 0000000..5f32a98
--- /dev/null
+++ b/external/mdds/0001-Fix-some-build-snuffs.patch
@@ -0,0 +1,38 @@
+From cbd1fb07b96f48ec9ed3c3806a18dbd8a7fd5703 Mon Sep 17 00:00:00 2001
+From: Kohei Yoshida <kohei.yoshida at gmail.com>
+Date: Thu, 11 Feb 2016 22:20:41 -0500
+Subject: [PATCH] Fix some build snuffs.
+
+---
+ include/mdds/multi_type_vector_def.inl | 1 -
+ include/mdds/sorted_string_map_def.inl | 2 +-
+ 2 files changed, 1 insertion(+), 2 deletions(-)
+
+diff --git a/include/mdds/multi_type_vector_def.inl b/include/mdds/multi_type_vector_def.inl
+index a2d2fe0..549502b 100644
+--- include/mdds/multi_type_vector_def.inl
++++ include/mdds/multi_type_vector_def.inl
+@@ -1936,7 +1936,6 @@ multi_type_vector<_CellBlockFunc, _EventFunc>::transfer_multi_blocks(
+         else
+         {
+             // Just move the whole block over.
+-            block* blk = m_blocks[block_index2];
+             dest.m_blocks[dest_block_pos] = blk;
+             if (blk->mp_data)
+             {
+diff --git a/include/mdds/sorted_string_map_def.inl b/include/mdds/sorted_string_map_def.inl
+index 1983460..1509e30 100644
+--- include/mdds/sorted_string_map_def.inl
++++ include/mdds/sorted_string_map_def.inl
+@@ -65,7 +65,7 @@ sorted_string_map<_ValueT>::sorted_string_map(const entry* entries, size_type en
+     m_entry_end(m_entries+m_entry_size)
+ {
+ #ifdef _GLIBCXX_DEBUG
+-    assert(std::is_sorted(m_entries, m_entry_end, compare<_ValueT>));
++    assert(std::is_sorted(m_entries, m_entry_end, detail::compare<_ValueT>));
+ #endif
+ }
+ 
+-- 
+1.9.1
+
diff --git a/external/mdds/UnpackedTarball_mdds.mk b/external/mdds/UnpackedTarball_mdds.mk
index 2627257..2e4af67 100644
--- a/external/mdds/UnpackedTarball_mdds.mk
+++ b/external/mdds/UnpackedTarball_mdds.mk
@@ -11,10 +11,10 @@ $(eval $(call gb_UnpackedTarball_UnpackedTarball,mdds))
 
 $(eval $(call gb_UnpackedTarball_set_tarball,mdds,$(MDDS_TARBALL)))
 
-$(eval $(call gb_UnpackedTarball_set_patchlevel,mdds,3))
+$(eval $(call gb_UnpackedTarball_set_patchlevel,mdds,0))
 
 $(eval $(call gb_UnpackedTarball_add_patches,mdds,\
-	external/mdds/mdds-c++98.patch.0 \
+	external/mdds/0001-Fix-some-build-snuffs.patch \
 ))
 
 # vim: set noet sw=4 ts=4: