[arch-commits] Commit in leatherman/repos (10 files)
Anatol Pomozov
anatolik at archlinux.org
Wed Jan 11 11:29:47 UTC 2017
Date: Wednesday, January 11, 2017 @ 11:29:46
Author: anatolik
Revision: 206818
archrelease: copy trunk to community-testing-i686, community-testing-x86_64
Added:
leatherman/repos/community-testing-i686/PKGBUILD
(from rev 206817, leatherman/trunk/PKGBUILD)
leatherman/repos/community-testing-i686/boost-1.62.patch
(from rev 206817, leatherman/trunk/boost-1.62.patch)
leatherman/repos/community-testing-i686/ruby-2.4.patch
(from rev 206817, leatherman/trunk/ruby-2.4.patch)
leatherman/repos/community-testing-x86_64/PKGBUILD
(from rev 206817, leatherman/trunk/PKGBUILD)
leatherman/repos/community-testing-x86_64/boost-1.62.patch
(from rev 206817, leatherman/trunk/boost-1.62.patch)
leatherman/repos/community-testing-x86_64/ruby-2.4.patch
(from rev 206817, leatherman/trunk/ruby-2.4.patch)
Deleted:
leatherman/repos/community-testing-i686/PKGBUILD
leatherman/repos/community-testing-i686/boost-1.62.patch
leatherman/repos/community-testing-x86_64/PKGBUILD
leatherman/repos/community-testing-x86_64/boost-1.62.patch
-------------------------------------------+
/PKGBUILD | 106 ++++++++++++++++++++++++++++
/boost-1.62.patch | 22 +++++
community-testing-i686/PKGBUILD | 48 ------------
community-testing-i686/boost-1.62.patch | 11 --
community-testing-i686/ruby-2.4.patch | 63 ++++++++++++++++
community-testing-x86_64/PKGBUILD | 48 ------------
community-testing-x86_64/boost-1.62.patch | 11 --
community-testing-x86_64/ruby-2.4.patch | 63 ++++++++++++++++
8 files changed, 254 insertions(+), 118 deletions(-)
Deleted: community-testing-i686/PKGBUILD
===================================================================
--- community-testing-i686/PKGBUILD 2017-01-11 11:28:59 UTC (rev 206817)
+++ community-testing-i686/PKGBUILD 2017-01-11 11:29:46 UTC (rev 206818)
@@ -1,48 +0,0 @@
-# Maintainer: Jonathan Steel <jsteel at archlinux.org>
-
-pkgname=leatherman
-pkgver=0.9.1
-pkgrel=3
-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-testing-i686/PKGBUILD (from rev 206817, leatherman/trunk/PKGBUILD)
===================================================================
--- community-testing-i686/PKGBUILD (rev 0)
+++ community-testing-i686/PKGBUILD 2017-01-11 11:29:46 UTC (rev 206818)
@@ -0,0 +1,53 @@
+# Maintainer: Jonathan Steel <jsteel at archlinux.org>
+
+pkgname=leatherman
+pkgver=0.9.1
+pkgrel=5
+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
+ ruby-2.4.patch)
+md5sums=('ad1c03f759a9451b333c867ec90e4a97'
+ '18aeaac44f2b24702f04fb04535d3a3a'
+ 'eb63e7694bd15e779ddc7b146adaad90')
+
+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
+
+ # (LTH-124) Fix for ruby-2.4 related API changes
+ patch -p1 -i ../ruby-2.4.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
+}
Deleted: community-testing-i686/boost-1.62.patch
===================================================================
--- community-testing-i686/boost-1.62.patch 2017-01-11 11:28:59 UTC (rev 206817)
+++ community-testing-i686/boost-1.62.patch 2017-01-11 11:29:46 UTC (rev 206818)
@@ -1,11 +0,0 @@
---- 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-testing-i686/boost-1.62.patch (from rev 206817, leatherman/trunk/boost-1.62.patch)
===================================================================
--- community-testing-i686/boost-1.62.patch (rev 0)
+++ community-testing-i686/boost-1.62.patch 2017-01-11 11:29:46 UTC (rev 206818)
@@ -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-testing-i686/ruby-2.4.patch (from rev 206817, leatherman/trunk/ruby-2.4.patch)
===================================================================
--- community-testing-i686/ruby-2.4.patch (rev 0)
+++ community-testing-i686/ruby-2.4.patch 2017-01-11 11:29:46 UTC (rev 206818)
@@ -0,0 +1,63 @@
+diff --git a/ruby/inc/leatherman/ruby/api.hpp b/ruby/inc/leatherman/ruby/api.hpp
+index 32117c6..4f6c0ba 100644
+--- a/ruby/inc/leatherman/ruby/api.hpp
++++ b/ruby/inc/leatherman/ruby/api.hpp
+@@ -412,15 +412,11 @@ namespace leatherman { namespace ruby {
+ /**
+ * See MRI documentation.
+ */
+- VALUE* const rb_cFixnum;
++ VALUE* const rb_cInteger;
+ /**
+ * See MRI documentation.
+ */
+ VALUE* const rb_cFloat;
+- /**
+- * See MRI documentation.
+- */
+- VALUE* const rb_cBignum;
+
+ /**
+ * See MRI documentation.
+diff --git a/ruby/src/api.cc b/ruby/src/api.cc
+index 434f691..9e96e05 100644
+--- a/ruby/src/api.cc
++++ b/ruby/src/api.cc
+@@ -100,9 +100,8 @@ namespace leatherman { namespace ruby {
+ LOAD_SYMBOL(rb_cHash),
+ LOAD_SYMBOL(rb_cString),
+ LOAD_SYMBOL(rb_cSymbol),
+- LOAD_SYMBOL(rb_cFixnum),
++ LOAD_SYMBOL(rb_cInteger),
+ LOAD_SYMBOL(rb_cFloat),
+- LOAD_SYMBOL(rb_cBignum),
+ LOAD_SYMBOL(rb_eException),
+ LOAD_SYMBOL(rb_eArgError),
+ LOAD_SYMBOL(rb_eTypeError),
+@@ -396,12 +395,12 @@ namespace leatherman { namespace ruby {
+
+ bool api::is_fixednum(VALUE value) const
+ {
+- return is_a(value, *rb_cFixnum);
++ return is_a(value, *rb_cInteger);
+ }
+
+ bool api::is_bignum(VALUE value) const
+ {
+- return is_a(value, *rb_cBignum);
++ return is_a(value, *rb_cInteger);
+ }
+
+ bool api::is_float(VALUE value) const
+diff --git a/ruby/tests/api-test.cc b/ruby/tests/api-test.cc
+index 20bcec7..1d2cafb 100644
+--- a/ruby/tests/api-test.cc
++++ b/ruby/tests/api-test.cc
+@@ -52,7 +52,7 @@ TEST_CASE("api::is_*", "[ruby-api]") {
+ REQUIRE_FALSE(ruby.is_fixednum(ruby.eval("1.5")));
+
+ REQUIRE(ruby.is_bignum(ruby.eval(to_string(numeric_limits<int64_t>::max()))));
+- REQUIRE_FALSE(ruby.is_bignum(ruby.eval("2")));
++ REQUIRE(ruby.is_bignum(ruby.eval("2")));
+ REQUIRE_FALSE(ruby.is_bignum(ruby.eval("1.5")));
+ }
Deleted: community-testing-x86_64/PKGBUILD
===================================================================
--- community-testing-x86_64/PKGBUILD 2017-01-11 11:28:59 UTC (rev 206817)
+++ community-testing-x86_64/PKGBUILD 2017-01-11 11:29:46 UTC (rev 206818)
@@ -1,48 +0,0 @@
-# Maintainer: Jonathan Steel <jsteel at archlinux.org>
-
-pkgname=leatherman
-pkgver=0.9.1
-pkgrel=3
-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-testing-x86_64/PKGBUILD (from rev 206817, leatherman/trunk/PKGBUILD)
===================================================================
--- community-testing-x86_64/PKGBUILD (rev 0)
+++ community-testing-x86_64/PKGBUILD 2017-01-11 11:29:46 UTC (rev 206818)
@@ -0,0 +1,53 @@
+# Maintainer: Jonathan Steel <jsteel at archlinux.org>
+
+pkgname=leatherman
+pkgver=0.9.1
+pkgrel=5
+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
+ ruby-2.4.patch)
+md5sums=('ad1c03f759a9451b333c867ec90e4a97'
+ '18aeaac44f2b24702f04fb04535d3a3a'
+ 'eb63e7694bd15e779ddc7b146adaad90')
+
+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
+
+ # (LTH-124) Fix for ruby-2.4 related API changes
+ patch -p1 -i ../ruby-2.4.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
+}
Deleted: community-testing-x86_64/boost-1.62.patch
===================================================================
--- community-testing-x86_64/boost-1.62.patch 2017-01-11 11:28:59 UTC (rev 206817)
+++ community-testing-x86_64/boost-1.62.patch 2017-01-11 11:29:46 UTC (rev 206818)
@@ -1,11 +0,0 @@
---- 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-testing-x86_64/boost-1.62.patch (from rev 206817, leatherman/trunk/boost-1.62.patch)
===================================================================
--- community-testing-x86_64/boost-1.62.patch (rev 0)
+++ community-testing-x86_64/boost-1.62.patch 2017-01-11 11:29:46 UTC (rev 206818)
@@ -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-testing-x86_64/ruby-2.4.patch (from rev 206817, leatherman/trunk/ruby-2.4.patch)
===================================================================
--- community-testing-x86_64/ruby-2.4.patch (rev 0)
+++ community-testing-x86_64/ruby-2.4.patch 2017-01-11 11:29:46 UTC (rev 206818)
@@ -0,0 +1,63 @@
+diff --git a/ruby/inc/leatherman/ruby/api.hpp b/ruby/inc/leatherman/ruby/api.hpp
+index 32117c6..4f6c0ba 100644
+--- a/ruby/inc/leatherman/ruby/api.hpp
++++ b/ruby/inc/leatherman/ruby/api.hpp
+@@ -412,15 +412,11 @@ namespace leatherman { namespace ruby {
+ /**
+ * See MRI documentation.
+ */
+- VALUE* const rb_cFixnum;
++ VALUE* const rb_cInteger;
+ /**
+ * See MRI documentation.
+ */
+ VALUE* const rb_cFloat;
+- /**
+- * See MRI documentation.
+- */
+- VALUE* const rb_cBignum;
+
+ /**
+ * See MRI documentation.
+diff --git a/ruby/src/api.cc b/ruby/src/api.cc
+index 434f691..9e96e05 100644
+--- a/ruby/src/api.cc
++++ b/ruby/src/api.cc
+@@ -100,9 +100,8 @@ namespace leatherman { namespace ruby {
+ LOAD_SYMBOL(rb_cHash),
+ LOAD_SYMBOL(rb_cString),
+ LOAD_SYMBOL(rb_cSymbol),
+- LOAD_SYMBOL(rb_cFixnum),
++ LOAD_SYMBOL(rb_cInteger),
+ LOAD_SYMBOL(rb_cFloat),
+- LOAD_SYMBOL(rb_cBignum),
+ LOAD_SYMBOL(rb_eException),
+ LOAD_SYMBOL(rb_eArgError),
+ LOAD_SYMBOL(rb_eTypeError),
+@@ -396,12 +395,12 @@ namespace leatherman { namespace ruby {
+
+ bool api::is_fixednum(VALUE value) const
+ {
+- return is_a(value, *rb_cFixnum);
++ return is_a(value, *rb_cInteger);
+ }
+
+ bool api::is_bignum(VALUE value) const
+ {
+- return is_a(value, *rb_cBignum);
++ return is_a(value, *rb_cInteger);
+ }
+
+ bool api::is_float(VALUE value) const
+diff --git a/ruby/tests/api-test.cc b/ruby/tests/api-test.cc
+index 20bcec7..1d2cafb 100644
+--- a/ruby/tests/api-test.cc
++++ b/ruby/tests/api-test.cc
+@@ -52,7 +52,7 @@ TEST_CASE("api::is_*", "[ruby-api]") {
+ REQUIRE_FALSE(ruby.is_fixednum(ruby.eval("1.5")));
+
+ REQUIRE(ruby.is_bignum(ruby.eval(to_string(numeric_limits<int64_t>::max()))));
+- REQUIRE_FALSE(ruby.is_bignum(ruby.eval("2")));
++ REQUIRE(ruby.is_bignum(ruby.eval("2")));
+ REQUIRE_FALSE(ruby.is_bignum(ruby.eval("1.5")));
+ }
More information about the arch-commits
mailing list