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

[fourmond at alioth.debian.org]

Author: fourmond
Date: 2008-04-28 21:19:27 +0000 (Mon, 28 Apr 2008)
New Revision: 2694

Added:
   packages/libqt4-ruby/trunk/debian/patches/35-fix-class-std-segfault.dpatch
Modified:
   packages/libqt4-ruby/trunk/debian/changelog
   packages/libqt4-ruby/trunk/debian/patches/00list
Log:
[libqt4-ruby] Fixing serious bug in unstable

Modified: packages/libqt4-ruby/trunk/debian/changelog
===================================================================
--- packages/libqt4-ruby/trunk/debian/changelog	2008-04-27 17:13:11 UTC (rev 2693)
+++ packages/libqt4-ruby/trunk/debian/changelog	2008-04-28 21:19:27 UTC (rev 2694)
@@ -1,8 +1,9 @@
-libqt4-ruby (1.4.9-11) UNRELEASED; urgency=low
+libqt4-ruby (1.4.9-11) unstable; urgency=low
 
-  * NOT RELEASED YET
+  * 35-fix-class-std-segfault: don't try to init class 'std', to
+    avoid a nasty segfault on startup (Closes: #478075)
 
- -- Vincent Fourmond <fourmond at debian.org>  Tue, 15 Apr 2008 01:21:56 +0200
+ -- Vincent Fourmond <fourmond at debian.org>  Mon, 28 Apr 2008 23:02:31 +0200
 
 libqt4-ruby (1.4.9-10) unstable; urgency=medium
 

Modified: packages/libqt4-ruby/trunk/debian/patches/00list
===================================================================
--- packages/libqt4-ruby/trunk/debian/patches/00list	2008-04-27 17:13:11 UTC (rev 2693)
+++ packages/libqt4-ruby/trunk/debian/patches/00list	2008-04-28 21:19:27 UTC (rev 2694)
@@ -3,6 +3,7 @@
 25-fix-hppa-build
 28-optimization
 30-qt_enum
+35-fix-class-std-segfault
 40-fix-gcc-snapshot
 97-soname
 99-smoke-qt4

Added: packages/libqt4-ruby/trunk/debian/patches/35-fix-class-std-segfault.dpatch
===================================================================
--- packages/libqt4-ruby/trunk/debian/patches/35-fix-class-std-segfault.dpatch	                        (rev 0)
+++ packages/libqt4-ruby/trunk/debian/patches/35-fix-class-std-segfault.dpatch	2008-04-28 21:19:27 UTC (rev 2694)
@@ -0,0 +1,19 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 35-fix-class-std-segfault.dpatch by  <fourmond at debian.org>
+##
+## DP: Don't deal with class std in the init_class primitive, as
+## DP: this segfaults.
+
+ at DPATCH@
+diff -urNad libqt4-ruby-1.4.9~/ruby/qtruby/src/lib/Qt/qtruby4.rb libqt4-ruby-1.4.9/ruby/qtruby/src/lib/Qt/qtruby4.rb
+--- libqt4-ruby-1.4.9~/ruby/qtruby/src/lib/Qt/qtruby4.rb	2007-06-18 16:06:41.000000000 +0200
++++ libqt4-ruby-1.4.9/ruby/qtruby/src/lib/Qt/qtruby4.rb	2008-04-28 23:01:31.000000000 +0200
+@@ -2082,6 +2082,8 @@
+ 		end
+ 
+ 		def Internal.init_class(c)
++                  # Don't deal with class std !
++                  return if c =~ /std/
+ 			classname = Qt::Internal::normalize_classname(c)
+ 			classId = Qt::Internal.idClass(c)
+ 			insert_pclassid(classname, classId)


Property changes on: packages/libqt4-ruby/trunk/debian/patches/35-fix-class-std-segfault.dpatch
___________________________________________________________________
Name: svn:executable
   + *