diff options
| author | George Sherwood | 2009-09-28 17:16:30 -0500 |
|---|---|---|
| committer | George Sherwood | 2009-09-28 17:16:30 -0500 |
| commit | 910e32ee8996e73b8f270d21a16b6d9ea93a2ba8 (patch) | |
| tree | 290be05a2bc4db6a651f7559e0d34f4d6cc0c165 | |
| parent | e652e23df36ce2dc66aa4cb4ba861ab4c6d271c3 (diff) | |
xfce4-settings: Added Gentoo patch to fix build issue with
libxklavier 4.0.
| -rw-r--r-- | xfce/xfce4-settings/HISTORY | 5 | ||||
| -rwxr-xr-x | xfce/xfce4-settings/PRE_BUILD | 3 | ||||
| -rw-r--r-- | xfce/xfce4-settings/xfce4-settings-4.6.1-libxklavier.patch | 12 |
3 files changed, 20 insertions, 0 deletions
diff --git a/xfce/xfce4-settings/HISTORY b/xfce/xfce4-settings/HISTORY index d726742eb3..835d823fca 100644 --- a/xfce/xfce4-settings/HISTORY +++ b/xfce/xfce4-settings/HISTORY @@ -1,3 +1,8 @@ +2009-09-27 George Sherwood <gsherwood@sourcemage.org> + * PRE_BUILD: Added to apply Gentoo patch + * xfce4-settings-4.6.1-libxklavier.patch: Gentoo patch to + fix build issues with libxklavier 4.0 + 2009-08-07 Donald Johnson <ltdonny@gmail.com> * DEPENDS: added libglade2 and libwnck deps diff --git a/xfce/xfce4-settings/PRE_BUILD b/xfce/xfce4-settings/PRE_BUILD new file mode 100755 index 0000000000..8d24c8302e --- /dev/null +++ b/xfce/xfce4-settings/PRE_BUILD @@ -0,0 +1,3 @@ +default_pre_build && +cd $SOURCE_DIRECTORY && +patch -p0 < $SCRIPT_DIRECTORY/xfce4-settings-4.6.1-libxklavier.patch diff --git a/xfce/xfce4-settings/xfce4-settings-4.6.1-libxklavier.patch b/xfce/xfce4-settings/xfce4-settings-4.6.1-libxklavier.patch new file mode 100644 index 0000000000..a0e0376eb8 --- /dev/null +++ b/xfce/xfce4-settings/xfce4-settings-4.6.1-libxklavier.patch @@ -0,0 +1,12 @@ +diff -ur dialogs/keyboard-settings/xfce-keyboard-settings.c dialogs/keyboard-settings/xfce-keyboard-settings.c +--- dialogs/keyboard-settings/xfce-keyboard-settings.c 2009-03-02 19:48:00.000000000 +0200 ++++ dialogs/keyboard-settings/xfce-keyboard-settings.c 2009-07-20 12:08:28.000000000 +0300 +@@ -378,7 +378,7 @@ + xkl_config_rec_get_from_server (settings->priv->xkl_rec_config, settings->priv->xkl_engine); + + settings->priv->xkl_registry = xkl_config_registry_get_instance (settings->priv->xkl_engine); +- xkl_config_registry_load (settings->priv->xkl_registry); ++ xkl_config_registry_load (settings->priv->xkl_registry, FALSE); + + /* Tab */ + xkb_tab_layout_vbox = glade_xml_get_widget (settings->priv->glade_xml, "xkb_tab_layout_vbox"); |