diff --git a/adobe-source-libraries.spec b/adobe-source-libraries.spec index bb47e80..182e254 100644 --- a/adobe-source-libraries.spec +++ b/adobe-source-libraries.spec @@ -20,7 +20,7 @@ Patch1: asl-fedora-build-options.patch Patch2: asl-no-concept-check1043.patch # https://svn.boost.org/trac/boost/ticket/6940 Patch3: asl-time-utc.patch -Patch4: asl-uninitialized-move.patch +Patch4: asl-boost-1.50.patch BuildRequires: boost-build BuildRequires: boost-devel @@ -139,7 +139,7 @@ ln -sf $sofile ${sofile%%.*.*.*} %changelog * Thu Aug 3 2012 Alec Leamas 1.0.43-12 - Handling boost bug 6940 -- Trying to fix build error. +- Updating to boost 1.50. * Thu Apr 5 2012 Alec Leamas 1.0.43-11 - Fixing hard-coded version in .pc file diff --git a/asl-boost-1.50.patch b/asl-boost-1.50.patch new file mode 100644 index 0000000..dd4eac4 --- /dev/null +++ b/asl-boost-1.50.patch @@ -0,0 +1,81 @@ +diff --git a/adobe/move.hpp b/adobe/move.hpp +index 350000d..5fe6db5 100644 +--- a/adobe/move.hpp ++++ b/adobe/move.hpp +@@ -441,7 +441,7 @@ with move semantics, for movable types, otherwise with copy semantics. + template // O models BidirectionalIterator + inline O move_backward(I& in, O out) +-{ return move_backward(boost::begin(in), boost::end(in), out); } ++{ return adobe::move_backward(boost::begin(in), boost::end(in), out); } + + /*************************************************************************************************/ + +diff --git a/adobe/once.hpp b/adobe/once.hpp +index 5f005a4..e349b92 100644 +--- a/adobe/once.hpp ++++ b/adobe/once.hpp +@@ -11,12 +11,12 @@ + + /*************************************************************************************************/ + +-#include +- + #if defined(BOOST_HAS_THREADS) + #include + #endif + ++#include ++ + /*************************************************************************************************/ + + namespace adobe { +diff --git a/adobe/vector.hpp b/adobe/vector.hpp +index 926cfa9..8968b59 100644 +--- a/adobe/vector.hpp ++++ b/adobe/vector.hpp +@@ -319,7 +319,7 @@ void vector::append_move(I f, I l, std::forward_iterator_tag) + size_type n(std::distance(f, l)); + + if (remaining() < n) reserve((adobe::max)(size() + n, 2 * size())); +- set_finish(uninitialized_move(f, l, end())); ++ set_finish(adobe::uninitialized_move(f, l, end())); + } + + template +@@ -354,7 +354,7 @@ typename vector::iterator vector::insert(iterator p, I f, I l, std:: + + if (n < after) { + append_move(last - n, last); +- move_backward(p, last - n, last); ++ adobe::move_backward(p, last - n, last); + std::copy(f, l, p); + } else { + I m = f; +@@ -387,7 +387,7 @@ typename vector::iterator vector::insert_move(iterator p, I f, I l) + + if (n < after) { + append_move(last - n, last); +- move_backward(p, last - n, last); ++ adobe::move_backward(p, last - n, last); + adobe::move(f, l, p); + } else { + I m = f; +@@ -406,7 +406,7 @@ void vector::reserve(size_type n) + if (capacity() < n) { + vector tmp; + tmp.header_m = allocate(get_allocator(), n); +- tmp.header_m->finish() = uninitialized_move(begin(), end(), tmp.end()); ++ tmp.header_m->finish() = adobe::uninitialized_move(begin(), end(), tmp.end()); + swap(tmp); + } + } +@@ -430,7 +430,7 @@ typename vector::iterator vector::insert(iterator p, size_type n, co + + if (n < after) { + append_move(last - n, last); +- move_backward(p, last - n, last); ++ adobe::move_backward(p, last - n, last); + std::fill_n(p, n, x); + } else { + std::uninitialized_fill_n(last, n - after, x); diff --git a/asl-uninitialized-move.patch b/asl-uninitialized-move.patch deleted file mode 100644 index dd4eac4..0000000 --- a/asl-uninitialized-move.patch +++ /dev/null @@ -1,81 +0,0 @@ -diff --git a/adobe/move.hpp b/adobe/move.hpp -index 350000d..5fe6db5 100644 ---- a/adobe/move.hpp -+++ b/adobe/move.hpp -@@ -441,7 +441,7 @@ with move semantics, for movable types, otherwise with copy semantics. - template // O models BidirectionalIterator - inline O move_backward(I& in, O out) --{ return move_backward(boost::begin(in), boost::end(in), out); } -+{ return adobe::move_backward(boost::begin(in), boost::end(in), out); } - - /*************************************************************************************************/ - -diff --git a/adobe/once.hpp b/adobe/once.hpp -index 5f005a4..e349b92 100644 ---- a/adobe/once.hpp -+++ b/adobe/once.hpp -@@ -11,12 +11,12 @@ - - /*************************************************************************************************/ - --#include -- - #if defined(BOOST_HAS_THREADS) - #include - #endif - -+#include -+ - /*************************************************************************************************/ - - namespace adobe { -diff --git a/adobe/vector.hpp b/adobe/vector.hpp -index 926cfa9..8968b59 100644 ---- a/adobe/vector.hpp -+++ b/adobe/vector.hpp -@@ -319,7 +319,7 @@ void vector::append_move(I f, I l, std::forward_iterator_tag) - size_type n(std::distance(f, l)); - - if (remaining() < n) reserve((adobe::max)(size() + n, 2 * size())); -- set_finish(uninitialized_move(f, l, end())); -+ set_finish(adobe::uninitialized_move(f, l, end())); - } - - template -@@ -354,7 +354,7 @@ typename vector::iterator vector::insert(iterator p, I f, I l, std:: - - if (n < after) { - append_move(last - n, last); -- move_backward(p, last - n, last); -+ adobe::move_backward(p, last - n, last); - std::copy(f, l, p); - } else { - I m = f; -@@ -387,7 +387,7 @@ typename vector::iterator vector::insert_move(iterator p, I f, I l) - - if (n < after) { - append_move(last - n, last); -- move_backward(p, last - n, last); -+ adobe::move_backward(p, last - n, last); - adobe::move(f, l, p); - } else { - I m = f; -@@ -406,7 +406,7 @@ void vector::reserve(size_type n) - if (capacity() < n) { - vector tmp; - tmp.header_m = allocate(get_allocator(), n); -- tmp.header_m->finish() = uninitialized_move(begin(), end(), tmp.end()); -+ tmp.header_m->finish() = adobe::uninitialized_move(begin(), end(), tmp.end()); - swap(tmp); - } - } -@@ -430,7 +430,7 @@ typename vector::iterator vector::insert(iterator p, size_type n, co - - if (n < after) { - append_move(last - n, last); -- move_backward(p, last - n, last); -+ adobe::move_backward(p, last - n, last); - std::fill_n(p, n, x); - } else { - std::uninitialized_fill_n(last, n - after, x);