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

[Christopher Martin]

Author: chrsmrtn-guest
Date: 2005-03-31 18:10:44 +0000 (Thu, 31 Mar 2005)
New Revision: 950

Added:
   trunk/packages/kdelibs/debian/patches/22_kaccel2.diff
Modified:
   trunk/packages/kdelibs/debian/changelog
Log:
Add kaccel patch, in case we make another upload of kdelibs.


Modified: trunk/packages/kdelibs/debian/changelog
===================================================================
--- trunk/packages/kdelibs/debian/changelog	2005-03-31 16:58:32 UTC (rev 949)
+++ trunk/packages/kdelibs/debian/changelog	2005-03-31 18:10:44 UTC (rev 950)
@@ -4,6 +4,9 @@
 
   * Add GFDL to debian/copyright.
 
+  * Add another kaccel patch that fixes non-English keyboards on
+    SunRay terminals. Thanks to Nikita Youshchenko. (Closes: #301971)
+
  -- Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org>  Date
 
 kdelibs (4:3.3.2-4) unstable; urgency=low

Added: trunk/packages/kdelibs/debian/patches/22_kaccel2.diff
===================================================================
--- trunk/packages/kdelibs/debian/patches/22_kaccel2.diff	2005-03-31 16:58:32 UTC (rev 949)
+++ trunk/packages/kdelibs/debian/patches/22_kaccel2.diff	2005-03-31 18:10:44 UTC (rev 950)
@@ -0,0 +1,62 @@
+--- kdelibs.orig/kdecore/kglobalaccel_x11.cpp
++++ kdelibs.patched/kdecore/kglobalaccel_x11.cpp
+@@ -49,7 +49,8 @@
+ 	g_keyModMaskXOnOrOff =
+ 			KKeyServer::modXLock() |
+ 			KKeyServer::modXNumLock() |
+-			KKeyServer::modXScrollLock();
++			KKeyServer::modXScrollLock() |
++			KKeyServer::modXModeSwitch();
+ 	//kdDebug() << "g_keyModMaskXAccel = " << g_keyModMaskXAccel
+ 	//	<< "g_keyModMaskXOnOrOff = " << g_keyModMaskXOnOrOff << endl;
+ }
+--- kdelibs.orig/kdecore/kkeynative.h
++++ kdelibs.patched/kdecore/kkeynative.h
+@@ -235,6 +235,13 @@
+ 	 */
+ 	static uint modXScrollLock();
+ 
++	/**
++	 * Returns the X11 Mode_switch modifier mask/flag.
++	 * @return the X11 Mode_switch modifier mask/flag.
++	 * @see accelModMaskX()
++	 */
++	static uint modXModeSwitch();
++
+  private:
+ 	uint m_code, m_mod, m_sym;
+ 	KKeyNativePrivate* d;
+--- kdelibs.orig/kdecore/kkeyserver_x11.cpp
++++ kdelibs.patched/kdecore/kkeyserver_x11.cpp
+@@ -283,13 +283,13 @@
+ //---------------------------------------------------------------------
+ static bool g_bInitializedMods, g_bInitializedVariations, g_bInitializedKKeyLabels;
+ static bool g_bMacLabels;
+-static uint g_modXNumLock, g_modXScrollLock;
++static uint g_modXNumLock, g_modXScrollLock, g_modXModeSwitch;
+ 
+ bool initializeMods()
+ {
+ 	XModifierKeymap* xmk = XGetModifierMapping( qt_xdisplay() );
+ 
+-	g_rgModInfo[3].modX = g_modXNumLock = g_modXScrollLock = 0;
++	g_rgModInfo[3].modX = g_modXNumLock = g_modXScrollLock = g_modXModeSwitch = 0;
+ 
+         int min_keycode, max_keycode;
+         int keysyms_per_keycode = 0;
+@@ -313,6 +313,7 @@
+ 			case XK_Meta_L:
+ 			case XK_Meta_R:      if( !g_rgModInfo[3].modX ) g_rgModInfo[3].modX = mask; break; // Win alternate
+ 			case XK_Scroll_Lock: g_modXScrollLock = mask; break;  // Normally Mod5Mask
++			case XK_Mode_switch: g_modXModeSwitch = mask; break;
+ 		}
+ 	}
+ 
+@@ -533,6 +534,7 @@
+ uint modXNumLock()    { if( !g_bInitializedMods ) { initializeMods(); } return g_modXNumLock; }
+ uint modXWin()        { if( !g_bInitializedMods ) { initializeMods(); } return g_rgModInfo[3].modX; }
+ uint modXScrollLock() { if( !g_bInitializedMods ) { initializeMods(); } return g_modXScrollLock; }
++uint modXModeSwitch() { if( !g_bInitializedMods ) { initializeMods(); } return g_modXModeSwitch; }
+ 
+ uint accelModMaskX()
+ {