[Pkg-kde-commits] rev 383 - in trunk/packages/kdelibs/debian: . patches

[Christopher Martin]

Author: chrsmrtn-guest
Date: 2005-01-09 00:28:51 +0100 (Sun, 09 Jan 2005)
New Revision: 383

Added:
   trunk/packages/kdelibs/debian/patches/14_kaccel.diff
Modified:
   trunk/packages/kdelibs/debian/changelog
   trunk/packages/kdelibs/debian/control
Log:
Add the kaccel russian fix, and lower perl-suid to Recommends.
This stuff is iffy... Comments welcome.


Modified: trunk/packages/kdelibs/debian/changelog
===================================================================
--- trunk/packages/kdelibs/debian/changelog	2005-01-08 19:56:31 UTC (rev 382)
+++ trunk/packages/kdelibs/debian/changelog	2005-01-08 23:28:51 UTC (rev 383)
@@ -31,11 +31,20 @@
   * Add patch to change the group set by KDE CUPS configurator to Debian's
     default, lpadmin, rather than sys. (Closes: #263430)
 
+  * Add kaccel hack that works around a Konqueror crash with Russian keyboards.
+    (Closes: #287566)
+    !!!!!! TODO: Forward this bug upstream, or get the reporter to do so
+    (he's obviously knowleageable about this problem).
+
+  * Change dependency on perl-suid to perl, and add Recommends: perl-suid.
+    The lack of perl-suid should only cause problems for some users using
+    NFS or SMB shares. (Closes: #289164)
+    !!!!! I haven't really tested this, so this may introduce unforseen
+    problems.
+
   PENDING: I'd like to get done:
     
     #287822: kde-config --install html does not use ${datadir} 
-    #289164: kdelibs-bin: Please relax dependency on perl-suid 
-    #287566: KAccel handling causes mass konqueror segfaults on russian systems 
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org>  Date
 

Modified: trunk/packages/kdelibs/debian/control
===================================================================
--- trunk/packages/kdelibs/debian/control	2005-01-08 19:56:31 UTC (rev 382)
+++ trunk/packages/kdelibs/debian/control	2005-01-08 23:28:51 UTC (rev 383)
@@ -23,7 +23,8 @@
 Package: kdelibs-bin
 Section: libs
 Architecture: any
-Depends: ${shlibs:Depends}, menu-xdg, netpbm, perl-suid, python
+Depends: ${shlibs:Depends}, menu-xdg, netpbm, perl, python
+Recommends: perl-suid
 Conflicts: kdelibs-dev (<< 4:3.0.0), kdelibs3-bin (<< 4:3.0.0), kdelibs3-cups (<< 4:3.0.0), libkmid (<< 4:3.0.0), libkmid-alsa (<< 4:3.0.0)
 Replaces: kcontrol (<< 4:3.3.0), kdelibs-dev (<< 4:3.0.0), kdelibs3-bin (<< 4:3.0.0), kdelibs3-cups (<< 4:3.0.0), konqueror (<< 4:3.2.0), korganizer (<< 4:3.3.0), libkmid (<< 4:3.0.0), libkmid-alsa (<< 4:3.0.0)
 Description: KDE core binaries

Added: trunk/packages/kdelibs/debian/patches/14_kaccel.diff
===================================================================
--- trunk/packages/kdelibs/debian/patches/14_kaccel.diff	2005-01-08 19:56:31 UTC (rev 382)
+++ trunk/packages/kdelibs/debian/patches/14_kaccel.diff	2005-01-08 23:28:51 UTC (rev 383)
@@ -0,0 +1,13 @@
+--- kdelibs-orig/kdecore/kaccel.cpp
++++ kdelibs-patched/kdecore/kaccel.cpp
+@@ -95,7 +95,10 @@
+ 	        return false;
+ 
+ 	if( pEvent->type == XKeyPress ) {
++		unsigned int tmp = pEvent->xkey.state;
++		pEvent->xkey.state &= ~0x2000;
+ 		KKeyNative keyNative( pEvent );
++		pEvent->xkey.state = tmp;
+ 		KKey key( keyNative );
+ 		key.simplify();
+ 		int keyCodeQt = key.keyCodeQt();