[arch-commits] Commit in leatherman/trunk (PKGBUILD boost-1.62.patch)

[Jonathan Steel]

    Date: Friday, October 14, 2016 @ 07:55:35
  Author: jsteel
Revision: 192234

upgpkg: leatherman 0.9.1-2

boost 1.62 rebuild

Added:
  leatherman/trunk/boost-1.62.patch
Modified:
  leatherman/trunk/PKGBUILD

------------------+
 PKGBUILD         |   11 ++++++++---
 boost-1.62.patch |   11 +++++++++++
 2 files changed, 19 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2016-10-14 02:41:30 UTC (rev 192233)
+++ PKGBUILD	2016-10-14 07:55:35 UTC (rev 192234)
@@ -2,7 +2,7 @@
 
 pkgname=leatherman
 pkgver=0.9.1
-pkgrel=1
+pkgrel=2
 pkgdesc="Collection of C++ and CMake utility libraries"
 arch=('i686' 'x86_64')
 url="https://github.com/puppetlabs/leatherman"
@@ -9,8 +9,10 @@
 license=('APACHE')
 makedepends=('boost' 'cmake' 'rapidjson')
 checkdepends=('ruby')
-source=($pkgname-$pkgver.tar.gz::https://github.com/puppetlabs/leatherman/archive/$pkgver.tar.gz)
-md5sums=('ad1c03f759a9451b333c867ec90e4a97')
+source=($pkgname-$pkgver.tar.gz::https://github.com/puppetlabs/leatherman/archive/$pkgver.tar.gz
+        boost-1.62.patch)
+md5sums=('ad1c03f759a9451b333c867ec90e4a97'
+         '18aeaac44f2b24702f04fb04535d3a3a')
 
 prepare() {
   cd $pkgname-$pkgver
@@ -18,6 +20,9 @@
   # Ruby 2.3 fix: replace rb_data_object_alloc symbol with rb_data_object_wrap
   sed -i 's/rb_data_object_alloc/rb_data_object_wrap/g' \
     $( grep -rl rb_data_object_alloc ruby )
+
+  # (LTH-115) Fix Boost.Log sink initialization with Boost 1.62
+  patch -Np0 -i ../boost-1.62.patch 
 }
 
 build() {

Added: boost-1.62.patch
===================================================================
--- boost-1.62.patch	                        (rev 0)
+++ boost-1.62.patch	2016-10-14 07:55:35 UTC (rev 192234)
@@ -0,0 +1,11 @@
+--- logging/src/logging.cc.orig	2016-10-14 08:37:12.829303659 +0100
++++ logging/src/logging.cc	2016-10-14 08:38:21.799662293 +0100
+@@ -82,7 +82,7 @@
+         core->remove_all_sinks();
+ 
+         using sink_t = sinks::synchronous_sink<color_writer>;
+-        boost::shared_ptr<sink_t> sink(new sink_t(&dst));
++        boost::shared_ptr<sink_t> sink = boost::make_shared<sink_t>(boost::make_shared<color_writer>(&dst));
+         core->add_sink(sink);
+ 
+