[pkg-kde-commits] rev 2585 - in trunk/packages/kdebindings/debian: . patches

[Adeodato Simó]

Author: adeodato
Date: 2005-12-07 14:31:20 +0000 (Wed, 07 Dec 2005)
New Revision: 2585

Added:
   trunk/packages/kdebindings/debian/patches/01_kdebindings_branch_r486318.diff
Modified:
   trunk/packages/kdebindings/debian/changelog
Log:
Make kdebindings branch pull for 3.5 so that the fix for #335876 does
not get forgotten.
Note: removed hunk that patched kalyptus/kalyptusCxxToKimono.pm.


Modified: trunk/packages/kdebindings/debian/changelog
===================================================================
--- trunk/packages/kdebindings/debian/changelog	2005-12-07 14:28:16 UTC (rev 2584)
+++ trunk/packages/kdebindings/debian/changelog	2005-12-07 14:31:20 UTC (rev 2585)
@@ -1,4 +1,4 @@
-kdebindings (4:3.4.3-2) unstable; urgency=low
+kdebindings (4:3.5.0-2) unstable; urgency=low
 
   +++ Changes by Christopher Martin:
 

Added: trunk/packages/kdebindings/debian/patches/01_kdebindings_branch_r486318.diff
===================================================================
--- trunk/packages/kdebindings/debian/patches/01_kdebindings_branch_r486318.diff	2005-12-07 14:28:16 UTC (rev 2584)
+++ trunk/packages/kdebindings/debian/patches/01_kdebindings_branch_r486318.diff	2005-12-07 14:31:20 UTC (rev 2585)
@@ -0,0 +1,51 @@
+#DPATCHLEVEL=0
+--- qtruby/ChangeLog	(.../tags/KDE/3.5.0/kdebindings)	(revision 486318)
++++ qtruby/ChangeLog	(.../branches/KDE/3.5/kdebindings)	(revision 486318)
+@@ -1,3 +1,19 @@
++2005-12-06  Richard Dale  <Richard_Dale at tipitina.demon.co.uk>
++
++	* QtRuby didn't work with versions of ruby > 1.8.3, as it didn't call
++	  initialize methods correctly. It used the rb_respond_to() method
++	  to check it a newly created qt instance responded to :initialize.
++	  However, in newer versions of ruby rb_responds_to() ignores
++	  private methods such as initialize(). The solution was to just remove
++	  the test, as it was redundant anyway.
++	* Fixes problem reported by Hans Fugel and Caleb Tennis.
++
++2005-11-21  Richard Dale  <Richard_Dale at tipitina.demon.co.uk>
++
++	* When dispose() was used to delete a ruby instance, the mapping between
++	  the C++ ptr and corresponding ruby instance was not being removed, and
++	  this caused a crash. Fixes problem reported by Christopher Chan-Nui.
++
+ 2005-11-04  Richard Dale  <Richard_Dale at tipitina.demon.co.uk>
+ 
+ 	* 'signed int&' types were not being matched or marshalled correctly
+--- qtruby/rubylib/qtruby/Qt.cpp	(.../tags/KDE/3.5.0/kdebindings)	(revision 486318)
++++ qtruby/rubylib/qtruby/Qt.cpp	(.../branches/KDE/3.5/kdebindings)	(revision 486318)
+@@ -1563,10 +1563,7 @@
+     }
+ 
+     VALUE result = rb_funcall2(qt_internal_module, rb_intern("try_initialize"), argc+1, temp_stack);
+-
+-    if (rb_respond_to(result, rb_intern("initialize")) != 0) {
+ 	rb_obj_call_init(result, argc, argv);
+-    }
+ 	
+ 	free(temp_stack);
+     return result;
+@@ -2098,8 +2095,13 @@
+ {
+     smokeruby_object *o = value_obj_info(self);
+     if(!o || !o->ptr) { return Qnil; }
++
++    const char *className = o->smoke->classes[o->classId].className;
++	if(do_debug & qtdb_gc) printf("Deleting (%s*)%p\n", className, o->ptr);
+ 	
+-    const char *className = o->smoke->classes[o->classId].className;
++	unmapPointer(o, o->classId, 0);
++	object_count--;
++
+ 	char *methodName = new char[strlen(className) + 2];
+ 	methodName[0] = '~';
+ 	strcpy(methodName + 1, className);