diff options
Diffstat (limited to 'meta-xfce')
-rw-r--r-- | meta-xfce/recipes-panel-plugins/notes/files/01_fix_format-string.patch | 53 | ||||
-rw-r--r-- | meta-xfce/recipes-panel-plugins/notes/xfce4-notes-plugin_1.8.1.bb | 1 |
2 files changed, 54 insertions, 0 deletions
diff --git a/meta-xfce/recipes-panel-plugins/notes/files/01_fix_format-string.patch b/meta-xfce/recipes-panel-plugins/notes/files/01_fix_format-string.patch new file mode 100644 index 000000000..8066df004 --- /dev/null +++ b/meta-xfce/recipes-panel-plugins/notes/files/01_fix_format-string.patch | |||
@@ -0,0 +1,53 @@ | |||
1 | Fix formatting strings when compiling with Wformat options | ||
2 | |||
3 | Imported from debian | ||
4 | |||
5 | --- a/lib/application.c | ||
6 | +++ b/lib/application.c | ||
7 | @@ -352,7 +352,7 @@ static void xnp_application_update_notes | ||
8 | XfconfChannel* _tmp16_; | ||
9 | const gchar* _tmp17_; | ||
10 | _tmp9_ = _ ("Select notes path"); | ||
11 | - _tmp10_ = (GtkMessageDialog*) gtk_message_dialog_new (NULL, 0, GTK_MESSAGE_ERROR, GTK_BUTTONS_CLOSE, _tmp9_); | ||
12 | + _tmp10_ = (GtkMessageDialog*) gtk_message_dialog_new (NULL, 0, GTK_MESSAGE_ERROR, GTK_BUTTONS_CLOSE, "%s", _tmp9_); | ||
13 | g_object_ref_sink (_tmp10_); | ||
14 | error_dialog = _tmp10_; | ||
15 | _tmp11_ = error_dialog; | ||
16 | @@ -419,7 +419,7 @@ static void xnp_application_update_notes | ||
17 | XfconfChannel* _tmp35_; | ||
18 | const gchar* _tmp36_; | ||
19 | _tmp27_ = _ ("Select notes path"); | ||
20 | - _tmp28_ = (GtkMessageDialog*) gtk_message_dialog_new (NULL, 0, GTK_MESSAGE_ERROR, GTK_BUTTONS_CLOSE, _tmp27_); | ||
21 | + _tmp28_ = (GtkMessageDialog*) gtk_message_dialog_new (NULL, 0, GTK_MESSAGE_ERROR, GTK_BUTTONS_CLOSE, "%s", _tmp27_); | ||
22 | g_object_ref_sink (_tmp28_); | ||
23 | error_dialog = _tmp28_; | ||
24 | _tmp29_ = error_dialog; | ||
25 | @@ -2082,7 +2082,7 @@ static void xnp_application_delete_windo | ||
26 | gint _tmp9_; | ||
27 | _tmp3_ = window; | ||
28 | _tmp4_ = _ ("Are you sure you want to delete this group?"); | ||
29 | - _tmp5_ = (GtkMessageDialog*) gtk_message_dialog_new ((GtkWindow*) _tmp3_, GTK_DIALOG_DESTROY_WITH_PARENT, GTK_MESSAGE_QUESTION, GTK_BUTTONS_YES_NO, _tmp4_); | ||
30 | + _tmp5_ = (GtkMessageDialog*) gtk_message_dialog_new ((GtkWindow*) _tmp3_, GTK_DIALOG_DESTROY_WITH_PARENT, GTK_MESSAGE_QUESTION, GTK_BUTTONS_YES_NO, "%s", _tmp4_); | ||
31 | g_object_ref_sink (_tmp5_); | ||
32 | dialog = _tmp5_; | ||
33 | _tmp6_ = dialog; | ||
34 | @@ -2721,7 +2721,7 @@ void xnp_application_open_settings_dialo | ||
35 | e = _inner_error_; | ||
36 | _inner_error_ = NULL; | ||
37 | _tmp0_ = _ ("Unable to open the settings dialog"); | ||
38 | - _tmp1_ = (GtkMessageDialog*) gtk_message_dialog_new (NULL, GTK_DIALOG_DESTROY_WITH_PARENT, GTK_MESSAGE_ERROR, GTK_BUTTONS_CLOSE, _tmp0_); | ||
39 | + _tmp1_ = (GtkMessageDialog*) gtk_message_dialog_new (NULL, GTK_DIALOG_DESTROY_WITH_PARENT, GTK_MESSAGE_ERROR, GTK_BUTTONS_CLOSE, "%s", _tmp0_); | ||
40 | g_object_ref_sink (_tmp1_); | ||
41 | error_dialog = _tmp1_; | ||
42 | _tmp2_ = error_dialog; | ||
43 | --- a/lib/window.c | ||
44 | +++ b/lib/window.c | ||
45 | @@ -3542,7 +3542,7 @@ void xnp_window_delete_note (XnpWindow* | ||
46 | GtkMessageDialog* _tmp13_; | ||
47 | gint _tmp14_; | ||
48 | _tmp9_ = _ ("Are you sure you want to delete this note?"); | ||
49 | - _tmp10_ = (GtkMessageDialog*) gtk_message_dialog_new ((GtkWindow*) self, GTK_DIALOG_DESTROY_WITH_PARENT, GTK_MESSAGE_QUESTION, GTK_BUTTONS_YES_NO, _tmp9_); | ||
50 | + _tmp10_ = (GtkMessageDialog*) gtk_message_dialog_new ((GtkWindow*) self, GTK_DIALOG_DESTROY_WITH_PARENT, GTK_MESSAGE_QUESTION, GTK_BUTTONS_YES_NO, "%s", _tmp9_); | ||
51 | g_object_ref_sink (_tmp10_); | ||
52 | dialog = _tmp10_; | ||
53 | _tmp11_ = dialog; | ||
diff --git a/meta-xfce/recipes-panel-plugins/notes/xfce4-notes-plugin_1.8.1.bb b/meta-xfce/recipes-panel-plugins/notes/xfce4-notes-plugin_1.8.1.bb index 313534b21..fcf98c181 100644 --- a/meta-xfce/recipes-panel-plugins/notes/xfce4-notes-plugin_1.8.1.bb +++ b/meta-xfce/recipes-panel-plugins/notes/xfce4-notes-plugin_1.8.1.bb | |||
@@ -9,6 +9,7 @@ DEPENDS += "gtk+ libxfce4ui xfce4-panel xfconf libunique" | |||
9 | 9 | ||
10 | SRC_URI += " \ | 10 | SRC_URI += " \ |
11 | file://0001-main-status-icon.c-remove-deprecated-g_type_init.patch \ | 11 | file://0001-main-status-icon.c-remove-deprecated-g_type_init.patch \ |
12 | file://01_fix_format-string.patch \ | ||
12 | " | 13 | " |
13 | SRC_URI[md5sum] = "31cb9520b01512a94344770b4befdb3b" | 14 | SRC_URI[md5sum] = "31cb9520b01512a94344770b4befdb3b" |
14 | SRC_URI[sha256sum] = "07a4c3e71431c24f97d2e270452dd0fa51ff0bdb6219a13a20d0bfa8d9de54b2" | 15 | SRC_URI[sha256sum] = "07a4c3e71431c24f97d2e270452dd0fa51ff0bdb6219a13a20d0bfa8d9de54b2" |