rev 3222 - in trunk/packages/qt-x11-free/debian: . patches

[Christopher Martin]

Author: chrsmrtn
Date: 2006-02-27 15:57:07 +0000 (Mon, 27 Feb 2006)
New Revision: 3222

Added:
   trunk/packages/qt-x11-free/debian/patches/49_immodule_inputcontext_fix.dpatch
Modified:
   trunk/packages/qt-x11-free/debian/changelog
   trunk/packages/qt-x11-free/debian/patches/00list
Log:
Add one more immodule patch.


Modified: trunk/packages/qt-x11-free/debian/changelog
===================================================================
--- trunk/packages/qt-x11-free/debian/changelog	2006-02-27 14:14:33 UTC (rev 3221)
+++ trunk/packages/qt-x11-free/debian/changelog	2006-02-27 15:57:07 UTC (rev 3222)
@@ -1,3 +1,12 @@
+qt-x11-free (3:3.3.5-5) UNRELEASED; urgency=low
+
+  +++ Changes by Christopher Martin:
+
+  * Add another small patch for immodule from Dirk Mueller, fixing an
+    inputcontext crash.
+
+ -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Mon, 27 Feb 2006 08:57:10 -0500
+
 qt-x11-free (3:3.3.5-4) unstable; urgency=low
 
   +++ Changes by Christopher Martin:

Modified: trunk/packages/qt-x11-free/debian/patches/00list
===================================================================
--- trunk/packages/qt-x11-free/debian/patches/00list	2006-02-27 14:14:33 UTC (rev 3221)
+++ trunk/packages/qt-x11-free/debian/patches/00list	2006-02-27 15:57:07 UTC (rev 3222)
@@ -35,3 +35,4 @@
 46_immodule_keyrelease_fix
 47_immodule_nodebug_fix
 48_immodule_xim_fix
+49_immodule_inputcontext_fix

Added: trunk/packages/qt-x11-free/debian/patches/49_immodule_inputcontext_fix.dpatch
===================================================================
--- trunk/packages/qt-x11-free/debian/patches/49_immodule_inputcontext_fix.dpatch	2006-02-27 14:14:33 UTC (rev 3221)
+++ trunk/packages/qt-x11-free/debian/patches/49_immodule_inputcontext_fix.dpatch	2006-02-27 15:57:07 UTC (rev 3222)
@@ -0,0 +1,36 @@
+#! /bin/sh -e
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Make it compile on mips / mipsel
+
+if [ $# -lt 1 ]; then
+    echo "`basename $0`: script expects -patch|-unpatch as argument" >&2
+    exit 1
+fi
+
+[ -f debian/patches/00patch-opts ] && . debian/patches/00patch-opts
+patch_opts="${patch_opts:--f --no-backup-if-mismatch} ${2:+-d $2}"
+
+case "$1" in
+    -patch) patch -p1 ${patch_opts} < $0;;
+    -unpatch) patch -R -p1 ${patch_opts} < $0;;
+    *)
+        echo "`basename $0`: script expects -patch|-unpatch as argument" >&2
+        exit 1;;
+esac
+
+exit 0
+
+ at DPATCH@
+--- qt.orig/src/inputmethod/qinputcontextfactory.cpp
++++ qt.patched/src/inputmethod/qinputcontextfactory.cpp
+@@ -102,7 +102,8 @@
+     if ( iface ) {
+ 	ret = iface->create( inputcontext );
+ #ifdef Q_WS_X11
+-	ret->setHolderWidget( widget );
++        if ( ret ) 
++	    ret->setHolderWidget( widget );
+ #endif
+     }
+ #endif