[gentoo-commits] gentoo-x86 commit in kde-base/qtruby/files: qtruby-4.14.3-ruby20.patch

[gentoo-commits] gentoo-x86 commit in kde-base/qtruby/files: qtruby-4.14.3-ruby20.patch

[Johannes Huber (johu)]

johu        15/01/18 20:55:04

  Added:                qtruby-4.14.3-ruby20.patch
  Log:
  Revision bump adds patch to fix signals in ruby20 spotted by Stefano Crocco <stefano.crocco@alice.it>, bug #532120.
  
  (Portage version: 2.2.15/cvs/Linux x86_64, signed Manifest commit with key F3CFD2BD)

Revision  Changes    Path
1.1                  kde-base/qtruby/files/qtruby-4.14.3-ruby20.patch

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/kde-base/qtruby/files/qtruby-4.14.3-ruby20.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/kde-base/qtruby/files/qtruby-4.14.3-ruby20.patch?rev=1.1&content-type=text/plain

Index: qtruby-4.14.3-ruby20.patch
===================================================================
--- qtruby-4.11.4.orig/src/qtruby.cpp	2013-06-28 19:16:12.057325696 +0200
+++ qtruby-4.11.4/src/qtruby.cpp	2014-01-07 19:22:11.000000000 +0100
@@ -1398,11 +1391,14 @@
 		return Qfalse;
 	}
 
-#if RUBY_VERSION >= 0x10900
+#if RUBY_VERSION >= 0x20000
+	QLatin1String signalname(rb_id2name(rb_frame_this_func()));
+#elif RUBY_VERSION >= 0x10900
 	QLatin1String signalname(rb_id2name(rb_frame_callee()));
 #else
 	QLatin1String signalname(rb_id2name(rb_frame_last_func()));
 #endif
+
 	VALUE metaObject_value = rb_funcall(qt_internal_module, rb_intern("getMetaObject"), 2, Qnil, self);
 
 	smokeruby_object *ometa = value_obj_info(metaObject_value);