From 23f020f742aea622e5dd7aef81eb59c99f8ef000 Mon Sep 17 00:00:00 2001
From: Andreas Müller
Date: Mon, 16 Sep 2013 09:04:15 +0000
Subject: xfce4-settings: move to schnitzeltony's git repo to get new datetime
setter
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
I implemented a datetime setting dialog based on gnome-control-center and
submitted a pull-request in [1,2]. As long as it is not submitted - or as long
as I find no way to patch binary files (e.g. icons - I asked for that in [3] -
no response yet) we use the git repo and a copied branch of the pull-request
(just in case some feedback from xfce-devels requires modifcations).
Some patches had to be modified/removed to apply against mainline HEAD still.
Furthermore in 0002-mouse-settings-dialog-add-touchscreen-pointer-option.patch
label 'alignment8' was introduced mainline and we do not need mouse-dialog_ui.h
when building from git in maintainer-mode - this file is created during build
process.
[1] http://mail.xfce.org/pipermail/xfce4-dev/2013-September/030442.html
[2] https://bugzilla.xfce.org/show_bug.cgi?id=10354
[3] http://lists.openembedded.org/pipermail/openembedded-core/2013-September/083804.html
Signed-off-by: Andreas Müller
Signed-off-by: Martin Jansa
---
...the-settings-manager-window-size-bug-9384.patch | 155 ---
.../0001-add-cursor-theme-xfce-invisible.patch | 8 +-
...ngs-dialog-add-touchscreen-pointer-option.patch | 1083 +-------------------
...tect-a-change-of-pointer-device-used-and-.patch | 10 +-
.../xfce4-settings/xfce4-settings_4.11.0.bb | 34 -
.../xfce4-settings/xfce4-settings_git.bb | 45 +
6 files changed, 57 insertions(+), 1278 deletions(-)
delete mode 100644 meta-xfce/recipes-xfce/xfce4-settings/xfce4-settings/0003-Remember-the-settings-manager-window-size-bug-9384.patch
delete mode 100644 meta-xfce/recipes-xfce/xfce4-settings/xfce4-settings_4.11.0.bb
create mode 100644 meta-xfce/recipes-xfce/xfce4-settings/xfce4-settings_git.bb
diff --git a/meta-xfce/recipes-xfce/xfce4-settings/xfce4-settings/0003-Remember-the-settings-manager-window-size-bug-9384.patch b/meta-xfce/recipes-xfce/xfce4-settings/xfce4-settings/0003-Remember-the-settings-manager-window-size-bug-9384.patch
deleted file mode 100644
index 8c1d1d9aa7..0000000000
--- a/meta-xfce/recipes-xfce/xfce4-settings/xfce4-settings/0003-Remember-the-settings-manager-window-size-bug-9384.patch
+++ /dev/null
@@ -1,155 +0,0 @@
-From b3b1986327b9b42ac6f9442443ff103f6565a323 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?J=C3=A9r=C3=B4me=20Guelfucci?=
-Date: Wed, 19 Dec 2012 09:53:58 +0100
-Subject: [PATCH] Remember the settings manager window size (bug #9384).
-
-Handy with pluggable dialogs, allows the user to get rid of most of the
-scrollbars.
-
-Upstream-Status: applied
----
- xfce4-settings-manager/Makefile.am | 2 +
- xfce4-settings-manager/main.c | 13 +++++++
- .../xfce-settings-manager-dialog.c | 38 +++++++++++++++-----
- 3 files changed, 44 insertions(+), 9 deletions(-)
-
-diff --git a/xfce4-settings-manager/Makefile.am b/xfce4-settings-manager/Makefile.am
-index c6bdc2d..99f9b3f 100644
---- a/xfce4-settings-manager/Makefile.am
-+++ b/xfce4-settings-manager/Makefile.am
-@@ -20,6 +20,7 @@ xfce4_settings_manager_CFLAGS = \
- $(LIBXFCE4UTIL_CFLAGS) \
- $(LIBXFCE4UI_CFLAGS) \
- $(GARCON_CFLAGS) \
-+ $(XFCONF_CFLAGS) \
- $(EXO_CFLAGS) \
- $(PLATFORM_CFLAGS)
-
-@@ -31,6 +32,7 @@ xfce4_settings_manager_LDADD = \
- $(GTK_LIBS) \
- $(LIBXFCE4UTIL_LIBS) \
- $(LIBXFCE4UI_LIBS) \
-+ $(XFCONF_LIBS) \
- $(EXO_LIBS) \
- $(GARCON_LIBS)
-
-diff --git a/xfce4-settings-manager/main.c b/xfce4-settings-manager/main.c
-index 3a65879..42bec66 100644
---- a/xfce4-settings-manager/main.c
-+++ b/xfce4-settings-manager/main.c
-@@ -28,6 +28,7 @@
- #include
- #include
- #include
-+#include
-
- #include "xfce-settings-manager-dialog.h"
-
-@@ -79,6 +80,16 @@ main(int argc,
- return EXIT_SUCCESS;
- }
-
-+ /* initialize xfconf */
-+ if (G_UNLIKELY (!xfconf_init (&error)))
-+ {
-+ /* print error and leave */
-+ g_critical ("Failed to connect to Xfconf daemon: %s", error->message);
-+ g_error_free (error);
-+
-+ return EXIT_FAILURE;
-+ }
-+
- garcon_set_environment ("XFCE");
-
- dialog = xfce_settings_manager_dialog_new ();
-@@ -95,5 +106,7 @@ main(int argc,
-
- gtk_main();
-
-+ xfconf_shutdown ();
-+
- return EXIT_SUCCESS;
- }
-diff --git a/xfce4-settings-manager/xfce-settings-manager-dialog.c b/xfce4-settings-manager/xfce-settings-manager-dialog.c
-index 043b143..39e33ff 100644
---- a/xfce4-settings-manager/xfce-settings-manager-dialog.c
-+++ b/xfce4-settings-manager/xfce-settings-manager-dialog.c
-@@ -35,6 +35,7 @@
-
- #include
- #include
-+#include
- #include
- #include
-
-@@ -55,6 +56,7 @@ struct _XfceSettingsManagerDialog
- {
- XfceTitledDialog __parent__;
-
-+ XfconfChannel *channel;
- GarconMenu *menu;
-
- GtkListStore *store;
-@@ -156,17 +158,19 @@ xfce_settings_manager_dialog_class_init (XfceSettingsManagerDialogClass *klass)
- static void
- xfce_settings_manager_dialog_init (XfceSettingsManagerDialog *dialog)
- {
-- GtkWidget *scroll;
-+ GtkWidget *align;
-+ GtkWidget *bbox;
- GtkWidget *dialog_vbox;
-- GtkWidget *viewport;
-- gchar *path;
-- GtkWidget *hbox;
-+ GtkWidget *ebox;
- GtkWidget *entry;
-- GtkWidget *align;
-- GList *children;
-+ GtkWidget *hbox;
- GtkWidget *header;
-- GtkWidget *ebox;
-- GtkWidget *bbox;
-+ GtkWidget *scroll;
-+ GtkWidget *viewport;
-+ GList *children;
-+ gchar *path;
-+
-+ dialog->channel = xfconf_channel_get ("xfce4-settings-manager");
-
- dialog->store = gtk_list_store_new (N_COLUMNS,
- G_TYPE_STRING,
-@@ -180,7 +184,9 @@ xfce_settings_manager_dialog_init (XfceSettingsManagerDialog *dialog)
- dialog->menu = garcon_menu_new_for_path (path != NULL ? path : MENUFILE);
- g_free (path);
-
-- gtk_window_set_default_size (GTK_WINDOW (dialog), 640, 500);
-+ gtk_window_set_default_size (GTK_WINDOW (dialog),
-+ xfconf_channel_get_int (dialog->channel, "/last/window-width", 640),
-+ xfconf_channel_get_int (dialog->channel, "/last/window-height", 500));
- xfce_settings_manager_dialog_set_title (dialog, NULL, NULL, NULL);
-
- dialog->button_back = xfce_gtk_button_new_mixed (GTK_STOCK_GO_BACK, _("All _Settings"));
-@@ -334,6 +340,20 @@ xfce_settings_manager_dialog_response (GtkDialog *widget,
- }
- else
- {
-+ GdkWindowState state;
-+ gint width, height;
-+
-+ /* Don't save the state for full-screen windows */
-+ state = gdk_window_get_state (GTK_WIDGET (widget)->window);
-+
-+ if ((state & (GDK_WINDOW_STATE_MAXIMIZED | GDK_WINDOW_STATE_FULLSCREEN)) == 0)
-+ {
-+ /* Save window size */
-+ gtk_window_get_size (GTK_WINDOW (widget), &width, &height);
-+ xfconf_channel_set_int (dialog->channel, "/last/window-width", width),
-+ xfconf_channel_set_int (dialog->channel, "/last/window-height", height);
-+ }
-+
- gtk_widget_destroy (GTK_WIDGET (widget));
- gtk_main_quit ();
- }
---
-1.7.4.4
-
diff --git a/meta-xfce/recipes-xfce/xfce4-settings/xfce4-settings/touchscreen/0001-add-cursor-theme-xfce-invisible.patch b/meta-xfce/recipes-xfce/xfce4-settings/xfce4-settings/touchscreen/0001-add-cursor-theme-xfce-invisible.patch
index 9272081f01..4d8e01d59f 100644
--- a/meta-xfce/recipes-xfce/xfce4-settings/xfce4-settings/touchscreen/0001-add-cursor-theme-xfce-invisible.patch
+++ b/meta-xfce/recipes-xfce/xfce4-settings/xfce4-settings/touchscreen/0001-add-cursor-theme-xfce-invisible.patch
@@ -11,7 +11,7 @@ Upstream-Status: Submitted [1]
[1] https://bugzilla.xfce.org/show_bug.cgi?id=9474
---
Makefile.am | 1 +
- configure.ac | 2 +
+ configure.ac.in | 2 +
cursors/Makefile.am | 178 +++++++++++++++++++++++++++++++++++++++++++++++++++
cursors/index.theme | 3 +
6 files changed, 184 insertions(+), 0 deletions(-)
@@ -30,10 +30,10 @@ index 3060bac..3f0dd1d 100644
dialogs \
xfce4-settings-manager \
xfce4-settings-editor \
-diff --git a/configure.ac b/configure.ac
+diff --git a/configure.ac.in b/configure.ac.in
index 0e7907d..1378049 100644
---- a/configure.ac
-+++ b/configure.ac
+--- a/configure.ac.in
++++ b/configure.ac.in
@@ -157,6 +157,7 @@ dnl *** Optional support for Xcursor ***
dnl ************************************
XDT_CHECK_OPTIONAL_PACKAGE([XCURSOR], [xcursor], [1.1.0],
diff --git a/meta-xfce/recipes-xfce/xfce4-settings/xfce4-settings/touchscreen/0002-mouse-settings-dialog-add-touchscreen-pointer-option.patch b/meta-xfce/recipes-xfce/xfce4-settings/xfce4-settings/touchscreen/0002-mouse-settings-dialog-add-touchscreen-pointer-option.patch
index d5a1f2c953..cf58f73d8d 100644
--- a/meta-xfce/recipes-xfce/xfce4-settings/xfce4-settings/touchscreen/0002-mouse-settings-dialog-add-touchscreen-pointer-option.patch
+++ b/meta-xfce/recipes-xfce/xfce4-settings/xfce4-settings/touchscreen/0002-mouse-settings-dialog-add-touchscreen-pointer-option.patch
@@ -13,7 +13,6 @@ Upstream-Status: Submitted [1]
---
dialogs/mouse-settings/main.c | 56 +++++++++++++++++++++++++++++
dialogs/mouse-settings/mouse-dialog.glade | 28 ++++++++++++++-
- dialogs/mouse-settings/mouse-dialog_ui.h | 1056 +++++++++++++++---------------
3 files changed, 422 insertions(+), 329 deletions(-)
diff --git a/dialogs/mouse-settings/main.c b/dialogs/mouse-settings/main.c
@@ -120,7 +119,7 @@ index d3aab0d..573c551 100644
+
-+
++
+ True
+ False
+ 0
@@ -148,1086 +147,6 @@ index d3aab0d..573c551 100644
-diff --git a/dialogs/mouse-settings/mouse-dialog_ui.h b/dialogs/mouse-settings/mouse-dialog_ui.h
-index 59806a2..8a68c3b 100644
---- a/dialogs/mouse-settings/mouse-dialog_ui.h
-+++ b/dialogs/mouse-settings/mouse-dialog_ui.h
-@@ -31,540 +31,555 @@ static const char mouse_dialog_ui[] =
- "True Falsegtk-revert-to-saved <"
-- "object class=\"XfceTitledDialog\" id=\"mouse-dialog\">False Mouse and Touchpad cent"
-- "er-on-parent preferences-desktop"
-- "-peripherals dialog Configure pointer device"
-- " behavior and appearanceTru"
-- "e False 2 True False endgtk-close TrueTrue<"
-- "/property>True False True False"
-- "property>False 0 gtk-help False True True True Tr"
-- "ue FalseFalse 0"
-- " True False True end0 "
-- "True True 6 True False 12 6True False 12 "
-- "True False De_vice: True devic"
-- "e-combobox 0.050000000000000003 False True0 True False T"
-- "rue True 1 False True 0 _Enable this device True True FalseFalse True<"
-- "/property>True False True 1 TrueTrueTrue False6 6 True False
0 none True False 12True False 6 6True False 12 _Right-handed TrueTrue False Fa"
-- "lse True True True<"
-- "/property> False <"
-- "property name=\"fill\">True0 _Left"
-- "-handed True True Fa"
-- "lse False "
-- "True True device-right-handed<"
-- "/property> False <"
-- "property name=\"fill\">True1 Tr"
-- "ue True 0 Reverse scroll d_irection True True FalseWhen selected, the scroll wheel will work "
-- "in the opposite direction False True <"
-- "property name=\"draw_indicator\">True TrueTrue1 "
-- "True False Buttons False True 0
TrueFalse 0 none <"
-+ "row> Disabled True"
-+ " Edge scrolling True|
"
-+ "Two-finger scrolling True|
Circular scrolling True|
16 48 24 1 11 False Mouse and Touchpad center-on-parent prefer"
-+ "ences-desktop-peripherals dialog"
-+ " Configure p"
-+ "ointer device behavior and appearance True False 12True False 6"
-- "property>3 2 12 6 TrueFalse 0 _Accelerat"
-- "ion: True device-acceleration-scale GTK_FILL GTK_FILL True True The factor at which the "
-- "pointer\'s speed will increase as the mouse is moveddelayeddevice-acceleration 1 right 1"
-- "2 True TrueThe number of pixels the pointer must move in a sh"
-- "ort time before it starts accelerating delayed device-thres"
-- "hold 0 0 right "
-- " 1 2 12 2 TrueFalse
end gtk-helpFalse True TrueTrue True False False 0 True <"
-+ "property name=\"label\">gtk-closeFalse True True True True "
-+ "object>False False 0 FalseTrue "
-+ "end 0 True True "
-+ "6 True False 12"
-+ "property>6 True False 12
True False De_vice: Truedevice-combobox 0.05000000000"
-+ "0000003 FalseTrue 0 True False True True 1 <"
-+ "property name=\"expand\">FalseTrue"
-+ "property>0 _Enable this device FalseTrue True FalseTrue True "
-+ " False True 1 True True <"
-+ "property name=\"visible\">TrueF"
-+ "alse 6 6 True False 0 noneTrue False12 True False0 _Sensitivity: True device-threshold"
-- "-scale 12 GTK_FILL TrueFalse 0 0 0 Reset to De_fa"
-- "ults True True True<"
-- "/property>Set the "
-- "acceleration and sensitivity for the selected device to the default val"
-- "ues False "
-- "image5 True 2 2 3
<"
-- "/child> True False Pointer Speed False True 1 TrueFalse"
-- " B_uttons and F"
-- "eedback True False True False6 6 6 6 True False"
-- "property>0 none True False 12True False 6 6Disable to_u"
-- "chpad while typing True "
-+ "property>12 Ri_ght-handed False True "
- "True False When selected, the touchpad will be disabled when the keyboard is"
-- " being used FalseTrue True True True 0 T_ap touchpad to click True True False
False Tr"
-- "ue True "
-- "True True 1 TrueFalse General T"
-- "rue "
-- "attributes> False True 0 True False0<"
-- "/property>none Tr"
-- "ue False 12 True False 6 6 True False 12 True False 0 Scro_lling mode: Truesynaptics-scroll "
-- "object>False True 0 True False synaptics-scroll-store0 1 TrueTrue1 True True 0 "
-- "child>Enable hori_zontal s"
-- "crolling True True F"
-- "alse False True True "
-- "True True 1 TrueFal"
-- "se ScrollingTrue False True 1 1 "
-- "packing>True False T_ouchpad True 1 False TrueFalse TrueTrue True False<"
-+ "/property>True 0 Le_ft-handed F"
-+ "alse True True False"
-+ " True True device-ri"
-+ "ght-handed False<"
-+ "/property>True 1 True True 0 Reverse scroll d_irection False True True FalseWhen selected, the scroll wheel will work in "
-+ "the opposite direction True<"
-+ "/property>True True "
-+ "True 1 True "
-+ "False Buttons <"
-+ "property name=\"expand\">FalseTrue"
-+ "property>0 "
-+ "True False 0 noneTrue False"
-+ "property>12 TrueFalse 6 6 TrueFalse 0 none True False12 True False 6 2 2 12 6 True False 0 "
-- "Tr_acking mode: True wacom-mode GTK_FILL True False 0_Rotation:True wacom-rotation 1 2GTK_FILL <"
-- "child>True False <"
-- "property name=\"model\">wacom-mode-store 1 12
True False wacom-rotat"
-- "ion-store 1 <"
-- "/attributes>1<"
-- "/property>2 1 2 <"
-- "/packing> T"
-+ "width\">6 4 2 126 T"
- "rue False General True False True 0 2 True False <"
-- "property name=\"label\" translatable=\"yes\">Table_tTrue 2 False "
-- "TrueTrue 2 True"
-- "property>False _Devices True "
-- "False True False 12 6True False 0none TrueFalse 12 True
Fa"
-- "lse 6 6 True False 0 Th_reshold: Truednd-threshold-scale True True 0 True<"
-- "/property>True The number of pixels the pointer mu"
-- "st move before a drag operation will start delayed dnd-thre"
-- "shold 0 right True True 1
TrueFals"
-- "e Drag and Drop"
-- " Fa"
-- "lse True 0 True False 0none TrueFalse 12 0 Acceleratio_n: Truedevice-acceleration-scale GTK_FILL GTK_FILL
"
-+ "True TrueThe factor at"
-+ " which the pointer\'s speed will increase as the mouse is moveddelayed device-acceleration 1 right <"
-+ "packing>1 2 TrueTrue The number of pixels the pointer must "
-+ "move in a short time before it starts accelerating delayed "
-+ "device-threshold 0 "
-+ "0 righ"
-+ "t 12 1 2 True False 6 6 True False 0 "
-- "Ti_me: Truedclick-time-scale True True 0 TrueTrue Two mouse clicks in less than this leng"
-- "th of time (in milliseconds) will be considered a double clickdelayed dclick-time 0 right TrueTrue1 True False 0D_istance: Truedclick-distance-scale True True2 "
-- " True True The mouse pointer cannot move farther than this distance betwee"
-- "n two clicks for them to be considered a double click delayeddclick-distance 0 right True True 3 True False "
-- "Double Click False True 1 1
True False _Behavior True 1 False TrueFalse12 12 True True au"
-- "tomatic automaticetched-in 200 True True Fa"
-- "lse True True 0 True False 6True False 0 none False 0 Sensitivit_y: True device"
-+ "-threshold-scale 1 2 GTK_FILL Tru"
-+ "e False 0 0 0 _Re"
-+ "set to Defaults Fals"
-+ "e True True TrueSet the acc"
-+ "eleration and sensitivity for the selected device to the default values"
-+ " image5 True 22"
-+ "property>3 True False0 00 _Touchscreen pointer False TrueTrue False When selected, no mouse pointer is displayed for this device"
-+ " and gtk TouchscreenMode is activated True True 2"
-+ " 3 4 "
-+ "True False 12 TrueFalse Pointer "
-+ "Speed "
-+ " False True 1 True False B_uttons and FeedbackTrue <"
-+ "property name=\"tab_fill\">False "
-+ "True False 6 6 True False 0n"
-+ "one "
-+ "True "
-+ "False 12 TrueFalse 6 12 "
-+ "order_width\">6 6 <"
-+ "property name=\"label\" translatable=\"yes\">Disable touchpad _while ty"
-+ "ping False True True False When selected, the to"
-+ "uchpad will be disabled when the keyboard is being usedTrueTrue True"
-+ "property>True 0 Tap touchpad to clic_k False True <"
-+ "property name=\"can_focus\">TrueFalse True True TrueTrue1 True False General True "
-+ " FalseTrue 0 True False 0 noneTrue False 12 TrueFals"
-+ "e 6 6 <"
-+ "property name=\"visible\">TrueF"
-+ "alse 12 TrueFalse 0 Scrolling"
-+ " _mode: True synaptics-scroll False T"
-+ "rue 0 True Falsesynaptics-scroll-store 1 0 True True 1 TrueTrue 0 "
-+ "Enable hori_zontal scrollingFalse TrueTrueFalse True T"
-+ "rue TrueTrue 1<"
-+ "/property>
True False <"
-+ "property name=\"label\" translatable=\"yes\">ScrollingTrue "
-+ "False True<"
-+ "/property>1 1 True False T_ouchpa"
-+ "d True 1 False
True False 66 True False "
-+ "0 none "
- "True False Cursor _size: True "
-- "spin1 FalseTrue 0 True True "
-- "False FalseTrue True theme-cursor-size True True False "
-- "True 1 12True False 6 "
-+ "2 212 6 True False 0 Trac_king mode: True w"
-+ "acom-mode GTK_"
-+ "FILL True False 0 _Rotation: True wacom-rotation 1 2 GTK_FILL True<"
-+ "/property>False wacom-mode-store 1 1 2 "
-+ "packing>True False wacom-rotation-store1 1 21<"
-+ "/property>2 True "
-+ "=\"GtkLabel\" id=\"label18\">True "
- "False Size FalseTrue 0 "
-- "Tru"
-+ "ranslatable=\"yes\">General Tru"
-+ "e F"
-+ "alse True 0 2 Tru"
- "e False 0 noneTrue False6 0 0 0 0 6 618 6 True False gtk-missing-image TrueTab_let True 2 False True True 2 "
-+ "True False_Devices Tru"
-+ "e False TrueFals"
-+ "e 12 6 True False 0 none True False12"
-+ " True False 6 6 <"
-+ "property name=\"visible\">TrueF"
-+ "alse 0 Th_reshold: True dnd-thres"
-+ "hold-scale True"
-+ "property>True 0 True TrueThe number of pixels the pointer must move before"
-+ " a drag operation will start delayed dnd-threshold0 ri"
-+ "ght TrueTrue 1<"
-+ "/property> True False <"
-+ "property name=\"label\" translatable=\"yes\">Drag and Drop False True 0"
-+ "property> True False 0 noneTrue False12 True False 6 6 True False 0 Ti_me: True dclick-t"
-+ "ime-scale TrueTrue 0 True TrueTwo mouse clicks in less than this length of time ("
-+ "in milliseconds) will be considered a double click delayed "
-+ "dclick-time 0 right True True 1 True"
-+ " False 0 D_"
-+ "istance: True dclick-distance-scale True True 2 "
-+ "child><"
-+ "property name=\"visible\">TrueT"
-+ "rue The "
-+ "mouse pointer cannot move farther than this distance between two clicks"
-+ " for them to be considered a double click delayed dclick-di"
-+ "stance 0 right True True 3 TrueFals"
-+ "e Double Click<"
-+ "/property> Fal"
-+ "se True 1 1 TrueFalse Preview False T"
-- "rue 1 False True 1 "
-- "packing>2 True False T_heme True 2 False True True "
-- "1 button1button2 164824 1 11
"
-- " Disabled Tr"
-- "ue|
Edge scrolling True|
Two-finger scrolling True|
Circular scrolling True|
ABSOLUTE Pen (absolute)|
RELATIVE<"
-- "/col> Mouse (relative)|
0 Non"
-- "e (right-handed)|
3 Half (left-handed)|
1 Clockwise|
2 Counterclockwise"
-- "|
"
-+ "l\" translatable=\"yes\">_BehaviorTrue 1"
-+ "property>False "
-+ "True False 1212"
-+ " True True automatic automatic etched-in200True True False TrueTrue 0 True False 6 <"
-+ "object class=\"GtkFrame\" id=\"frame5\">True"
-+ " False 0 noneTrue False12 True False 6 12 TrueFalse Cursor si_ze: True spin1 False True 0 "
-+ " <"
-+ "property name=\"visible\">TrueT"
-+ "rue FalseFalse True True th"
-+ "eme-cursor-size TrueTrue FalseTrue 1 "
-+ "child>True False Size False True 0 True False0 none True False 600 0
0 6 6 18"
-+ "6 TrueFals"
-+ "e gtk-missing-image True FalsePreview False True 1 False True 1 2 "
-+ "TrueFa"
-+ "lse _ThemeTrue
2 Fa"
-+ "lse True True 1 button2 button1"
-+ " ABSOLUTE Pen (ab"
-+ "solute)|
RELATIVE Mouse (relative)|
0 None (right-handed) 3 Half (l"
-+ "eft-handed)|
1 Clockwise|
2 Counterclockwise|
|
"
- };
-
--static const unsigned mouse_dialog_ui_length = 37588u;
-+static const unsigned mouse_dialog_ui_length = 38582u;
-
--
1.7.6.5
diff --git a/meta-xfce/recipes-xfce/xfce4-settings/xfce4-settings/touchscreen/0005-pointers-detect-a-change-of-pointer-device-used-and-.patch b/meta-xfce/recipes-xfce/xfce4-settings/xfce4-settings/touchscreen/0005-pointers-detect-a-change-of-pointer-device-used-and-.patch
index edcb4e1cd1..f4c28397da 100644
--- a/meta-xfce/recipes-xfce/xfce4-settings/xfce4-settings/touchscreen/0005-pointers-detect-a-change-of-pointer-device-used-and-.patch
+++ b/meta-xfce/recipes-xfce/xfce4-settings/xfce4-settings/touchscreen/0005-pointers-detect-a-change-of-pointer-device-used-and-.patch
@@ -133,7 +133,7 @@ index 62ebc60..32662cc 100644
(*G_OBJECT_CLASS (xfce_pointers_helper_parent_class)->finalize) (object);
}
-@@ -267,17 +295,17 @@ static void
+@@ -267,19 +295,19 @@ static void
xfce_pointers_helper_syndaemon_check (XfcePointersHelper *helper)
{
#ifdef DEVICE_PROPERTIES
@@ -146,7 +146,9 @@ index 62ebc60..32662cc 100644
- Atom *props;
- gint i, nprops;
- gboolean have_synaptics = FALSE;
-- gchar *args[] = { "syndaemon", "-i", "2.0", "-K", "-R", NULL };
+- gdouble disable_duration;
+- gchar disable_duration_string[64];
+- gchar *args[] = { "syndaemon", "-i", disable_duration_string, "-K", "-R", NULL };
- GError *error = NULL;
+ Display *xdisplay = GDK_DISPLAY ();
+ XDeviceInfo *device_list;
@@ -157,7 +159,9 @@ index 62ebc60..32662cc 100644
+ Atom *props;
+ gint i, nprops;
+ gboolean have_synaptics = FALSE;
-+ gchar *args[] = { "syndaemon", "-i", "2.0", "-K", "-R", NULL };
++ gdouble disable_duration;
++ gchar disable_duration_string[64];
++ gchar *args[] = { "syndaemon", "-i", disable_duration_string, "-K", "-R", NULL };
+ GError *error = NULL;
/* only stop a running daemon */
diff --git a/meta-xfce/recipes-xfce/xfce4-settings/xfce4-settings_4.11.0.bb b/meta-xfce/recipes-xfce/xfce4-settings/xfce4-settings_4.11.0.bb
deleted file mode 100644
index 4aac5a3746..0000000000
--- a/meta-xfce/recipes-xfce/xfce4-settings/xfce4-settings_4.11.0.bb
+++ /dev/null
@@ -1,34 +0,0 @@
-DESCRIPTION = "Xfce4 settings"
-SECTION = "x11/wm"
-LICENSE = "GPLv2"
-LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f"
-DEPENDS = "exo garcon gtk+ libxfce4util libxfce4ui xfconf dbus-glib libxi virtual/libx11 xrandr libnotify libxcursor libxklavier"
-
-inherit xfce
-
-SRC_URI += "file://0001-xsettings.xml-remove-trouble-causing-comment.patch \
- file://0002-xsettings.xml-Set-default-themes.patch \
- file://0003-Remember-the-settings-manager-window-size-bug-9384.patch \
- file://touchscreen/invisible \
- file://touchscreen/wait \
- file://touchscreen/0001-add-cursor-theme-xfce-invisible.patch \
- file://touchscreen/0002-mouse-settings-dialog-add-touchscreen-pointer-option.patch \
- file://touchscreen/0003-XfcePointersHelper-gets-a-pointer-to-XfceXSettingsHe.patch \
- file://touchscreen/0004-XfceXSettingsHelper-gets-a-property-touchscreen-poin.patch \
- file://touchscreen/0005-pointers-detect-a-change-of-pointer-device-used-and-.patch \
-"
-SRC_URI[md5sum] = "3bf42281b64b10b2691008cd693f7dbd"
-SRC_URI[sha256sum] = "4a4f1e79a58b524f3a6dd030b6fc687671b35566f847e6f516c6f84211191698"
-
-PACKAGECONFIG ??= ""
-PACKAGECONFIG[notify] = "--enable-libnotify,--disable-libnotify,libnotify"
-
-FILES_${PN} += "${libdir}/xfce4"
-
-do_install_prepend() {
- # somehow binary files are not patched correctly by oe-patch - so copy them
- cp ${WORKDIR}/touchscreen/invisible ${S}/cursors
- cp ${WORKDIR}/touchscreen/wait ${S}/cursors
-}
-
-RRECOMMENDS_${PN} += "gnome-icon-theme"
diff --git a/meta-xfce/recipes-xfce/xfce4-settings/xfce4-settings_git.bb b/meta-xfce/recipes-xfce/xfce4-settings/xfce4-settings_git.bb
new file mode 100644
index 0000000000..4b75dd7ee6
--- /dev/null
+++ b/meta-xfce/recipes-xfce/xfce4-settings/xfce4-settings_git.bb
@@ -0,0 +1,45 @@
+DESCRIPTION = "Xfce4 settings"
+SECTION = "x11/wm"
+LICENSE = "GPLv2"
+LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f"
+DEPENDS = "exo garcon gtk+ libxfce4util libxfce4ui xfconf dbus-glib libxi virtual/libx11 xrandr libnotify libxcursor libxklavier"
+
+inherit xfce
+
+SRC_URI = " git://gitorious.org/xfce/xfce4-settings.git;protocol=git;branch=for-oe \
+ file://0001-xsettings.xml-remove-trouble-causing-comment.patch \
+ file://0002-xsettings.xml-Set-default-themes.patch \
+ file://touchscreen/invisible \
+ file://touchscreen/wait \
+ file://touchscreen/0001-add-cursor-theme-xfce-invisible.patch \
+ file://touchscreen/0002-mouse-settings-dialog-add-touchscreen-pointer-option.patch \
+ file://touchscreen/0003-XfcePointersHelper-gets-a-pointer-to-XfceXSettingsHe.patch \
+ file://touchscreen/0004-XfceXSettingsHelper-gets-a-property-touchscreen-poin.patch \
+ file://touchscreen/0005-pointers-detect-a-change-of-pointer-device-used-and-.patch \
+"
+SRCREV = "b7a0e1fd77f5bb5c372223ff62aec7acf252f061"
+S = "${WORKDIR}/git"
+PV = "4.10.0+git${SRCPV}"
+
+EXTRA_OECONF += "--enable-maintainer-mode --disable-debug"
+
+PACKAGECONFIG ??= "${@base_contains('DISTRO_FEATURES','systemd','datetime-setter','',d)}"
+PACKAGECONFIG[datetime-setter] = "--enable-datetime-settings, --disable-datetime-settings,, tzdata"
+PACKAGECONFIG[notify] = "--enable-libnotify,--disable-libnotify,libnotify"
+
+do_configure_prepend() {
+ NOCONFIGURE=yes ./autogen.sh
+}
+
+FILES_${PN} += " \
+ ${libdir}/xfce4 \
+ ${datadir}/xfce4 \
+"
+
+do_install_prepend() {
+ # somehow binary files are not patched correctly by oe-patch - so copy them
+ cp ${WORKDIR}/touchscreen/invisible ${S}/cursors
+ cp ${WORKDIR}/touchscreen/wait ${S}/cursors
+}
+
+RRECOMMENDS_${PN} += "gnome-icon-theme"
--
cgit 1.2.3-korg