r2035 - trunk/kdebindings

bdubbs at linuxfromscratch.org bdubbs at linuxfromscratch.org
Tue Jan 6 22:22:50 PST 2009


Author: bdubbs
Date: 2009-01-06 23:22:50 -0700 (Tue, 06 Jan 2009)
New Revision: 2035

Added:
   trunk/kdebindings/kdebindings-3.5.10-ruby-1.patch
Modified:
   trunk/kdebindings/kdebindings-3.5.10-python-1.patch
Log:
Patch to kdebindings ruby code for GCC-4.3

Modified: trunk/kdebindings/kdebindings-3.5.10-python-1.patch
===================================================================
--- trunk/kdebindings/kdebindings-3.5.10-python-1.patch	2009-01-07 03:58:11 UTC (rev 2034)
+++ trunk/kdebindings/kdebindings-3.5.10-python-1.patch	2009-01-07 06:22:50 UTC (rev 2035)
@@ -1,4 +1,4 @@
-Submitted By: Bruce Dubbs <bdubsb at linuxfromscratch dot org>
+Submitted By: Bruce Dubbs <bdubbs at linuxfromscratch dot org>
 Date: 2009-01-06
 Initial Package Version: 3.5.10
 Origin: Upstream

Added: trunk/kdebindings/kdebindings-3.5.10-ruby-1.patch
===================================================================
--- trunk/kdebindings/kdebindings-3.5.10-ruby-1.patch	                        (rev 0)
+++ trunk/kdebindings/kdebindings-3.5.10-ruby-1.patch	2009-01-07 06:22:50 UTC (rev 2035)
@@ -0,0 +1,63 @@
+Submitted By: Bruce Dubbs <bdubbs at linuxfromscratch dot org>
+Date: 2009-01-06
+Initial Package Version: 3.5.10
+Origin: Debian
+Description: Fixes problems because GCC-4.3 is more strict
+
+diff -Naur kdebindings-3.5.10.old/qtruby/rubylib/qtruby/Qt.cpp kdebindings-3.5.10/qtruby/rubylib/qtruby/Qt.cpp
+--- kdebindings-3.5.10.old/qtruby/rubylib/qtruby/Qt.cpp	2007-01-15 05:19:09.000000000 -0600
++++ kdebindings-3.5.10/qtruby/rubylib/qtruby/Qt.cpp	2009-01-06 23:53:15.000000000 -0600
+@@ -950,7 +950,7 @@
+ const char *
+ get_VALUEtype(VALUE ruby_value)
+ {
+-	char * classname = rb_obj_classname(ruby_value);
++	const char * classname = rb_obj_classname(ruby_value);
+     const char *r = "";
+     if(ruby_value == Qnil)
+ 	r = "u";
+@@ -1395,7 +1395,7 @@
+ }
+ 
+ static QCString *
+-find_cached_selector(int argc, VALUE * argv, VALUE klass, char * methodName)
++find_cached_selector(int argc, VALUE * argv, VALUE klass, const char * methodName)
+ {
+     // Look in the cache
+ static QCString * mcid = 0;
+@@ -1432,7 +1432,7 @@
+ static VALUE
+ method_missing(int argc, VALUE * argv, VALUE self)
+ {
+-	char * methodName = rb_id2name(SYM2ID(argv[0]));
++	const char * methodName = 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]));
++				const char * op = 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]));
++	const char * methodName = 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);
+@@ -1772,7 +1772,7 @@
+ VALUE
+ getmetainfo(VALUE self, int &offset, int &index)
+ {
+-    char * signalname = rb_id2name(rb_frame_last_func());
++    const char * signalname = 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 patches mailing list