[packages/hugin] - upstream fix for building with boost 1.57.0

baggins baggins at pld-linux.org
Wed Feb 18 18:23:56 CET 2015


commit 5173d7fcc8f8388da85e04d649b37c2a42634525
Author: Jan Rękorajski <baggins at pld-linux.org>
Date:   Wed Feb 18 18:23:38 2015 +0100

    - upstream fix for building with boost 1.57.0

 boost-1.57.0.patch | 26 ++++++++++++++++++++++++++
 hugin.spec         |  2 ++
 2 files changed, 28 insertions(+)
---
diff --git a/hugin.spec b/hugin.spec
index 72dd13b..46c7b01 100644
--- a/hugin.spec
+++ b/hugin.spec
@@ -10,6 +10,7 @@ Source0:	http://downloads.sourceforge.net/hugin/%{name}-%{version}.tar.bz2
 Patch0:		%{name}-pl.po-update.patch
 Patch1:		%{name}-cppflags.patch
 Patch2:		%{name}-boost.patch
+Patch3:		boost-1.57.0.patch
 URL:		http://hugin.sourceforge.net/
 BuildRequires:	OpenEXR-devel
 BuildRequires:	OpenGL-glut-devel
@@ -66,6 +67,7 @@ i ekspozycji, więc warto zainstalować pakiet enblend-enfuse.
 #%patch0 -p1
 %patch1 -p0
 %patch2 -p1
+%patch3 -p1
 
 mv -f src/translations/{cs_CZ,cs}.po
 
diff --git a/boost-1.57.0.patch b/boost-1.57.0.patch
new file mode 100644
index 0000000..ef8ef95
--- /dev/null
+++ b/boost-1.57.0.patch
@@ -0,0 +1,26 @@
+From 06ccdfee76fe487a141b95848d1c866890f15d88 Mon Sep 17 00:00:00 2001
+From: Evangelos Foutras <evangelos at 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>
++#include <boost/weak_ptr.hpp>
+ 
+ namespace boost {
+   namespace signals2 {
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/hugin.git/commitdiff/5173d7fcc8f8388da85e04d649b37c2a42634525



More information about the pld-cvs-commit mailing list