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[] = - "TrueFalsegtk-revert-to-saved<" -- "object class=\"XfceTitledDialog\" id=\"mouse-dialog\">FalseMouse and Touchpadcent" -- "er-on-parentpreferences-desktop" -- "-peripheralsdialogConfigure pointer device" -- " behavior and appearanceTru" -- "eFalse2TrueFalseendgtk-closeTrueTrue<" -- "/property>TrueFalseTrueFalseFalse0gtk-helpFalseTrueTrueTrueTr" -- "ueFalseFalse0" -- "TrueFalseTrueend0" -- "TrueTrue6TrueFalse126TrueFalse12" -- "TrueFalseDe_vice:Truedevic" -- "e-combobox0.050000000000000003FalseTrue0TrueFalseT" -- "rueTrue1FalseTrue0_Enable this deviceTrueTrueFalseFalseTrue<" -- "/property>TrueFalseTrue1TrueTrueTrueFalse66TrueFalse0noneTrueFalse12TrueFalse66TrueFalse12_Right-handedTrueTrueFalseFa" -- "lseTrueTrueTrue<" -- "/property>False<" -- "property name=\"fill\">True0_Left" -- "-handedTrueTrueFa" -- "lseFalse" -- "TrueTruedevice-right-handed<" -- "/property>False<" -- "property name=\"fill\">True1Tr" -- "ueTrue0Reverse scroll d_irectionTrueTrueFalseWhen selected, the scroll wheel will work " -- "in the opposite directionFalseTrue<" -- "property name=\"draw_indicator\">TrueTrueTrue1" -- "TrueFalseButtonsFalseTrue0TrueFalse0none<" -+ "row>DisabledTrue" -+ "Edge scrollingTrue" -+ "Two-finger scrollingTrueCircular scrollingTrue164824111FalseMouse and Touchpadcenter-on-parentprefer" -+ "ences-desktop-peripheralsdialog" -+ "Configure p" -+ "ointer device behavior and appearanceTrueFalse12TrueFalse632126TrueFalse0_Accelerat" -- "ion:Truedevice-acceleration-scaleGTK_FILLGTK_FILLTrueTrueThe factor at which the " -- "pointer\'s speed will increase as the mouse is moveddelayeddevice-acceleration1right1" -- "2TrueTrueThe number of pixels the pointer must move in a sh" -- "ort time before it starts acceleratingdelayeddevice-thres" -- "hold00right" -- "12122TrueFalseendgtk-helpFalseTrueTrueTrueTrueFalseFalse0True<" -+ "property name=\"label\">gtk-closeFalseTrueTrueTrueTrueFalseFalse0FalseTrue" -+ "end0TrueTrue" -+ "6TrueFalse126TrueFalse12TrueFalseDe_vice:Truedevice-combobox0.05000000000" -+ "0000003FalseTrue0TrueFalseTrueTrue1<" -+ "property name=\"expand\">FalseTrue0_Enable this deviceFalseTrueTrueFalseTrueTrue" -+ "FalseTrue1TrueTrue<" -+ "property name=\"visible\">TrueF" -+ "alse66TrueFalse0noneTrueFalse12TrueFalse0_Sensitivity:Truedevice-threshold" -- "-scale12GTK_FILLTrueFalse000Reset to De_fa" -- "ultsTrueTrueTrue<" -- "/property>Set the " -- "acceleration and sensitivity for the selected device to the default val" -- "uesFalse" -- "image5True223<" -- "/child>TrueFalsePointer SpeedFalseTrue1TrueFalse" -- "B_uttons and F" -- "eedbackTrueFalseTrueFalse6666TrueFalse0noneTrueFalse12TrueFalse66Disable to_u" -- "chpad while typingTrue" -+ "property>12Ri_ght-handedFalseTrue" - "TrueFalseWhen selected, the touchpad will be disabled when the keyboard is" -- " being usedFalseTrueTrueTrueTrue0T_ap touchpad to clickTrueTrueFalseFalseTr" -- "ueTrue" -- "TrueTrue1TrueFalseGeneralT" -- "rueFalseTrue0TrueFalse0<" -- "/property>noneTr" -- "ueFalse12TrueFalse66TrueFalse12TrueFalse0Scro_lling mode:Truesynaptics-scrollFalseTrue0TrueFalsesynaptics-scroll-store01TrueTrue1TrueTrue0Enable hori_zontal s" -- "crollingTrueTrueF" -- "alseFalseTrueTrue" -- "TrueTrue1TrueFal" -- "seScrollingTrueFalseTrue11TrueFalseT_ouchpadTrue1FalseTrueFalseTrueTrueTrueFalse<" -+ "/property>True0Le_ft-handedF" -+ "alseTrueTrueFalse" -+ "TrueTruedevice-ri" -+ "ght-handedFalse<" -+ "/property>True1TrueTrue0Reverse scroll d_irectionFalseTrueTrueFalseWhen selected, the scroll wheel will work in " -+ "the opposite directionTrue<" -+ "/property>TrueTrue" -+ "True1True" -+ "FalseButtons<" -+ "property name=\"expand\">FalseTrue0" -+ "TrueFalse0noneTrueFalse12TrueFalse66TrueFalse0noneTrueFalse12TrueFalse622126TrueFalse0" -- "Tr_acking mode:Truewacom-modeGTK_FILLTrueFalse0_Rotation:Truewacom-rotation12GTK_FILL<" -- "child>TrueFalse<" -- "property name=\"model\">wacom-mode-store112TrueFalsewacom-rotat" -- "ion-store1<" -- "/attributes>1<" -- "/property>212<" -- "/packing>T" -+ "width\">642126T" - "rueFalseGeneralTrueFalseTrue02TrueFalse<" -- "property name=\"label\" translatable=\"yes\">Table_tTrue2False" -- "TrueTrue2TrueFalse_DevicesTrue" -- "FalseTrueFalse126TrueFalse0noneTrueFalse12TrueFa" -- "lse66TrueFalse0Th_reshold:Truednd-threshold-scaleTrueTrue0True<" -- "/property>TrueThe number of pixels the pointer mu" -- "st move before a drag operation will startdelayeddnd-thre" -- "shold0rightTrueTrue1TrueFals" -- "eDrag and Drop" -- "Fa" -- "lseTrue0TrueFalse0noneTrueFalse120Acceleratio_n:Truedevice-acceleration-scaleGTK_FILLGTK_FILL" -+ "TrueTrueThe factor at" -+ " which the pointer\'s speed will increase as the mouse is moveddelayeddevice-acceleration1right<" -+ "packing>12TrueTrueThe number of pixels the pointer must " -+ "move in a short time before it starts acceleratingdelayed" -+ "device-threshold0" -+ "0righ" -+ "t1212TrueFalse66TrueFalse0" -- "Ti_me:Truedclick-time-scaleTrueTrue0TrueTrueTwo mouse clicks in less than this leng" -- "th of time (in milliseconds) will be considered a double clickdelayeddclick-time0rightTrueTrue1TrueFalse0D_istance:Truedclick-distance-scaleTrueTrue2" -- "TrueTrueThe mouse pointer cannot move farther than this distance betwee" -- "n two clicks for them to be considered a double clickdelayeddclick-distance0rightTrueTrue3TrueFalse" -- "Double ClickFalseTrue11TrueFalse_BehaviorTrue1FalseTrueFalse1212TrueTrueau" -- "tomaticautomaticetched-in200TrueTrueFa" -- "lseTrueTrue0TrueFalse6TrueFalse0noneFalse0Sensitivit_y:Truedevice" -+ "-threshold-scale12GTK_FILLTru" -+ "eFalse000_Re" -+ "set to DefaultsFals" -+ "eTrueTrueTrueSet the acc" -+ "eleration and sensitivity for the selected device to the default values" -+ "image5True223TrueFalse000_Touchscreen pointerFalseTrueTrueFalseWhen selected, no mouse pointer is displayed for this device" -+ " and gtk TouchscreenMode is activatedTrueTrue2" -+ "34" -+ "TrueFalse12TrueFalsePointer " -+ "Speed" -+ "FalseTrue1TrueFalseB_uttons and FeedbackTrue<" -+ "property name=\"tab_fill\">False" -+ "TrueFalse66TrueFalse0n" -+ "one" -+ "True" -+ "False12TrueFalse612" -+ "order_width\">66<" -+ "property name=\"label\" translatable=\"yes\">Disable touchpad _while ty" -+ "pingFalseTrueTrueFalseWhen selected, the to" -+ "uchpad will be disabled when the keyboard is being usedTrueTrueTrueTrue0Tap touchpad to clic_kFalseTrue<" -+ "property name=\"can_focus\">TrueFalseTrueTrueTrueTrue1TrueFalseGeneralTrue" -+ "FalseTrue0TrueFalse0noneTrueFalse12TrueFals" -+ "e66<" -+ "property name=\"visible\">TrueF" -+ "alse12TrueFalse0Scrolling" -+ " _mode:Truesynaptics-scrollFalseT" -+ "rue0TrueFalsesynaptics-scroll-store10TrueTrue1TrueTrue0" -+ "Enable hori_zontal scrollingFalseTrueTrueFalseTrueT" -+ "rueTrueTrue1<" -+ "/property>TrueFalse<" -+ "property name=\"label\" translatable=\"yes\">ScrollingTrue" -+ "FalseTrue<" -+ "/property>11TrueFalseT_ouchpa" -+ "dTrue1FalseTrueFalse66TrueFalse" -+ "0none" - "TrueFalseCursor _size:True" -- "spin1FalseTrue0TrueTrue" -- "FalseFalseTrueTruetheme-cursor-sizeTrueTrueFalse" -- "True112TrueFalse6" -+ "22126TrueFalse0Trac_king mode:Truew" -+ "acom-modeGTK_" -+ "FILLTrueFalse0_Rotation:Truewacom-rotation12GTK_FILLTrue<" -+ "/property>Falsewacom-mode-store112TrueFalsewacom-rotation-store1121<" -+ "/property>2True" -+ "=\"GtkLabel\" id=\"label18\">True" - "FalseSizeFalseTrue0" -- "Tru" -+ "ranslatable=\"yes\">GeneralTru" -+ "eF" -+ "alseTrue02Tru" - "eFalse0noneTrueFalse6000066186TrueFalsegtk-missing-imageTrueTab_letTrue2FalseTrueTrue2" -+ "TrueFalse_DevicesTru" -+ "eFalseTrueFals" -+ "e126TrueFalse0noneTrueFalse12" -+ "TrueFalse66<" -+ "property name=\"visible\">TrueF" -+ "alse0Th_reshold:Truednd-thres" -+ "hold-scaleTrueTrue0TrueTrueThe number of pixels the pointer must move before" -+ " a drag operation will startdelayeddnd-threshold0ri" -+ "ghtTrueTrue1<" -+ "/property>TrueFalse<" -+ "property name=\"label\" translatable=\"yes\">Drag and DropFalseTrue0TrueFalse0noneTrueFalse12TrueFalse66TrueFalse0Ti_me:Truedclick-t" -+ "ime-scaleTrueTrue0TrueTrueTwo mouse clicks in less than this length of time (" -+ "in milliseconds) will be considered a double clickdelayed" -+ "dclick-time0rightTrueTrue1True" -+ "False0D_" -+ "istance:Truedclick-distance-scaleTrueTrue2<" -+ "property name=\"visible\">TrueT" -+ "rueThe " -+ "mouse pointer cannot move farther than this distance between two clicks" -+ " for them to be considered a double clickdelayeddclick-di" -+ "stance0rightTrueTrue3TrueFals" -+ "eDouble Click<" -+ "/property>Fal" -+ "seTrue11TrueFalsePreviewFalseT" -- "rue1FalseTrue12TrueFalseT_hemeTrue2FalseTrueTrue" -- "1button1button2164824111" -- "DisabledTr" -- "ueEdge scrollingTrueTwo-finger scrollingTrueCircular scrollingTrueABSOLUTEPen (absolute)RELATIVE<" -- "/col>Mouse (relative)0Non" -- "e (right-handed)3Half (left-handed)1Clockwise2Counterclockwise" -- "" -+ "l\" translatable=\"yes\">_BehaviorTrue1False" -+ "TrueFalse1212" -+ "TrueTrueautomaticautomaticetched-in200TrueTrueFalseTrueTrue0TrueFalse6<" -+ "object class=\"GtkFrame\" id=\"frame5\">True" -+ "False0noneTrueFalse12TrueFalse612TrueFalseCursor si_ze:Truespin1FalseTrue0" -+ "<" -+ "property name=\"visible\">TrueT" -+ "rueFalseFalseTrueTrueth" -+ "eme-cursor-sizeTrueTrueFalseTrue1TrueFalseSizeFalseTrue0TrueFalse0noneTrueFalse600006618" -+ "6TrueFals" -+ "egtk-missing-imageTrueFalsePreviewFalseTrue1FalseTrue12" -+ "TrueFa" -+ "lse_ThemeTrue2Fa" -+ "lseTrueTrue1button2button1" -+ "ABSOLUTEPen (ab" -+ "solute)RELATIVEMouse (relative)0None (right-handed)3Half (l" -+ "eft-handed)1Clockwise2Counterclockwise" - }; - --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