[arch-commits] Commit in leatherman/repos (6 files)
Jonathan Steel
jsteel at archlinux.org
Fri Oct 14 07:55:50 UTC 2016
Date: Friday, October 14, 2016 @ 07:55:50
Author: jsteel
Revision: 192235
archrelease: copy trunk to community-staging-i686, community-staging-x86_64
Added:
leatherman/repos/community-staging-i686/
leatherman/repos/community-staging-i686/PKGBUILD
(from rev 192234, leatherman/trunk/PKGBUILD)
leatherman/repos/community-staging-i686/boost-1.62.patch
(from rev 192234, leatherman/trunk/boost-1.62.patch)
leatherman/repos/community-staging-x86_64/
leatherman/repos/community-staging-x86_64/PKGBUILD
(from rev 192234, leatherman/trunk/PKGBUILD)
leatherman/repos/community-staging-x86_64/boost-1.62.patch
(from rev 192234, leatherman/trunk/boost-1.62.patch)
-------------------------------------------+
community-staging-i686/PKGBUILD | 48 ++++++++++++++++++++++++++++
community-staging-i686/boost-1.62.patch | 11 ++++++
community-staging-x86_64/PKGBUILD | 48 ++++++++++++++++++++++++++++
community-staging-x86_64/boost-1.62.patch | 11 ++++++
4 files changed, 118 insertions(+)
Copied: leatherman/repos/community-staging-i686/PKGBUILD (from rev 192234, leatherman/trunk/PKGBUILD)
===================================================================
--- community-staging-i686/PKGBUILD (rev 0)
+++ community-staging-i686/PKGBUILD 2016-10-14 07:55:50 UTC (rev 192235)
@@ -0,0 +1,48 @@
+# Maintainer: Jonathan Steel <jsteel at archlinux.org>
+
+pkgname=leatherman
+pkgver=0.9.1
+pkgrel=2
+pkgdesc="Collection of C++ and CMake utility libraries"
+arch=('i686' 'x86_64')
+url="https://github.com/puppetlabs/leatherman"
+license=('APACHE')
+makedepends=('boost' 'cmake' 'rapidjson')
+checkdepends=('ruby')
+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
+
+ # 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() {
+ cd $pkgname-$pkgver
+
+ cmake -DCMAKE_INSTALL_PREFIX=/usr
+
+ make
+}
+
+check() {
+ cd $pkgname-$pkgver
+
+ make test
+}
+
+package() {
+ cd $pkgname-$pkgver
+
+ make install DESTDIR="$pkgdir"
+
+ install -Dm644 LICENSE "$pkgdir"/usr/share/licenses/$pkgname/LICENSE
+}
Copied: leatherman/repos/community-staging-i686/boost-1.62.patch (from rev 192234, leatherman/trunk/boost-1.62.patch)
===================================================================
--- community-staging-i686/boost-1.62.patch (rev 0)
+++ community-staging-i686/boost-1.62.patch 2016-10-14 07:55:50 UTC (rev 192235)
@@ -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);
+
+
Copied: leatherman/repos/community-staging-x86_64/PKGBUILD (from rev 192234, leatherman/trunk/PKGBUILD)
===================================================================
--- community-staging-x86_64/PKGBUILD (rev 0)
+++ community-staging-x86_64/PKGBUILD 2016-10-14 07:55:50 UTC (rev 192235)
@@ -0,0 +1,48 @@
+# Maintainer: Jonathan Steel <jsteel at archlinux.org>
+
+pkgname=leatherman
+pkgver=0.9.1
+pkgrel=2
+pkgdesc="Collection of C++ and CMake utility libraries"
+arch=('i686' 'x86_64')
+url="https://github.com/puppetlabs/leatherman"
+license=('APACHE')
+makedepends=('boost' 'cmake' 'rapidjson')
+checkdepends=('ruby')
+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
+
+ # 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() {
+ cd $pkgname-$pkgver
+
+ cmake -DCMAKE_INSTALL_PREFIX=/usr
+
+ make
+}
+
+check() {
+ cd $pkgname-$pkgver
+
+ make test
+}
+
+package() {
+ cd $pkgname-$pkgver
+
+ make install DESTDIR="$pkgdir"
+
+ install -Dm644 LICENSE "$pkgdir"/usr/share/licenses/$pkgname/LICENSE
+}
Copied: leatherman/repos/community-staging-x86_64/boost-1.62.patch (from rev 192234, leatherman/trunk/boost-1.62.patch)
===================================================================
--- community-staging-x86_64/boost-1.62.patch (rev 0)
+++ community-staging-x86_64/boost-1.62.patch 2016-10-14 07:55:50 UTC (rev 192235)
@@ -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);
+
+
More information about the arch-commits
mailing list