diff options
| author | marcus <marcus@df743ca5-7f9a-e211-a948-0013205c9059> | 2006-11-05 04:21:37 +0800 |
|---|---|---|
| committer | marcus <marcus@df743ca5-7f9a-e211-a948-0013205c9059> | 2006-11-05 04:21:37 +0800 |
| commit | fc8778b1c265da7cae980c2785ce6d74885b717c (patch) | |
| tree | c0633b191f55e70827f18e70ed82587fc71591a1 /x11/libxklavier/files | |
| parent | a91dbfc9398c4e3f6ad0dc51a19edce7fafb7040 (diff) | |
| download | marcuscom-ports-fc8778b1c265da7cae980c2785ce6d74885b717c.tar marcuscom-ports-fc8778b1c265da7cae980c2785ce6d74885b717c.tar.gz marcuscom-ports-fc8778b1c265da7cae980c2785ce6d74885b717c.tar.bz2 marcuscom-ports-fc8778b1c265da7cae980c2785ce6d74885b717c.tar.lz marcuscom-ports-fc8778b1c265da7cae980c2785ce6d74885b717c.tar.xz marcuscom-ports-fc8778b1c265da7cae980c2785ce6d74885b717c.tar.zst marcuscom-ports-fc8778b1c265da7cae980c2785ce6d74885b717c.zip | |
Update to 3.1.
git-svn-id: svn://creme-brulee.marcuscom.com/ports/trunk@7858 df743ca5-7f9a-e211-a948-0013205c9059
Diffstat (limited to 'x11/libxklavier/files')
| -rw-r--r-- | x11/libxklavier/files/patch-configure | 35 | ||||
| -rw-r--r-- | x11/libxklavier/files/patch-libxklavier_xklavier.c | 11 | ||||
| -rw-r--r-- | x11/libxklavier/files/patch-libxklavier_xklavier_props.c | 15 |
3 files changed, 61 insertions, 0 deletions
diff --git a/x11/libxklavier/files/patch-configure b/x11/libxklavier/files/patch-configure new file mode 100644 index 000000000..d6d10d941 --- /dev/null +++ b/x11/libxklavier/files/patch-configure @@ -0,0 +1,35 @@ +--- configure.orig Sat Nov 4 15:13:39 2006 ++++ configure Sat Nov 4 15:14:10 2006 +@@ -23045,9 +23045,9 @@ fi + + { echo "$as_me:$LINENO: checking whether at least one libxklavier backend is enabled" >&5 + echo $ECHO_N "checking whether at least one libxklavier backend is enabled... $ECHO_C" >&6; } +-if test \( "$enable_xkb_support" == "yes" -a \ +- "$libxkbfile_present" == "yes" \) -o \ +- "$enable_xmodmap_support" == "yes" ; then ++if test \( "$enable_xkb_support" = "yes" -a \ ++ "$libxkbfile_present" = "yes" \) -o \ ++ "$enable_xmodmap_support" = "yes" ; then + { echo "$as_me:$LINENO: result: yes" >&5 + echo "${ECHO_T}yes" >&6; } + else +@@ -24885,8 +24885,8 @@ fi + + echo '**********************************************************' + echo ' Libxklavier is configured with the following backends:' +-if test "$enable_xkb_support" == "yes" ; then +- if test "$libxkbfile_present" == "yes" ; then ++if test "$enable_xkb_support" = "yes" ; then ++ if test "$libxkbfile_present" = "yes" ; then + echo " XKB, libxkbfile is present" + echo " default ruleset: $xkb_default_ruleset" + echo " base: $xkb_base" +@@ -24894,7 +24894,7 @@ if test "$enable_xkb_support" == "yes" ; + echo " XKB, libxkbfile is NOT present" + fi + fi +-if test "$enable_xmodmap_support" == "yes" ; then ++if test "$enable_xmodmap_support" = "yes" ; then + echo " xmodmap, default ruleset: $xmodmap_default_ruleset" + echo " base: $xmodmap_base" + fi diff --git a/x11/libxklavier/files/patch-libxklavier_xklavier.c b/x11/libxklavier/files/patch-libxklavier_xklavier.c new file mode 100644 index 000000000..d4b14aee6 --- /dev/null +++ b/x11/libxklavier/files/patch-libxklavier_xklavier.c @@ -0,0 +1,11 @@ +--- libxklavier/xklavier.c.orig Sat Apr 15 21:14:40 2006 ++++ libxklavier/xklavier.c Tue Jun 13 00:07:32 2006 +@@ -394,7 +394,7 @@ xkl_default_log_appender(const gchar fil + gint level, const gchar format[], va_list args) + { + time_t now = time(NULL); +- fprintf(stdout, "[%08ld,%03d,%s:%s/] \t", now, level, file, ++ fprintf(stdout, "[%08ld,%03d,%s:%s/] \t", (long)now, level, file, + function); + vfprintf(stdout, format, args); + } diff --git a/x11/libxklavier/files/patch-libxklavier_xklavier_props.c b/x11/libxklavier/files/patch-libxklavier_xklavier_props.c new file mode 100644 index 000000000..a56ec7896 --- /dev/null +++ b/x11/libxklavier/files/patch-libxklavier_xklavier_props.c @@ -0,0 +1,15 @@ +--- libxklavier/xklavier_props.c.orig Sun Apr 16 20:51:36 2006 ++++ libxklavier/xklavier_props.c Tue Jun 13 00:11:24 2006 +@@ -355,10 +355,8 @@ xkl_config_rec_get_from_root_window_prop + --varlen); + var[varlen] = '\0'; + /* Resize the original layout */ +- ((char *) +- g_realloc(*layout, +- laylen + 1))[laylen] = +- '\0'; ++ *layout = g_realloc(*layout, laylen + 1); ++ (*layout)[laylen] = '\0'; + } + } + layout++; |