- Fix build on 4.x

3 files changed, 53 insertions, 0 deletions

diff --git a/x11/libxklavier/files/patch-libxklavier-xklavier_config_xkb.c b/x11/libxklavier/files/patch-libxklavier-xklavier_config_xkb.c
new file mode 100644
index 000000000000..946d2d5808b9
--- /dev/null
+++ b/x11/libxklavier/files/patch-libxklavier-xklavier_config_xkb.c
@@ -0,0 +1,15 @@
+--- libxklavier/xklavier_config_xkb.c.orig	Fri Oct  1 22:04:54 2004
++++ libxklavier/xklavier_config_xkb.c	Tue Oct 12 18:44:59 2004
+@@ -184,10 +184,11 @@
+ 
+   if ( supportState == UNCHECKED )
+   {
++    XkbRF_RulesPtr rulesPtr;
+     XklDebug( 100, "!!! Checking multiple layouts support\n" );
+     supportState = NON_SUPPORTED;
+ #ifdef XKB_HEADERS_PRESENT
+-    XkbRF_RulesPtr rulesPtr = _XklLoadRulesSet();
++    rulesPtr = _XklLoadRulesSet();
+     if ( rulesPtr )
+     {
+       XkbRF_VarDefsRec varDefs;
diff --git a/x11/libxklavier/files/patch-tests-test_config.c b/x11/libxklavier/files/patch-tests-test_config.c
new file mode 100644
index 000000000000..cc374f0b96d2
--- /dev/null
+++ b/x11/libxklavier/files/patch-tests-test_config.c
@@ -0,0 +1,19 @@
+--- tests/test_config.c.orig	Fri Oct  1 21:52:02 2004
++++ tests/test_config.c	Tue Oct 12 18:46:32 2004
+@@ -46,6 +46,7 @@
+   const char* layouts = NULL;
+   const char* options = NULL;
+   int debugLevel = 0;
++  Display* dpy;
+ 
+   while (1)
+   {
+@@ -89,7 +90,7 @@
+     exit( 0 );
+   }
+ 
+-  Display* dpy = XOpenDisplay( NULL );
++  dpy = XOpenDisplay( NULL );
+   if ( dpy == NULL )
+   {
+     fprintf( stderr, "Could not open display\n" );
diff --git a/x11/libxklavier/files/patch-tests-test_monitor.c b/x11/libxklavier/files/patch-tests-test_monitor.c
new file mode 100644
index 000000000000..3fcc08426904
--- /dev/null
+++ b/x11/libxklavier/files/patch-tests-test_monitor.c
@@ -0,0 +1,19 @@
+--- tests/test_monitor.c.orig	Fri Oct  1 21:52:02 2004
++++ tests/test_monitor.c	Tue Oct 12 18:47:32 2004
+@@ -42,6 +42,7 @@
+   int c;
+   int debugLevel = 0;
+   XkbEvent ev;
++  Display* dpy;
+ 
+   while (1)
+   {
+@@ -63,7 +64,7 @@
+     }
+   }
+ 
+-  Display* dpy = XOpenDisplay( NULL );
++  dpy = XOpenDisplay( NULL );
+   if ( dpy == NULL )
+   {
+     fprintf( stderr, "Could not open display\n" );