[arch-commits] Commit in leatherman/trunk (PKGBUILD ruby-2.4.patch)

[Jonathan Steel]

    Date: Monday, July 3, 2017 @ 08:28:03
  Author: jsteel
Revision: 242114

upgpkg: leatherman 1.0.0-1

Modified:
  leatherman/trunk/PKGBUILD
Deleted:
  leatherman/trunk/ruby-2.4.patch

----------------+
 PKGBUILD       |   13 +++--------
 ruby-2.4.patch |   63 -------------------------------------------------------
 2 files changed, 4 insertions(+), 72 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2017-07-03 08:28:00 UTC (rev 242113)
+++ PKGBUILD	2017-07-03 08:28:03 UTC (rev 242114)
@@ -1,8 +1,8 @@
 # Maintainer: Jonathan Steel <jsteel at archlinux.org>
 
 pkgname=leatherman
-pkgver=0.12.1
-pkgrel=2
+pkgver=1.0.0
+pkgrel=1
 pkgdesc="Collection of C++ and CMake utility libraries"
 arch=('i686' 'x86_64')
 url="https://github.com/puppetlabs/leatherman"
@@ -9,10 +9,8 @@
 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')
+source=($pkgname-$pkgver.tar.gz::https://github.com/puppetlabs/leatherman/archive/$pkgver.tar.gz)
+md5sums=('6de7c7890ab395db43540422daad5ddc')
 
 prepare() {
   cd $pkgname-$pkgver
@@ -20,9 +18,6 @@
   # 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() {

Deleted: ruby-2.4.patch
===================================================================
--- ruby-2.4.patch	2017-07-03 08:28:00 UTC (rev 242113)
+++ ruby-2.4.patch	2017-07-03 08:28:03 UTC (rev 242114)
@@ -1,63 +0,0 @@
-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")));
-     }