summaryrefslogtreecommitdiffstats
path: root/x11/libxklavier/files
diff options
context:
space:
mode:
authormarcus <marcus@df743ca5-7f9a-e211-a948-0013205c9059>2004-11-24 07:36:17 +0800
committermarcus <marcus@df743ca5-7f9a-e211-a948-0013205c9059>2004-11-24 07:36:17 +0800
commitd8f07daaae3323262859aecc95dde7b08d8661ff (patch)
tree23c115db4c19dd5bf35b56b2cc45c6f1134967b1 /x11/libxklavier/files
parent0470fe8a4adaccb216c0ce4901e0d726951220c8 (diff)
downloadmarcuscom-ports-d8f07daaae3323262859aecc95dde7b08d8661ff.tar
marcuscom-ports-d8f07daaae3323262859aecc95dde7b08d8661ff.tar.gz
marcuscom-ports-d8f07daaae3323262859aecc95dde7b08d8661ff.tar.bz2
marcuscom-ports-d8f07daaae3323262859aecc95dde7b08d8661ff.tar.lz
marcuscom-ports-d8f07daaae3323262859aecc95dde7b08d8661ff.tar.xz
marcuscom-ports-d8f07daaae3323262859aecc95dde7b08d8661ff.tar.zst
marcuscom-ports-d8f07daaae3323262859aecc95dde7b08d8661ff.zip
Add libxklavier, and update to 1.11.
git-svn-id: svn://creme-brulee.marcuscom.com/ports/trunk@3109 df743ca5-7f9a-e211-a948-0013205c9059
Diffstat (limited to 'x11/libxklavier/files')
-rw-r--r--x11/libxklavier/files/patch-libxklavier_xklavier.c14
-rw-r--r--x11/libxklavier/files/patch-libxklavier_xklavier_config_i18n.c11
2 files changed, 25 insertions, 0 deletions
diff --git a/x11/libxklavier/files/patch-libxklavier_xklavier.c b/x11/libxklavier/files/patch-libxklavier_xklavier.c
new file mode 100644
index 000000000..aab6f4207
--- /dev/null
+++ b/x11/libxklavier/files/patch-libxklavier_xklavier.c
@@ -0,0 +1,14 @@
+--- libxklavier/xklavier.c.orig Tue Nov 23 18:32:29 2004
++++ libxklavier/xklavier.c Tue Nov 23 18:32:48 2004
+@@ -700,9 +700,10 @@
+ {
+ if ( xklVTable == NULL )
+ {
++ char *p;
+ XklDebug( 0, "ERROR: XKL VTable is NOT initialized.\n" );
+ /* force the crash! */
+- char *p = NULL; *p = '\0';
++ p = NULL; *p = '\0';
+ }
+ }
+
diff --git a/x11/libxklavier/files/patch-libxklavier_xklavier_config_i18n.c b/x11/libxklavier/files/patch-libxklavier_xklavier_config_i18n.c
new file mode 100644
index 000000000..0ef120607
--- /dev/null
+++ b/x11/libxklavier/files/patch-libxklavier_xklavier_config_i18n.c
@@ -0,0 +1,11 @@
+--- libxklavier/xklavier_config_i18n.c.orig Tue Nov 23 18:33:37 2004
++++ libxklavier/xklavier_config_i18n.c Tue Nov 23 18:34:30 2004
+@@ -106,7 +106,7 @@
+ iconv_t converter;
+ static char converted[XKL_MAX_CI_DESC_LENGTH];
+ char *convertedStart = converted;
+- char *utfStart = ( char * ) utf8string;
++ const char *utfStart = ( const char * ) utf8string;
+ size_t clen = XKL_MAX_CI_DESC_LENGTH - 1;
+ const char *charset;
+