From bbbe3c86d23f3c134fe252be6d3063ded28b6985 Mon Sep 17 00:00:00 2001 From: George Sherwood Date: Mon, 28 Sep 2009 17:17:33 -0500 Subject: xfce4-xkb-plugin: Added Gentoo patch to fix build problem with libxklavier 4.0 --- xfce-plugins/xfce4-xkb-plugin/HISTORY | 5 +++++ xfce-plugins/xfce4-xkb-plugin/PRE_BUILD | 3 +++ .../xfce4-xkb-plugin-0.5.3.3-libxklavier.patch | 21 +++++++++++++++++++++ 3 files changed, 29 insertions(+) create mode 100755 xfce-plugins/xfce4-xkb-plugin/PRE_BUILD create mode 100644 xfce-plugins/xfce4-xkb-plugin/xfce4-xkb-plugin-0.5.3.3-libxklavier.patch (limited to 'xfce-plugins') diff --git a/xfce-plugins/xfce4-xkb-plugin/HISTORY b/xfce-plugins/xfce4-xkb-plugin/HISTORY index 2f3f9205c5..0fd5b86b93 100644 --- a/xfce-plugins/xfce4-xkb-plugin/HISTORY +++ b/xfce-plugins/xfce4-xkb-plugin/HISTORY @@ -1,3 +1,8 @@ +2009-09-27 George Sherwood + * PRE_BUILD: Added to apply Gentoo patch + * xfce4-xkb-plugin-0.5.3.3-libxklavier.patch: Gentoo patch to + fix build issues with libxklavier 4.0 + 2009-03-06 George Sherwood * DETAILS: Updated to version 0.5.3.3 diff --git a/xfce-plugins/xfce4-xkb-plugin/PRE_BUILD b/xfce-plugins/xfce4-xkb-plugin/PRE_BUILD new file mode 100755 index 0000000000..0fec640b39 --- /dev/null +++ b/xfce-plugins/xfce4-xkb-plugin/PRE_BUILD @@ -0,0 +1,3 @@ +default_pre_build && +cd $SOURCE_DIRECTORY && +patch -p0 < $SCRIPT_DIRECTORY/xfce4-xkb-plugin-0.5.3.3-libxklavier.patch diff --git a/xfce-plugins/xfce4-xkb-plugin/xfce4-xkb-plugin-0.5.3.3-libxklavier.patch b/xfce-plugins/xfce4-xkb-plugin/xfce4-xkb-plugin-0.5.3.3-libxklavier.patch new file mode 100644 index 0000000000..eb123f2783 --- /dev/null +++ b/xfce-plugins/xfce4-xkb-plugin/xfce4-xkb-plugin-0.5.3.3-libxklavier.patch @@ -0,0 +1,21 @@ +diff -ur panel-plugin/xkb-config.c panel-plugin/xkb-config.c +--- panel-plugin/xkb-config.c 2009-03-06 15:16:03.000000000 +0200 ++++ panel-plugin/xkb-config.c 2009-07-20 18:40:34.000000000 +0300 +@@ -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 (); + +@@ -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; + } -- cgit v1.2.3