Added three patches needed for gcc-2.95. Approved by wiz.

4 files changed, 65 insertions, 1 deletions

diff --git a/x11/libxklavier/distinfo b/x11/libxklavier/distinfo
index dd90da2f173..5167356c24b 100644
--- a/x11/libxklavier/distinfo
+++ b/x11/libxklavier/distinfo
@@ -1,7 +1,10 @@
-$NetBSD: distinfo,v 1.11 2005/03/24 09:34:24 jmmv Exp $
+$NetBSD: distinfo,v 1.12 2005/04/07 09:33:55 rillig Exp $
 
 SHA1 (libxklavier-2.0.tar.gz) = 2eae2b8013be972172374fb5cc71a4f368c41d76
 RMD160 (libxklavier-2.0.tar.gz) = a8f219a61f47ed1bb0f801d0e78512b4275e0082
 Size (libxklavier-2.0.tar.gz) = 435898 bytes
 SHA1 (patch-aa) = bbb3a2d342e434eb06890ed5a3f26b3b753cc46b
 SHA1 (patch-ab) = e548e2117cad11e8171a0bd9c490d11a326e43a3
+SHA1 (patch-ac) = 9e3f731d524562e9e623728db0b7d13422df087b
+SHA1 (patch-ad) = 7cb35743da121ebed70bf4c488a61c2016c3b352
+SHA1 (patch-ae) = bfbcb0b04e8f818bd1a2c2b5592be158fd0f81da
diff --git a/x11/libxklavier/patches/patch-ac b/x11/libxklavier/patches/patch-ac
new file mode 100644
index 00000000000..29b2b49017d
--- /dev/null
+++ b/x11/libxklavier/patches/patch-ac
@@ -0,0 +1,19 @@
+$NetBSD: patch-ac,v 1.3 2005/04/07 09:33:55 rillig Exp $
+
+--- libxklavier/xklavier.c.orig	Sat Jan  8 00:54:36 2005
++++ libxklavier/xklavier.c	Sun Apr  3 17:42:44 2005
+@@ -1,3 +1,4 @@
++#include <stdlib.h>
+ #include <time.h>
+ 
+ #include <X11/Xatom.h>
+@@ -773,8 +774,7 @@ void _XklEnsureVTableInited( void )
+   if ( xklVTable == NULL )
+   {
+     XklDebug( 0, "ERROR: XKL VTable is NOT initialized.\n" );
+-    /* force the crash! */
+-    char *p = NULL; *p = '\0';
++    abort();
+   }
+ }
+ 
diff --git a/x11/libxklavier/patches/patch-ad b/x11/libxklavier/patches/patch-ad
new file mode 100644
index 00000000000..317fd482c43
--- /dev/null
+++ b/x11/libxklavier/patches/patch-ad
@@ -0,0 +1,24 @@
+$NetBSD: patch-ad,v 1.1 2005/04/07 09:33:55 rillig Exp $
+
+--- libxklavier/xklavier_evt_xmm.c.orig	Fri Jan  7 03:58:03 2005
++++ libxklavier/xklavier_evt_xmm.c	Sun Apr  3 17:44:48 2005
+@@ -13,15 +13,16 @@ static int _XklXmmKeypressEventHandler( 
+ {
+   if( _xklListenerType & XKLL_MANAGE_LAYOUTS )
+   {
+-    XklDebug( 200, "Processing the KeyPress event\n" );
+     int currentShortcut = 0;
+-    const XmmSwitchOptionPtr sop = _XklXmmFindSwitchOption( kpe->keycode, 
++    XmmSwitchOptionPtr sop;
++    XklDebug( 200, "Processing the KeyPress event\n" );
++    sop = _XklXmmFindSwitchOption( kpe->keycode, 
+                                                             kpe->state,
+                                                             &currentShortcut );
+     if( sop != NULL )
+     {
+-      XklDebug( 150, "It is THE shortcut\n" );
+       XklState state;
++      XklDebug( 150, "It is THE shortcut\n" );
+       _XklXmmGetRealState( &state );
+       if( state.group != -1 )
+       {
diff --git a/x11/libxklavier/patches/patch-ae b/x11/libxklavier/patches/patch-ae
new file mode 100644
index 00000000000..065bac47a55
--- /dev/null
+++ b/x11/libxklavier/patches/patch-ae
@@ -0,0 +1,18 @@
+$NetBSD: patch-ae,v 1.1 2005/04/07 09:33:55 rillig Exp $
+
+--- libxklavier/xklavier_xmm.c.orig	Fri Jan  7 15:20:23 2005
++++ libxklavier/xklavier_xmm.c	Sun Apr  3 17:43:18 2005
+@@ -65,11 +65,12 @@ void _XklXmmUngrabShortcuts( )
+ 
+ const XmmSwitchOptionPtr _XklXmmGetCurrentShortcut()
+ {
++  XmmSwitchOptionPtr switchOption;
+   const char* optionName = _XklXmmGetCurrentShortcutOptionName();
+   XklDebug( 150, "Configured switch option: [%s]\n", optionName );
+   if( optionName == NULL )
+     return NULL;
+-  XmmSwitchOptionPtr switchOption = allSwitchOptions;
++  switchOption = allSwitchOptions;
+   while( switchOption->optionName != NULL )
+   {
+     if( !strcmp( switchOption->optionName, optionName ) )