diff options
| author | Kohei Yoshida <kohei.yoshida@gmail.com> | 2016-09-09 20:09:37 -0400 |
|---|---|---|
| committer | Tor Lillqvist <tml@collabora.com> | 2016-11-13 10:41:47 +0200 |
| commit | 06be0e09771a900c7fc76e5eebe60eef050c5ae1 (patch) | |
| tree | c82ce10afad3332d71b5cd5317972f4444721e48 | |
| parent | 37a0c9921ac2d43fa337b95048df0eaa29fa3d3f (diff) | |
Upgrade mdds to 1.2.2.
This version contains one critical bugfix, which will probably fix the
following two:
http://crashreport.libreoffice.org/stats/crash_details/62f488c8-1c0e-4ac5-8651-16724b440bf8
http://crashreport.libreoffice.org/stats/crash_details/298fd7a9-b0ab-46d2-816e-5aafb3b3be8e
Change-Id: I5a26cea7f9293b5ed3026996a05ab8a3a671c38b
Reviewed-on: https://gerrit.libreoffice.org/28794
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Kohei Yoshida <libreoffice@kohei.us>
Reviewed-on: https://gerrit.libreoffice.org/28851
Reviewed-by: Markus Mohrhard <markus.mohrhard@googlemail.com>
| -rw-r--r-- | download.lst | 4 | ||||
| -rw-r--r-- | external/mdds/UnpackedTarball_mdds.mk | 1 | ||||
| -rw-r--r-- | external/mdds/tdf90579.patch.0 | 23 |
3 files changed, 2 insertions, 26 deletions
diff --git a/download.lst b/download.lst index 31480f771789..7632f99531b1 100644 --- a/download.lst +++ b/download.lst @@ -97,8 +97,8 @@ export LIBXML_TARBALL := ae249165c173b1ff386ee8ad676815f5-libxml2-2.9.4.tar.gz export LIBXSLT_TARBALL := a129d3c44c022de3b9dcf6d6f288d72e-libxslt-1.1.29.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 := 9f3383fb7bae825eab69f3a6ec1d74b2 -export MDDS_TARBALL := mdds-1.2.0.tar.bz2 +export MDDS_MD5SUM := 8855cf852a6088cfdc792c6f7ceb0243 +export MDDS_TARBALL := mdds-1.2.2.tar.bz2 export MDNSRESPONDER_MD5SUM := 940057ac8b513b00e8e9ca12ef796762 export MDNSRESPONDER_TARBALL := mDNSResponder-576.30.4.tar.gz export MSPUB_MD5SUM := ff9d0f9dd8fbc523408ea1953d5bde41 diff --git a/external/mdds/UnpackedTarball_mdds.mk b/external/mdds/UnpackedTarball_mdds.mk index bd57593e7d45..c015f4c13f5a 100644 --- a/external/mdds/UnpackedTarball_mdds.mk +++ b/external/mdds/UnpackedTarball_mdds.mk @@ -14,7 +14,6 @@ $(eval $(call gb_UnpackedTarball_set_tarball,mdds,$(MDDS_TARBALL))) $(eval $(call gb_UnpackedTarball_set_patchlevel,mdds,0)) $(eval $(call gb_UnpackedTarball_add_patches,mdds,\ - external/mdds/tdf90579.patch.0 \ )) # vim: set noet sw=4 ts=4: diff --git a/external/mdds/tdf90579.patch.0 b/external/mdds/tdf90579.patch.0 deleted file mode 100644 index 5ef1bc74097d..000000000000 --- a/external/mdds/tdf90579.patch.0 +++ /dev/null @@ -1,23 +0,0 @@ -diff --git a/include/mdds/multi_type_vector_def.inl b/include/mdds/multi_type_vector_def.inl -index 0e2a15a..fe9c767 100644 ---- include/mdds/multi_type_vector_def.inl -+++ include/mdds/multi_type_vector_def.inl -@@ -2306,6 +2306,9 @@ void multi_type_vector<_CellBlockFunc, _EventFunc>::swap_single_to_multi_blocks( - { - // Source range is at the top of a block. - -+ // Shrink the current block by erasing the top part. -+ element_block_func::erase(*blk_src->mp_data, 0, len); -+ - if (src_tail_len == 0) - { - // the whole block needs to be replaced. -@@ -2314,8 +2317,6 @@ void multi_type_vector<_CellBlockFunc, _EventFunc>::swap_single_to_multi_blocks( - } - else - { -- // Shrink the current block by erasing the top part. -- element_block_func::erase(*blk_src->mp_data, 0, len); - blk_src->m_size -= len; - } - |