From 6bc7f4593acddec4e884d31cb2c8c2f3e069fbc2 Mon Sep 17 00:00:00 2001 From: David Tardon Date: Tue, 18 Sep 2012 07:49:53 +0200 Subject: [PATCH] new version --- .gitignore | 1 + 0001-Fixes-build-breakage-on-Debian.patch | 24 --------- 0001-fix-linking-error-with-boost-1.50.patch | 27 ---------- ...lect-the-right-overload-of-vector-in.patch | 52 ------------------- mdds.spec | 13 ++--- sources | 2 +- 6 files changed, 7 insertions(+), 112 deletions(-) delete mode 100644 0001-Fixes-build-breakage-on-Debian.patch delete mode 100644 0001-fix-linking-error-with-boost-1.50.patch delete mode 100644 0001-help-compiler-select-the-right-overload-of-vector-in.patch diff --git a/.gitignore b/.gitignore index fc84216..ecb744a 100644 --- a/.gitignore +++ b/.gitignore @@ -6,3 +6,4 @@ mdds_0.3.0.tar.bz2 /mdds_0.5.3.tar.bz2 /mdds_0.5.4.tar.bz2 /mdds_0.6.0.tar.bz2 +/mdds_0.6.1.tar.bz2 diff --git a/0001-Fixes-build-breakage-on-Debian.patch b/0001-Fixes-build-breakage-on-Debian.patch deleted file mode 100644 index fd2d582..0000000 --- a/0001-Fixes-build-breakage-on-Debian.patch +++ /dev/null @@ -1,24 +0,0 @@ -From 770ff91820f8ed95f7ecc40b72b78ae57ee5d277 Mon Sep 17 00:00:00 2001 -From: Kohei Yoshida -Date: Thu, 19 Jul 2012 15:05:47 -0400 -Subject: [PATCH] Fixes build breakage on Debian. - ---- - include/mdds/multi_type_vector_types.hpp | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/include/mdds/multi_type_vector_types.hpp b/include/mdds/multi_type_vector_types.hpp -index f27ac88..ac2b0ef 100644 ---- a/include/mdds/multi_type_vector_types.hpp -+++ b/include/mdds/multi_type_vector_types.hpp -@@ -355,6 +355,7 @@ struct managed_element_block : public copyable_element_block self_type; - - using base_type::get; -+ using base_type::set_value; - using base_type::m_array; - - managed_element_block() : base_type() {} --- -1.7.11.2 - diff --git a/0001-fix-linking-error-with-boost-1.50.patch b/0001-fix-linking-error-with-boost-1.50.patch deleted file mode 100644 index 68c4cfb..0000000 --- a/0001-fix-linking-error-with-boost-1.50.patch +++ /dev/null @@ -1,27 +0,0 @@ -From 09937e5d6b4b82efbff40da2aa50fb02f2250bb2 Mon Sep 17 00:00:00 2001 -From: David Tardon -Date: Sat, 28 Jul 2012 14:32:47 +0200 -Subject: [PATCH] fix linking error with boost 1.50 - ---- - include/mdds/mixed_type_matrix_storage.hpp | 4 ++++ - 1 file changed, 4 insertions(+) - -diff --git a/include/mdds/mixed_type_matrix_storage.hpp b/include/mdds/mixed_type_matrix_storage.hpp -index fa0bf25..bb4e354 100644 ---- a/include/mdds/mixed_type_matrix_storage.hpp -+++ b/include/mdds/mixed_type_matrix_storage.hpp -@@ -32,6 +32,10 @@ - - #include - #include -+// Boost.Pool indirectly pulls in Boost.System, causing linking error -+// with Boost 1.50, because some (deprecated) symbols from System are -+// not found. -+#define BOOST_SYSTEM_NO_DEPRECATED - #include - - namespace mdds { --- -1.7.11.2 - diff --git a/0001-help-compiler-select-the-right-overload-of-vector-in.patch b/0001-help-compiler-select-the-right-overload-of-vector-in.patch deleted file mode 100644 index 03cf1c3..0000000 --- a/0001-help-compiler-select-the-right-overload-of-vector-in.patch +++ /dev/null @@ -1,52 +0,0 @@ -From 900cbea3ec067833b4284584f6dfa5502dc36de8 Mon Sep 17 00:00:00 2001 -From: David Tardon -Date: Fri, 20 Jul 2012 10:30:38 +0200 -Subject: [PATCH] help compiler select the right overload of vector::insert - ---- - include/mdds/multi_type_vector_def.inl | 8 ++++---- - 1 file changed, 4 insertions(+), 4 deletions(-) - -diff --git a/include/mdds/multi_type_vector_def.inl b/include/mdds/multi_type_vector_def.inl -index 252a260..fb72070 100644 ---- a/include/mdds/multi_type_vector_def.inl -+++ b/include/mdds/multi_type_vector_def.inl -@@ -1148,7 +1148,7 @@ void multi_type_vector<_CellBlockFunc>::insert_empty_impl(size_type row, size_ty - - // Insert two new block below the current; one for the empty block being - // inserted, and one for the lower part of the current non-empty block. -- m_blocks.insert(m_blocks.begin()+block_index+1, 2, NULL); -+ m_blocks.insert(m_blocks.begin()+block_index+1, 2u, NULL); - - m_blocks[block_index+1] = new block(length); - m_blocks[block_index+2] = new block(size_blk_next); -@@ -1302,7 +1302,7 @@ void multi_type_vector<_CellBlockFunc>::insert_cells_to_middle( - // Insert two new blocks. - size_type n1 = row - start_row; - size_type n2 = blk->m_size - n1; -- m_blocks.insert(m_blocks.begin()+block_index+1, 2, NULL); -+ m_blocks.insert(m_blocks.begin()+block_index+1, 2u, NULL); - blk->m_size = n1; - - m_blocks[block_index+1] = new block(length); -@@ -1467,7 +1467,7 @@ void multi_type_vector<_CellBlockFunc>::set_cells_to_single_block( - assert(start_row_in_block < start_row && end_row < end_row_in_block); - - // Insert two new blocks below the current one. -- m_blocks.insert(m_blocks.begin()+block_index+1, 2, NULL); -+ m_blocks.insert(m_blocks.begin()+block_index+1, 2u, NULL); - - // first new block is for the data array being inserted. - size_type new_size = end_row - start_row + 1; -@@ -1985,7 +1985,7 @@ void multi_type_vector<_CellBlockFunc>::set_empty_in_single_block( - - // First, insert two new blocks at position past the current block. - size_type lower_block_size = end_row_in_block - end_row; -- m_blocks.insert(m_blocks.begin()+block_index+1, 2, NULL); -+ m_blocks.insert(m_blocks.begin()+block_index+1, 2u, NULL); - m_blocks[block_index+1] = new block(empty_block_size); // empty block. - m_blocks[block_index+2] = new block(lower_block_size); - --- -1.7.11.2 - diff --git a/mdds.spec b/mdds.spec index 2794545..b87842a 100644 --- a/mdds.spec +++ b/mdds.spec @@ -1,15 +1,12 @@ Name: mdds -Version: 0.6.0 -Release: 2%{?dist} +Version: 0.6.1 +Release: 1%{?dist} Summary: A collection of multi-dimensional data structures and indexing algorithms Group: Development/Libraries License: MIT URL: http://code.google.com/p/multidimalgorithm/ Source0: http://multidimalgorithm.googlecode.com/files/%{name}_%{version}.tar.bz2 -Patch0: 0001-Fixes-build-breakage-on-Debian.patch -Patch1: 0001-help-compiler-select-the-right-overload-of-vector-in.patch -Patch2: 0001-fix-linking-error-with-boost-1.50.patch BuildRequires: boost-devel @@ -39,9 +36,6 @@ Headers for %{name}. %prep %setup -q -n %{name}_%{version} -%patch0 -p1 -%patch1 -p1 -%patch2 -p1 # this is only used in tests sed -i -e '/^CPPFLAGS/s/-Wall.*-std/%{optflags} -std/' Makefile.in @@ -66,6 +60,9 @@ make check %{?_smp_mflags} %changelog +* Tue Sep 18 2012 David Tardon - 0.6.1-1 +- new version + * Sat Jul 28 2012 David Tardon - 0.6.0-2 - rebuilt for boost 1.50 diff --git a/sources b/sources index 3045d7c..0cf7d0d 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -3e89a35f253a4f1c7de68c57d851ef38 mdds_0.6.0.tar.bz2 +9f9e15966b5624834157fe3d748312bc mdds_0.6.1.tar.bz2