diff options
Diffstat (limited to 'x11/libxklavier/files')
4 files changed, 23 insertions, 67 deletions
diff --git a/x11/libxklavier/files/patch-configure b/x11/libxklavier/files/patch-configure index 4de85e18100f..d6d10d94182c 100644 --- a/x11/libxklavier/files/patch-configure +++ b/x11/libxklavier/files/patch-configure @@ -1,33 +1,35 @@ ---- configure.orig Mon Dec 13 00:57:33 2004 -+++ configure Mon Dec 13 00:58:14 2004 -@@ -20135,9 +20135,9 @@ +--- 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 + { 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 \ -- "$xkb_headers_present" == "yes" \) -o \ -- "$enable_xmm_support" == "yes" ; then +- "$libxkbfile_present" == "yes" \) -o \ +- "$enable_xmodmap_support" == "yes" ; then +if test \( "$enable_xkb_support" = "yes" -a \ -+ "$xkb_headers_present" = "yes" \) -o \ -+ "$enable_xmm_support" = "yes" ; then - echo "$as_me:$LINENO: result: yes" >&5 - echo "${ECHO_T}yes" >&6 ++ "$libxkbfile_present" = "yes" \) -o \ ++ "$enable_xmodmap_support" = "yes" ; then + { echo "$as_me:$LINENO: result: yes" >&5 + echo "${ECHO_T}yes" >&6; } else -@@ -21744,14 +21744,14 @@ +@@ -24885,8 +24885,8 @@ fi echo '**********************************************************' echo ' Libxklavier is configured with the following backends:' -if test "$enable_xkb_support" == "yes" ; then -- if test "$xkb_headers_present" == "yes" ; then +- if test "$libxkbfile_present" == "yes" ; then +if test "$enable_xkb_support" = "yes" ; then -+ if test "$xkb_headers_present" = "yes" ; then - echo ' XKB (libxkbfile headers are present)' - else - echo ' XKB (but libxkbfile headers are NOT present)' ++ 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_xmm_support" == "yes" ; then -+if test "$enable_xmm_support" = "yes" ; then - echo ' xmodmap' +-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 - echo '**********************************************************' diff --git a/x11/libxklavier/files/patch-libxklavier_xklavier_config.c b/x11/libxklavier/files/patch-libxklavier_xklavier_config.c deleted file mode 100644 index fe26e5ca94ed..000000000000 --- a/x11/libxklavier/files/patch-libxklavier_xklavier_config.c +++ /dev/null @@ -1,24 +0,0 @@ ---- libxklavier/xklavier_config.c.orig Sat Apr 15 21:04:38 2006 -+++ libxklavier/xklavier_config.c Tue Feb 27 14:57:27 2007 -@@ -243,7 +243,7 @@ - return FALSE; - - nodes = xpath_obj->nodesetval; -- if (nodes != NULL && nodes->nodeTab != NULL) { -+ if (nodes != NULL && nodes->nodeTab != NULL && nodes->nodeNr > 0) { - rv = xkl_read_config_item(*nodes->nodeTab, pitem); - if (pnode != NULL) { - *pnode = *nodes->nodeTab; -@@ -275,7 +275,11 @@ - gchar * - xkl_strings_concat_comma_separated(gchar ** array) - { -- return g_strjoinv(",", array); -+ if (array) { -+ return g_strjoinv(",", array); -+ } else { -+ return g_strdup(""); -+ } - } - - void diff --git a/x11/libxklavier/files/patch-libxklavier_xklavier_config_i18n.c b/x11/libxklavier/files/patch-libxklavier_xklavier_config_i18n.c deleted file mode 100644 index 91d73cf112a3..000000000000 --- a/x11/libxklavier/files/patch-libxklavier_xklavier_config_i18n.c +++ /dev/null @@ -1,11 +0,0 @@ ---- libxklavier/xklavier_config_i18n.c.orig Tue Jun 13 00:12:44 2006 -+++ libxklavier/xklavier_config_i18n.c Tue Jun 13 00:13:05 2006 -@@ -108,7 +108,7 @@ xkl_locale_from_utf8(const gchar * utf8s - iconv_t converter; - gchar converted[XKL_MAX_CI_DESC_LENGTH]; - gchar *converted_start = converted; -- gchar *utf_start = (char *) utf8string; -+ const gchar *utf_start = (const char *) utf8string; - size_t clen = XKL_MAX_CI_DESC_LENGTH - 1; - const gchar *charset; - diff --git a/x11/libxklavier/files/patch-libxklavier_xklavier_xmm.c b/x11/libxklavier/files/patch-libxklavier_xklavier_xmm.c deleted file mode 100644 index 200a1bda64f9..000000000000 --- a/x11/libxklavier/files/patch-libxklavier_xklavier_xmm.c +++ /dev/null @@ -1,11 +0,0 @@ ---- libxklavier/xklavier_xmm.c.orig Sat Dec 16 01:25:29 2006 -+++ libxklavier/xklavier_xmm.c Sat Dec 16 01:29:39 2006 -@@ -107,7 +107,7 @@ xkl_xmm_find_switch_option(XklEngine * e - const XmmSwitchOption *rv = xkl_xmm_shortcut_get_current(engine); - - if (rv != NULL) { -- XmmShortcut *sc = rv->shortcuts; -+ const XmmShortcut *sc = rv->shortcuts; - while (sc->keysym != XK_VoidSymbol) { - if ((XKeysymToKeycode - (xkl_engine_get_display(engine), |