diff options
| author |   David-John Willis <John.Willis@Distant-earth.com> | 2009-10-25 11:02:48 +0000 |
|---|---|---|
| committer |   Koen Kooi <koen@openembedded.org> | 2009-10-27 15:26:58 +0100 |
| commit | 599bbb2eaff6f0827b04ab5b2665303a22ea072e (patch) | |
| tree | 7690ca6aed080d1a4b8f816a1e300b8d3264b264 /recipes/xfce-base/xfce4-settings-4.6.1 | |
| parent | 6de8a003f930bfade8502cf80617009a9c96c278 (diff) | |
| download | openembedded-599bbb2eaff6f0827b04ab5b2665303a22ea072e.tar.gz | |
XFCE: Import all the 4.6.1 recipes (and a newer version of xfce-terminal).
Diffstat (limited to 'recipes/xfce-base/xfce4-settings-4.6.1')
3 files changed, 40 insertions, 0 deletions
diff --git a/recipes/xfce-base/xfce4-settings-4.6.1/xfce4-settings-4.6.1-configure.patch b/recipes/xfce-base/xfce4-settings-4.6.1/xfce4-settings-4.6.1-configure.patch new file mode 100644 index 0000000000..beb5857908 --- /dev/null +++ b/recipes/xfce-base/xfce4-settings-4.6.1/xfce4-settings-4.6.1-configure.patch @@ -0,0 +1,11 @@ +--- ./configure.ac.orig 2009-02-25 18:58:49.000000000 +0100 ++++ ./configure.ac 2009-03-01 11:14:33.000000000 +0100 +@@ -85,8 +85,8 @@ XDT_CHECK_PACKAGE([LIBXFCE4KBD_PRIVATE], + XDT_CHECK_PACKAGE([GLADE], [libglade-2.0], [2.0.0]) + XDT_CHECK_PACKAGE([XFCONF], [libxfconf-0], [4.6.0]) + XDT_CHECK_PACKAGE([DBUS_GLIB], [dbus-glib-1], [0.34]) +-XDT_CHECK_PACKAGE([XI], [xi], [1.0.0]) +-XDT_CHECK_PACKAGE([LIBX11], [x11], [1.0.0]) ++ XDT_CHECK_PACKAGE([XI], [xi], [1.0.0]) ++#XDT_CHECK_PACKAGE([LIBX11], [x11], [1.0.0]) + XDT_CHECK_PACKAGE([LIBWNCK], [libwnck-1.0], [2.12.0]) diff --git a/recipes/xfce-base/xfce4-settings-4.6.1/xfce4-settings-4.6.1-libxklavier.patch b/recipes/xfce-base/xfce4-settings-4.6.1/xfce4-settings-4.6.1-libxklavier.patch new file mode 100644 index 0000000000..3268ecad26 --- /dev/null +++ b/recipes/xfce-base/xfce4-settings-4.6.1/xfce4-settings-4.6.1-libxklavier.patch @@ -0,0 +1,12 @@ +diff -ur xfce4-settings-4.6.1.orig/dialogs/keyboard-settings/xfce-keyboard-settings.c xfce4-settings-4.6.1/dialogs/keyboard-settings/xfce-keyboard-settings.c +--- xfce4-settings-4.6.1.orig/dialogs/keyboard-settings/xfce-keyboard-settings.c 2009-03-02 19:48:00.000000000 +0200 ++++ xfce4-settings-4.6.1/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"); diff --git a/recipes/xfce-base/xfce4-settings-4.6.1/xfce4-settings-4.6.1-workspaces.c.patch b/recipes/xfce-base/xfce4-settings-4.6.1/xfce4-settings-4.6.1-workspaces.c.patch new file mode 100644 index 0000000000..6e604050e6 --- /dev/null +++ b/recipes/xfce-base/xfce4-settings-4.6.1/xfce4-settings-4.6.1-workspaces.c.patch @@ -0,0 +1,17 @@ +--- xfce4-settings-helper/workspaces.c.orig 2009-01-25 15:29:31.000000000 +0100 ++++ xfce4-settings-helper/workspaces.c 2009-01-27 13:32:51.000000000 +0100 +@@ -129,9 +129,14 @@ xfce_workspaces_helper_set_workspace_nam + wnck_screen_force_update(screen); + + /* walk all the workspaces on this screen */ ++#if 0 + workspaces = wnck_screen_get_workspaces(screen); + for(li = workspaces, i = 0; li != NULL; li = li->next, i++) { + workspace = WNCK_WORKSPACE(li->data); ++#else ++ for(i = 0; i < wnck_screen_get_workspace_count(screen); i++) { ++ workspace = wnck_screen_get_workspace(screen, i); ++#endif + + /* check if we have a valid name in the array */ + if(n_names > i && names[i] != NULL && names[i] != '\0') { |