diff options
| author | pav <pav@FreeBSD.org> | 2004-10-13 00:49:13 +0800 |
|---|---|---|
| committer | pav <pav@FreeBSD.org> | 2004-10-13 00:49:13 +0800 |
| commit | 2517b75450c8c324dba72e59bbe333334ea23635 (patch) | |
| tree | 429c6545f2b26670b66dc02ffa08c26c1e526931 /x11/libxklavier | |
| parent | 2066300943a7374929857dc3339d9f603160f097 (diff) | |
| download | freebsd-ports-graphics-2517b75450c8c324dba72e59bbe333334ea23635.tar.gz freebsd-ports-graphics-2517b75450c8c324dba72e59bbe333334ea23635.tar.zst freebsd-ports-graphics-2517b75450c8c324dba72e59bbe333334ea23635.zip | |
- Fix build on 4.x
Diffstat (limited to 'x11/libxklavier')
| -rw-r--r-- | x11/libxklavier/files/patch-libxklavier-xklavier_config_xkb.c | 15 | ||||
| -rw-r--r-- | x11/libxklavier/files/patch-tests-test_config.c | 19 | ||||
| -rw-r--r-- | x11/libxklavier/files/patch-tests-test_monitor.c | 19 |
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 00000000000..946d2d5808b --- /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 00000000000..cc374f0b96d --- /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 00000000000..3fcc0842690 --- /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" ); |