rev 11914 - in branches/kde4/packages/kdebindings/debian: . patches

[David Palacio]

Author: dpalacio-guest
Date: 2008-08-10 23:16:30 +0000 (Sun, 10 Aug 2008)
New Revision: 11914

Added:
   branches/kde4/packages/kdebindings/debian/patches/05_static_class_constructor.diff
Modified:
   branches/kde4/packages/kdebindings/debian/changelog
   branches/kde4/packages/kdebindings/debian/patches/ktexteditor-ruby.diff
   branches/kde4/packages/kdebindings/debian/patches/series
Log:
add patches/05_static_class_constructor.diff
Fixes segfault when creating a static class with a self method. (From trunk)


Modified: branches/kde4/packages/kdebindings/debian/changelog
===================================================================
--- branches/kde4/packages/kdebindings/debian/changelog	2008-08-10 21:49:36 UTC (rev 11913)
+++ branches/kde4/packages/kdebindings/debian/changelog	2008-08-10 23:16:30 UTC (rev 11914)
@@ -4,6 +4,7 @@
   
   [ David Palacio ]
   * Enable okular, plasma and nepomuk ruby bindings
+  * Add 05_static_class_constructor.diff
   * Update upstream merged patches
   * Remove patch bindings_branch
 

Added: branches/kde4/packages/kdebindings/debian/patches/05_static_class_constructor.diff
===================================================================
--- branches/kde4/packages/kdebindings/debian/patches/05_static_class_constructor.diff	                        (rev 0)
+++ branches/kde4/packages/kdebindings/debian/patches/05_static_class_constructor.diff	2008-08-10 23:16:30 UTC (rev 11914)
@@ -0,0 +1,31 @@
+Index: b/kalyptus/kalyptusCxxToSmoke.pm
+===================================================================
+--- a/kalyptus/kalyptusCxxToSmoke.pm
++++ b/kalyptus/kalyptusCxxToSmoke.pm
+@@ -690,7 +690,10 @@
+ 			}
+ 		}
+ 
+-		
++		if ($name eq 'self' && $m->{Flags} =~ "s") {
++			$classNode->AddProp( "Singleton", 1 );
++		}
++
+ 	    my $argId = 0;
+ 	    my $firstDefaultParam;
+ 	    foreach my $arg ( @{$m->{ParamList}} ) {
+@@ -1706,8 +1709,12 @@
+             $methodCode .= "private:\n";
+             $methodCode .= "    $className *xthis;\n";
+             $methodCode .= "public:\n";
+-            $methodCode .= "    $xClassName\(void *x) : xthis(($className*)x) {}\n";
+-            $switchCode .= "    $xClassName xtmp(obj), *xself = &xtmp;\n";
++            if ($classNode->{Singleton}) {
++                $switchCode .= "    $xClassName *xself = ($xClassName *) $className" . "::self();\n";
++            } else {
++                $methodCode .= "    $xClassName\(void *x) : xthis(($className*)x) {}\n";
++                $switchCode .= "    $xClassName xtmp(obj), *xself = &xtmp;\n";
++            }
+         } else {
+             $switchCode .= "    $xClassName *xself = ($xClassName*)obj;\n";
+             $methodCode .= "public:\n";

Modified: branches/kde4/packages/kdebindings/debian/patches/ktexteditor-ruby.diff
===================================================================
--- branches/kde4/packages/kdebindings/debian/patches/ktexteditor-ruby.diff	2008-08-10 21:49:36 UTC (rev 11913)
+++ branches/kde4/packages/kdebindings/debian/patches/ktexteditor-ruby.diff	2008-08-10 23:16:30 UTC (rev 11914)
@@ -1,10 +1,12 @@
+Index: b/ruby/ktexteditor/CMakeLists.txt
+===================================================================
 --- a/ruby/ktexteditor/CMakeLists.txt
 +++ b/ruby/ktexteditor/CMakeLists.txt
-@@ -10,7 +10,6 @@
+@@ -10,6 +10,7 @@
      smokeqt 
      smokekde 
      smokektexteditor 
--    katepart
++    katepart
      qtruby4shared)
  set_target_properties(rubyktexteditor PROPERTIES PREFIX "" OUTPUT_NAME ktexteditor)
  install(TARGETS rubyktexteditor DESTINATION ${CUSTOM_RUBY_SITE_ARCH_DIR})

Modified: branches/kde4/packages/kdebindings/debian/patches/series
===================================================================
--- branches/kde4/packages/kdebindings/debian/patches/series	2008-08-10 21:49:36 UTC (rev 11913)
+++ branches/kde4/packages/kdebindings/debian/patches/series	2008-08-10 23:16:30 UTC (rev 11914)
@@ -2,6 +2,7 @@
 02_include_default_settings_in_python_cmakelist.diff
 03_disable_python-nepomuk_the_hard_way.diff
 04_fix_ruby_requires.diff
+05_static_class_constructor.diff
 97_fix_target_link_libraries.diff
 99_enable_okular_plasma.diff
 ktexteditor-ruby.diff