[DRE-commits] r2757 - in packages/libqt4-ruby/trunk/debian: . patches

[fourmond at alioth.debian.org]

Author: fourmond
Date: 2008-06-03 19:41:35 +0000 (Tue, 03 Jun 2008)
New Revision: 2757

Added:
   packages/libqt4-ruby/trunk/debian/patches/35-fix-g++-4.3-build.dpatch
Modified:
   packages/libqt4-ruby/trunk/debian/changelog
   packages/libqt4-ruby/trunk/debian/patches/00list
Log:
[libqt4-ruby] Fix FTBS with g++-4.3

Modified: packages/libqt4-ruby/trunk/debian/changelog
===================================================================
--- packages/libqt4-ruby/trunk/debian/changelog	2008-06-03 19:01:49 UTC (rev 2756)
+++ packages/libqt4-ruby/trunk/debian/changelog	2008-06-03 19:41:35 UTC (rev 2757)
@@ -1,8 +1,10 @@
-libqt4-ruby (1.4.10-3) UNRELEASED; urgency=low
+libqt4-ruby (1.4.10-3) unstable; urgency=medium
 
-  * NOT RELEASED YET
+  * 35-fix-g++-4.3-build : tweak some const char * in Qt.cpp so 
+    it builds with g++-4.3 (Closes: #484198)
+  * Urgency medium to fix RC bug in testing.
 
- -- Vincent Fourmond <fourmond at debian.org>  Thu, 22 May 2008 20:57:06 +0200
+ -- Vincent Fourmond <fourmond at debian.org>  Tue, 03 Jun 2008 21:41:00 +0200
 
 libqt4-ruby (1.4.10-2) unstable; urgency=medium
 

Modified: packages/libqt4-ruby/trunk/debian/patches/00list
===================================================================
--- packages/libqt4-ruby/trunk/debian/patches/00list	2008-06-03 19:01:49 UTC (rev 2756)
+++ packages/libqt4-ruby/trunk/debian/patches/00list	2008-06-03 19:41:35 UTC (rev 2757)
@@ -3,6 +3,7 @@
 25-fix-hppa-build
 28-optimization
 30-qt_enum
+35-fix-g++-4.3-build
 # 35-fix-class-std-segfault
 # 40-fix-gcc-snapshot
 50-rbqtapi-ruby1.8

Added: packages/libqt4-ruby/trunk/debian/patches/35-fix-g++-4.3-build.dpatch
===================================================================
--- packages/libqt4-ruby/trunk/debian/patches/35-fix-g++-4.3-build.dpatch	                        (rev 0)
+++ packages/libqt4-ruby/trunk/debian/patches/35-fix-g++-4.3-build.dpatch	2008-06-03 19:41:35 UTC (rev 2757)
@@ -0,0 +1,73 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 35-fix-g++-4.3-build.dpatch by  <fourmond at debian.org>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: No description.
+
+ at DPATCH@
+diff -urNad libqt4-ruby-1.4.10~/ruby/qtruby/src/Qt.cpp libqt4-ruby-1.4.10/ruby/qtruby/src/Qt.cpp
+--- libqt4-ruby-1.4.10~/ruby/qtruby/src/Qt.cpp	2008-04-30 11:58:31.000000000 +0200
++++ libqt4-ruby-1.4.10/ruby/qtruby/src/Qt.cpp	2008-06-03 21:33:16.000000000 +0200
+@@ -693,7 +693,7 @@
+ VALUE
+ qvariant_value(VALUE /*self*/, VALUE variant_value_klass, VALUE variant_value)
+ {
+-	char * classname = rb_class2name(variant_value_klass);
++	const char * classname = rb_class2name(variant_value_klass);
+     smokeruby_object *o = value_obj_info(variant_value);
+ 	if (o == 0 || o->ptr == 0) {
+ 		return Qnil;
+@@ -809,7 +809,7 @@
+ 		}
+ 	}
+ 
+-	char * classname = rb_obj_classname(argv[0]);
++	const char * classname = rb_obj_classname(argv[0]);
+     smokeruby_object *o = value_obj_info(argv[0]);
+ 	if (o == 0 || o->ptr == 0) {
+ 		// Assume the Qt::Variant can be created with a
+@@ -872,7 +872,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";
+@@ -1797,7 +1797,7 @@
+ static VALUE
+ method_missing(int argc, VALUE * argv, VALUE self)
+ {
+-	char * methodName = rb_id2name(SYM2ID(argv[0]));
++  char * methodName = const_cast<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
+@@ -1847,7 +1847,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
+@@ -1954,7 +1954,7 @@
+ class_method_missing(int argc, VALUE * argv, VALUE klass)
+ {
+ 	VALUE result = Qnil;
+-	char * methodName = rb_id2name(SYM2ID(argv[0]));
++	char * methodName = const_cast<char *>(rb_id2name(SYM2ID(argv[0])));
+ 	VALUE * temp_stack = ALLOCA_N(VALUE, argc+3);
+     temp_stack[0] = rb_str_new2("Qt");
+     temp_stack[1] = rb_str_new2(methodName);
+@@ -2068,7 +2068,7 @@
+ 	}
+ 
+ 	{ 
+-		QByteArray * mcid = find_cached_selector(argc+4, temp_stack, klass, rb_class2name(klass));
++	  QByteArray * mcid = find_cached_selector(argc+4, temp_stack, klass, const_cast<char *>(rb_class2name(klass)));
+ 
+ 		if (_current_method == -1) {
+ 			retval = rb_funcall2(qt_internal_module, rb_intern("do_method_missing"), argc+4, temp_stack);


Property changes on: packages/libqt4-ruby/trunk/debian/patches/35-fix-g++-4.3-build.dpatch
___________________________________________________________________
Name: svn:executable
   + *