[DRE-commits] [ruby-kyotocabinet] 03/04: added Ruby 2.2 patch

[Jonas Genannt]

This is an automated email from the git hooks/post-receive script.

genannt pushed a commit to branch master
in repository ruby-kyotocabinet.

commit 0507a491dfe3f6a623a73533ab237dc17940b0f3
Author: Jonas Genannt <jonas at brachium-system.net>
Date:   Fri Aug 21 12:03:40 2015 +0200

    added Ruby 2.2 patch
---
 debian/patches/ruby22.patch | 33 +++++++++++++++++++++++++++++++++
 debian/patches/series       |  1 +
 2 files changed, 34 insertions(+)

diff --git a/debian/patches/ruby22.patch b/debian/patches/ruby22.patch
new file mode 100644
index 0000000..676ceaf
--- /dev/null
+++ b/debian/patches/ruby22.patch
@@ -0,0 +1,33 @@
+Author: Michael Terry <michael.terry at canonical.com>
+Description: update source to work with Ruby 2.2
+
+--- a/kyotocabinet.cc
++++ b/kyotocabinet.cc
+@@ -20,6 +20,7 @@
+ extern "C" {
+ 
+ #include <ruby.h>
++#include <ruby/thread.h>
+ 
+ #if RUBY_VM >= 1
+ #define _KC_YARV_
+@@ -599,16 +600,16 @@
+   virtual void operate() = 0;
+   static void execute(NativeFunction* func) {
+ #if defined(_KC_YARV_)
+-    rb_thread_blocking_region(execute_impl, func, RUBY_UBF_IO, NULL);
++    rb_thread_call_without_gvl(execute_impl, func, RUBY_UBF_IO, NULL);
+ #else
+     func->operate();
+ #endif
+   }
+  private:
+-  static VALUE execute_impl(void* ptr) {
++  static void *execute_impl(void* ptr) {
+     NativeFunction* func = (NativeFunction*)ptr;
+     func->operate();
+-    return Qnil;
++    return NULL;
+   }
+ };
+ 
diff --git a/debian/patches/series b/debian/patches/series
index e38db49..e78c624 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -5,3 +5,4 @@
 0005-DFSG-include-source-for-thickbox-3.patch
 
 config-rbconfig.patch
+ruby22.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-ruby-extras/ruby-kyotocabinet.git