SOURCES: kdebindings-build.patch (NEW) - build fix

arekm arekm at pld-linux.org
Mon Oct 20 19:42:56 CEST 2008


Author: arekm                        Date: Mon Oct 20 17:42:56 2008 GMT
Module: SOURCES                       Tag: HEAD
---- Log message:
- build fix

---- Files affected:
SOURCES:
   kdebindings-build.patch (NONE -> 1.1)  (NEW)

---- Diffs:

================================================================
Index: SOURCES/kdebindings-build.patch
diff -u /dev/null SOURCES/kdebindings-build.patch:1.1
--- /dev/null	Mon Oct 20 19:42:56 2008
+++ SOURCES/kdebindings-build.patch	Mon Oct 20 19:42:50 2008
@@ -0,0 +1,56 @@
+--- kdebindings-3.5.10/qtruby/rubylib/qtruby/Qt.cpp.org	2008-10-20 19:38:39.285314517 +0200
++++ kdebindings-3.5.10/qtruby/rubylib/qtruby/Qt.cpp	2008-10-20 19:39:58.258639608 +0200
+@@ -950,7 +950,7 @@
+ const char *
+ get_VALUEtype(VALUE ruby_value)
+ {
+-	char * classname = rb_obj_classname(ruby_value);
++	char * classname = (char *)rb_obj_classname(ruby_value);
+     const char *r = "";
+     if(ruby_value == Qnil)
+ 	r = "u";
+@@ -1432,7 +1432,7 @@
+ static VALUE
+ method_missing(int argc, VALUE * argv, VALUE self)
+ {
+-	char * methodName = rb_id2name(SYM2ID(argv[0]));
++	char * methodName = (char *)rb_id2name(SYM2ID(argv[0]));
+     VALUE klass = rb_funcall(self, rb_intern("class"), 0);
+ 
+ 	// Look for 'thing?' methods, and try to match isThing() or hasThing() in the Smoke runtime
+@@ -1482,7 +1482,7 @@
+ 
+ 			VALUE retval = rb_funcall2(qt_internal_module, rb_intern("do_method_missing"), argc+3, temp_stack);
+ 			if (_current_method == -1) {
+-				char * op = rb_id2name(SYM2ID(argv[0]));
++				char * op = (char *)rb_id2name(SYM2ID(argv[0]));
+ 				if (	qstrcmp(op, "-") == 0
+ 						|| qstrcmp(op, "+") == 0
+ 						|| qstrcmp(op, "/") == 0
+@@ -1557,7 +1557,7 @@
+ class_method_missing(int argc, VALUE * argv, VALUE klass)
+ {
+ 	VALUE result = Qnil;
+-	char * methodName = rb_id2name(SYM2ID(argv[0]));
++	char * methodName = (char *)rb_id2name(SYM2ID(argv[0]));
+ 	VALUE * temp_stack = (VALUE *) calloc(argc+3, sizeof(VALUE));
+     temp_stack[0] = rb_str_new2("Qt");
+     temp_stack[1] = rb_str_new2(methodName);
+@@ -1674,7 +1674,7 @@
+ 	{ 
+ 		// Put this in a C block so that the mcid will be de-allocated at the end of the block,
+ 		// rather than on f'n exit, to avoid the longjmp problem described below
+-		QCString * mcid = find_cached_selector(argc+4, temp_stack, klass, rb_class2name(klass));
++		QCString * mcid = find_cached_selector(argc+4, temp_stack, klass, (char *)rb_class2name(klass));
+ 
+ 		if (_current_method == -1) {
+ 			retval = rb_funcall2(qt_internal_module, rb_intern("do_method_missing"), argc+4, temp_stack);
+@@ -1772,7 +1772,7 @@
+ VALUE
+ getmetainfo(VALUE self, int &offset, int &index)
+ {
+-    char * signalname = rb_id2name(rb_frame_last_func());
++    char * signalname = (char *)rb_id2name(rb_frame_last_func());
+     VALUE metaObject_value = rb_funcall(qt_internal_module, rb_intern("getMetaObject"), 1, self);
+ 
+     smokeruby_object *ometa = value_obj_info(metaObject_value);
================================================================


More information about the pld-cvs-commit mailing list