rev 10990 - in trunk/packages/kdebindings/debian: . patches

[Ana Beatriz Guerrero López]

Author: ana
Date: 2008-06-12 15:00:55 +0000 (Thu, 12 Jun 2008)
New Revision: 10990

Added:
   trunk/packages/kdebindings/debian/patches/032_ruby_fix_const.diff
Modified:
   trunk/packages/kdebindings/debian/changelog
   trunk/packages/kdebindings/debian/patches/series
Log:
fix kde3bindings FTBFS with gcc 4.3, closes #484191


Modified: trunk/packages/kdebindings/debian/changelog
===================================================================
--- trunk/packages/kdebindings/debian/changelog	2008-06-12 13:36:02 UTC (rev 10989)
+++ trunk/packages/kdebindings/debian/changelog	2008-06-12 15:00:55 UTC (rev 10990)
@@ -1,3 +1,10 @@
+kdebindings (4:3.5.9-2) unstable; urgency=low
+
+  * Fix FTBFS with gcc 4.3. Thanks a lot to peter green <plugwash at p10link.net>
+    for the patch. (Closes: #484191). Patch 032_ruby_fix_const.diff
+
+ -- Ana Beatriz Guerrero Lopez <ana at debian.org>  Thu, 12 Jun 2008 12:46:27 +0200
+
 kdebindings (4:3.5.9-1) unstable; urgency=low
 
   * New upstream release: no code changes.

Added: trunk/packages/kdebindings/debian/patches/032_ruby_fix_const.diff
===================================================================
--- trunk/packages/kdebindings/debian/patches/032_ruby_fix_const.diff	                        (rev 0)
+++ trunk/packages/kdebindings/debian/patches/032_ruby_fix_const.diff	2008-06-12 15:00:55 UTC (rev 10990)
@@ -0,0 +1,58 @@
+Index: kdebindings-3.5.9/qtruby/rubylib/qtruby/Qt.cpp
+===================================================================
+--- kdebindings-3.5.9.orig/qtruby/rubylib/qtruby/Qt.cpp	2008-06-07 00:48:29.000000000 +0000
++++ kdebindings-3.5.9/qtruby/rubylib/qtruby/Qt.cpp	2008-06-07 00:50:23.000000000 +0000
+@@ -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);

Modified: trunk/packages/kdebindings/debian/patches/series
===================================================================
--- trunk/packages/kdebindings/debian/patches/series	2008-06-12 13:36:02 UTC (rev 10989)
+++ trunk/packages/kdebindings/debian/patches/series	2008-06-12 15:00:55 UTC (rev 10990)
@@ -18,4 +18,5 @@
 028-make-cmdline.js-executable.diff
 029-ruby1.8-not-just-ruby.diff
 031_correct_-classpath_to_gcj_instead_of_CLASSPATH.diff
+032_ruby_fix_const.diff
 98_buildprep.diff -p0