- proper boost fix

diff --git a/boost-1.57.0.patch b/boost-1.57.0.patch
index ef8ef952f5c933d35ea7687ecdbd1a3a6a2c1ea2..6ab3541b2fc43f85a9556a0c09f85abed59bd3f6 100644 (file)
--- a/boost-1.57.0.patch
+++ b/boost-1.57.0.patch
@@ -1,26 +1,10 @@
-From 06ccdfee76fe487a141b95848d1c866890f15d88 Mon Sep 17 00:00:00 2001
-From: Evangelos Foutras <evangelos@foutrelis.com>
-Date: Thu, 6 Nov 2014 09:19:26 +0200
-Subject: [PATCH] Add missing include to signals2/trackable.hpp
-
-boost::weak_ptr started being used in commit a0bf2d1 (Disconnect slots
-associated with signals2::trackable immediately) but the matching header
-wasn't included.
-
-https://svn.boost.org/trac/boost/ticket/10100#comment:7
----
- include/boost/signals2/trackable.hpp | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/include/boost/signals2/trackable.hpp b/include/boost/signals2/trackable.hpp
-index dba001d..64e8489 100644
---- a/include/boost/signals2/trackable.hpp
-+++ b/include/boost/signals2/trackable.hpp
-@@ -18,6 +18,7 @@
- 
- #include <boost/assert.hpp>
- #include <boost/shared_ptr.hpp>
+--- hugin-2014.0.0/src/hugin1/hugin/TextureManager.h~  2014-10-08 20:19:19.000000000 +0200
++++ hugin-2014.0.0/src/hugin1/hugin/TextureManager.h   2015-02-18 20:17:32.275040262 +0100
+@@ -42,6 +42,7 @@
+ #include <map>
+ #include <boost/version.hpp>
+ #if BOOST_VERSION>=105400
 +#include <boost/weak_ptr.hpp>
- 
- namespace boost {
-   namespace signals2 {
+ #include <boost/signals2/trackable.hpp>
+ namespace boostSignal=boost::signals2;
+ #else