[arch-commits] Commit in boost/trunk (2 files)

[Evangelos Foutras]

    Date: Thursday, November 6, 2014 @ 09:00:07
  Author: foutrelis
Revision: 225659

upgpkg: boost 1.57.0-2

Add missing include to signals2/trackable.hpp.

Added:
  boost/trunk/0001-Add-missing-include-to-signals2-trackable.hpp.patch
Modified:
  boost/trunk/PKGBUILD

----------------------------------------------------------+
 0001-Add-missing-include-to-signals2-trackable.hpp.patch |   29 +++++++++++++
 PKGBUILD                                                 |   15 +++++-
 2 files changed, 41 insertions(+), 3 deletions(-)

Added: 0001-Add-missing-include-to-signals2-trackable.hpp.patch
===================================================================
--- 0001-Add-missing-include-to-signals2-trackable.hpp.patch	                        (rev 0)
+++ 0001-Add-missing-include-to-signals2-trackable.hpp.patch	2014-11-06 08:00:07 UTC (rev 225659)
@@ -0,0 +1,29 @@
+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 {
+-- 
+2.1.3
+

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2014-11-06 05:11:02 UTC (rev 225658)
+++ PKGBUILD	2014-11-06 08:00:07 UTC (rev 225659)
@@ -10,14 +10,23 @@
 pkgname=('boost-libs' 'boost')
 pkgver=1.57.0
 _boostver=${pkgver//./_}
-pkgrel=1
+pkgrel=2
 url='http://www.boost.org/'
 arch=('i686' 'x86_64')
 license=('custom')
 makedepends=('icu>=53.1' 'python' 'python2' 'bzip2' 'zlib' 'openmpi')
-source=(https://downloads.sourceforge.net/project/${pkgbase}/${pkgbase}/${pkgver}/${pkgbase}_${_boostver}.tar.bz2)
-sha1sums=('e151557ae47afd1b43dc3fac46f8b04a8fe51c12')
+source=(https://downloads.sourceforge.net/project/${pkgbase}/${pkgbase}/${pkgver}/${pkgbase}_${_boostver}.tar.bz2
+        0001-Add-missing-include-to-signals2-trackable.hpp.patch)
+sha1sums=('e151557ae47afd1b43dc3fac46f8b04a8fe51c12'
+          '35bc8ad7493a641ec708a691036fe5319aec70cd')
 
+prepare() {
+   cd ${pkgbase}_${_boostver}
+
+   # https://github.com/boostorg/signals2/pull/8
+   patch -Np2 -i ../0001-Add-missing-include-to-signals2-trackable.hpp.patch
+}
+
 build() {
    export _stagedir="${srcdir}/stagedir"
    local JOBS="$(sed -e 's/.*\(-j *[0-9]\+\).*/\1/' <<< ${MAKEFLAGS})"