[Libreoffice-commits] core.git: Branch 'feature/formula-core-rework' - 2 commits - configure.ac download.lst mdds/UnpackedTarball_mdds.mk mdds/wundef.patch

[Kohei Yoshida]

 configure.ac                 |   12 ++----------
 download.lst                 |    2 +-
 mdds/UnpackedTarball_mdds.mk |    1 -
 mdds/wundef.patch            |   42 ------------------------------------------
 4 files changed, 3 insertions(+), 54 deletions(-)

New commits:
commit 81007d537be0c8b10ffe31fa273db42ddb00b2fc
Author: Kohei Yoshida <kohei.yoshida at gmail.com>
Date:   Thu May 9 11:52:55 2013 -0400

    Remove a patch that's no longer needed.
    
    Change-Id: Ie309848f80606432752b60fbdf34e7597308d800

diff --git a/mdds/UnpackedTarball_mdds.mk b/mdds/UnpackedTarball_mdds.mk
index 9764878..b33bc1b 100644
--- a/mdds/UnpackedTarball_mdds.mk
+++ b/mdds/UnpackedTarball_mdds.mk
@@ -17,7 +17,6 @@ $(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/wundef.patch \
 ))
 
 # vim: set noet sw=4 ts=4:
diff --git a/mdds/wundef.patch b/mdds/wundef.patch
deleted file mode 100644
index 628f3dd..0000000
--- a/mdds/wundef.patch
+++ /dev/null
@@ -1,42 +0,0 @@
---- misc/mdds_0.6.0/include/mdds/segment_tree.hpp
-+++ misc/build/mdds_0.6.0/include/mdds/segment_tree.hpp
-@@ -285,7 +285,7 @@ public:
-         }
-     };
- 
--#if UNIT_TEST
-+#ifdef UNIT_TEST
-     struct node_printer : public ::std::unary_function<const node*, void>
-     {
-         void operator() (const node* p) const
---- misc/mdds_0.6.0/include/mdds/multi_type_vector_def.inl
-+++ misc/build/mdds_0.6.0/include/mdds/multi_type_vector_def.inl
-@@ -29,7 +29,7 @@
- 
- #include <stdexcept>
- 
--#if UNIT_TEST
-+#ifdef UNIT_TEST
- #include <iostream>
- using std::cout;
- using std::endl;
---- misc/mdds_0.6.0/include/mdds/mixed_type_matrix_flag_storage.hpp
-+++ misc/build/mdds_0.6.0/include/mdds/mixed_type_matrix_flag_storage.hpp
-@@ -25,7 +25,7 @@
-  *
-  ************************************************************************/
- 
--#if UNIT_TEST
-+#ifdef UNIT_TEST
- #include <iostream>
- #endif
- 
-@@ -74,7 +74,7 @@ public:
-             // Flag is stored at this position.  Remove it.
-             m_flags.erase(itr);
-     }
--#if UNIT_TEST
-+#ifdef UNIT_TEST
-     void dump() const
-     {
-         using namespace std;
commit fd6fc5d9485017d4a6878b7258fba9f9a014af6b
Author: Kohei Yoshida <kohei.yoshida at gmail.com>
Date:   Thu May 9 11:32:28 2013 -0400

    Update mdds to 0.8.0.
    
    Change-Id: I5dcf3b14993ac4d699e884c4981af668277a41df

diff --git a/configure.ac b/configure.ac
index cd03950..d6b7285 100644
--- a/configure.ac
+++ b/configure.ac
@@ -8036,6 +8036,8 @@ if test "$with_system_mdds" = "yes"; then
     AC_MSG_RESULT([external])
     SYSTEM_MDDS=YES
 
+    PKG_CHECK_MODULES(MDDS, mdds >= 0.8.0)
+
     dnl ===================================================================
     dnl Determine which hash container mdds shall use
     dnl ===================================================================
@@ -8047,16 +8049,6 @@ if test "$with_system_mdds" = "yes"; then
         MDDS_CPPFLAGS="-DMDDS_HASH_CONTAINER_BOOST"
         AC_MSG_RESULT([boost::unordered_map])
     fi
-
-    AC_LANG_PUSH([C++])
-    save_CPPFLAGS="$CPPFLAGS"
-    CPPFLAGS="$CPPFLAGS $MDDS_CPPFLAGS"
-    AC_CHECK_HEADER(mdds/multi_type_vector.hpp, [],
-        [AC_MSG_ERROR(mdds/multi_type_vector.hpp not found. Install mdds >= 0.7.0)], [])
-    AC_CHECK_TYPE(mdds::multi_type_vector<int>::iterator, [],
-        [AC_MSG_ERROR(mdds/multi_type_matrix.hpp does not define multi_type_vector::iterator. Install mdds >= 0.7.0)], [#include <mdds/multi_type_vector.hpp>])
-    CPPFLAGS="$save_CPPFLAGS"
-    AC_LANG_POP([C++])
 else
     AC_MSG_RESULT([internal])
     BUILD_TYPE="$BUILD_TYPE MDDS"
diff --git a/download.lst b/download.lst
index bb1b2d6..d464b5e 100644
--- a/download.lst
+++ b/download.lst
@@ -62,7 +62,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 := 096fbb818177a7575511c1fd9d4bf7dd-mdds_0.7.1.tar.bz2
+export MDDS_TARBALL := b0bba8c768f3d92608a07149039510e5-mdds_0.8.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