summaryrefslogtreecommitdiff
path: root/desktop
diff options
context:
space:
mode:
authorRobby Workman <rworkman@slackbuilds.org>2010-05-23 16:37:54 -0500
committerRobby Workman <rworkman@slackbuilds.org>2010-05-23 23:21:46 -0500
commit1db8cf1729f493d065701b15b53e08b93e7fdfaa (patch)
tree71f498444e3383bc8c755dc497d9659d87c66a2f /desktop
parent4ee37778e39ef96fb0a6f0ec44e62de64e166bb3 (diff)
downloadslackbuilds-1db8cf1729f493d065701b15b53e08b93e7fdfaa.tar.gz
desktop/xfce4-xkb-plugin: Patched to use new libxklavier API.
Diffstat (limited to 'desktop')
-rw-r--r--desktop/xfce4-xkb-plugin/xfce4-xkb-plugin-libxklavier_api_chance.diff30
-rw-r--r--desktop/xfce4-xkb-plugin/xfce4-xkb-plugin.SlackBuild5
2 files changed, 35 insertions, 0 deletions
diff --git a/desktop/xfce4-xkb-plugin/xfce4-xkb-plugin-libxklavier_api_chance.diff b/desktop/xfce4-xkb-plugin/xfce4-xkb-plugin-libxklavier_api_chance.diff
new file mode 100644
index 0000000000..f7be125dc8
--- /dev/null
+++ b/desktop/xfce4-xkb-plugin/xfce4-xkb-plugin-libxklavier_api_chance.diff
@@ -0,0 +1,30 @@
+diff -Nur xfce4-xkb-plugin-0.5.3.3.orig//panel-plugin/xkb-config.c xfce4-xkb-plugin-0.5.3.3/panel-plugin/xkb-config.c
+--- xfce4-xkb-plugin-0.5.3.3.orig//panel-plugin/xkb-config.c 2009-03-06 07:16:03.000000000 -0600
++++ xfce4-xkb-plugin-0.5.3.3/panel-plugin/xkb-config.c 2010-05-23 16:34:51.141676108 -0500
+@@ -150,7 +150,7 @@
+ config->application_map = g_hash_table_new (g_direct_hash, NULL);
+
+ registry = xkl_config_registry_get_instance (config->engine);
+- xkl_config_registry_load (registry);
++ xkl_config_registry_load (registry, FALSE);
+
+ config_item = xkl_config_item_new ();
+
+@@ -214,7 +214,7 @@
+
+ gdk_window_remove_filter (NULL, (GdkFilterFunc) handle_xevent, NULL);
+
+- xkl_engine_stop_listen (config->engine);
++ xkl_engine_stop_listen (config->engine, XKLL_TRACK_KEYBOARD_STATE);
+ }
+
+ gint
+@@ -547,7 +547,7 @@
+ if (!config) return NULL;
+
+ registry = xkl_config_registry_get_instance (config->engine);
+- xkl_config_registry_load (registry);
++ xkl_config_registry_load (registry, FALSE);
+
+ return registry;
+ }
diff --git a/desktop/xfce4-xkb-plugin/xfce4-xkb-plugin.SlackBuild b/desktop/xfce4-xkb-plugin/xfce4-xkb-plugin.SlackBuild
index eecab91c15..4fcad18969 100644
--- a/desktop/xfce4-xkb-plugin/xfce4-xkb-plugin.SlackBuild
+++ b/desktop/xfce4-xkb-plugin/xfce4-xkb-plugin.SlackBuild
@@ -71,6 +71,11 @@ find . \
\( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
-exec chmod 644 {} \;
+# Fixup the plugin for newer libxklavier api
+# Thanks to Christoph Wickert of the Fedora project :-)
+# http://lists.fedoraproject.org/pipermail/scm-commits/2010-January/384437.html
+patch -p1 < $CWD/xfce4-xkb-plugin-libxklavier_api_chance.diff
+
CFLAGS="$SLKCFLAGS" \
CXXFLAGS="$SLKCFLAGS" \
./configure \