Date: Wednesday, May 17, 2017 @ 17:50:48 Author: jsteel Revision: 228379
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 228378, leatherman/trunk/PKGBUILD) leatherman/repos/community-staging-i686/ruby-2.4.patch (from rev 228378, leatherman/trunk/ruby-2.4.patch) leatherman/repos/community-staging-x86_64/ leatherman/repos/community-staging-x86_64/PKGBUILD (from rev 228378, leatherman/trunk/PKGBUILD) leatherman/repos/community-staging-x86_64/ruby-2.4.patch (from rev 228378, leatherman/trunk/ruby-2.4.patch) -----------------------------------------+ community-staging-i686/PKGBUILD | 48 ++++++++++++++++++++++ community-staging-i686/ruby-2.4.patch | 63 ++++++++++++++++++++++++++++++ community-staging-x86_64/PKGBUILD | 48 ++++++++++++++++++++++ community-staging-x86_64/ruby-2.4.patch | 63 ++++++++++++++++++++++++++++++ 4 files changed, 222 insertions(+) Copied: leatherman/repos/community-staging-i686/PKGBUILD (from rev 228378, leatherman/trunk/PKGBUILD) =================================================================== --- community-staging-i686/PKGBUILD (rev 0) +++ community-staging-i686/PKGBUILD 2017-05-17 17:50:48 UTC (rev 228379) @@ -0,0 +1,48 @@ +# Maintainer: Jonathan Steel <jsteel at archlinux.org> + +pkgname=leatherman +pkgver=0.12.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 + ruby-2.4.patch) +md5sums=('5f786c5dc004e84d7b464de27660be06' + '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-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 +} Copied: leatherman/repos/community-staging-i686/ruby-2.4.patch (from rev 228378, leatherman/trunk/ruby-2.4.patch) =================================================================== --- community-staging-i686/ruby-2.4.patch (rev 0) +++ community-staging-i686/ruby-2.4.patch 2017-05-17 17:50:48 UTC (rev 228379) @@ -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"))); + } Copied: leatherman/repos/community-staging-x86_64/PKGBUILD (from rev 228378, leatherman/trunk/PKGBUILD) =================================================================== --- community-staging-x86_64/PKGBUILD (rev 0) +++ community-staging-x86_64/PKGBUILD 2017-05-17 17:50:48 UTC (rev 228379) @@ -0,0 +1,48 @@ +# Maintainer: Jonathan Steel <jsteel at archlinux.org> + +pkgname=leatherman +pkgver=0.12.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 + ruby-2.4.patch) +md5sums=('5f786c5dc004e84d7b464de27660be06' + '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-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 +} Copied: leatherman/repos/community-staging-x86_64/ruby-2.4.patch (from rev 228378, leatherman/trunk/ruby-2.4.patch) =================================================================== --- community-staging-x86_64/ruby-2.4.patch (rev 0) +++ community-staging-x86_64/ruby-2.4.patch 2017-05-17 17:50:48 UTC (rev 228379) @@ -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"))); + }