diff options
| author | Andreas Müller <schnitzeltony@gmail.com> | 2021-01-06 16:17:15 +0100 |
|---|---|---|
| committer | Khem Raj <raj.khem@gmail.com> | 2021-01-06 14:20:51 -0800 |
| commit | 02a3ba7cd457de2f3494c5b09a506b332bd08fab (patch) | |
| tree | 45dec5e3acd3e3bf5435c033a9ae278a7a438189 | |
| parent | fbc8e065a116684a7a013d58117aa4aba080307d (diff) | |
| download | meta-openembedded-02a3ba7cd457de2f3494c5b09a506b332bd08fab.tar.gz | |
xfce4-notes-plugin: remove for now
* It is broken since xfce 4.16
* GTK3 support was merged to master. Tried to build from git but that requires
vala support all over the place causing build failures and is beyond worth it
* As soon as a working version is released it will be re-added
[1] https://gitlab.xfce.org/panel-plugins/xfce4-notes-plugin/-/merge_requests/2
Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
4 files changed, 0 insertions, 106 deletions
diff --git a/meta-xfce/recipes-panel-plugins/notes/files/0001-main-status-icon.c-remove-deprecated-g_type_init.patch b/meta-xfce/recipes-panel-plugins/notes/files/0001-main-status-icon.c-remove-deprecated-g_type_init.patch deleted file mode 100644 index e1ede27c42..0000000000 --- a/meta-xfce/recipes-panel-plugins/notes/files/0001-main-status-icon.c-remove-deprecated-g_type_init.patch +++ /dev/null | |||
| @@ -1,32 +0,0 @@ | |||
| 1 | From 0218e5ebf38f94d58b908fca451ba3789efa8899 Mon Sep 17 00:00:00 2001 | ||
| 2 | From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@googlemail.com> | ||
| 3 | Date: Fri, 20 Sep 2013 23:09:25 +0200 | ||
| 4 | Subject: [PATCH] main-status-icon.c remove deprecated g_type_init | ||
| 5 | MIME-Version: 1.0 | ||
| 6 | Content-Type: text/plain; charset=UTF-8 | ||
| 7 | Content-Transfer-Encoding: 8bit | ||
| 8 | |||
| 9 | this file was auto created by valac and xfce-vala when creating tarball. So | ||
| 10 | |||
| 11 | Upstream-Status: Inappropriate [other] | ||
| 12 | |||
| 13 | Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com> | ||
| 14 | --- | ||
| 15 | src/main-status-icon.c | 1 - | ||
| 16 | 1 file changed, 1 deletion(-) | ||
| 17 | |||
| 18 | diff --git a/src/main-status-icon.c b/src/main-status-icon.c | ||
| 19 | index c6d73f8..f7db773 100644 | ||
| 20 | --- a/src/main-status-icon.c | ||
| 21 | +++ b/src/main-status-icon.c | ||
| 22 | @@ -290,7 +290,6 @@ gint _vala_main (char** args, int args_length1) { | ||
| 23 | |||
| 24 | |||
| 25 | int main (int argc, char ** argv) { | ||
| 26 | - g_type_init (); | ||
| 27 | return _vala_main (argv, argc); | ||
| 28 | } | ||
| 29 | |||
| 30 | -- | ||
| 31 | 1.8.3.1 | ||
| 32 | |||
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 deleted file mode 100644 index 8066df0041..0000000000 --- a/meta-xfce/recipes-panel-plugins/notes/files/01_fix_format-string.patch +++ /dev/null | |||
| @@ -1,53 +0,0 @@ | |||
| 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 deleted file mode 100644 index fcf98c181b..0000000000 --- a/meta-xfce/recipes-panel-plugins/notes/xfce4-notes-plugin_1.8.1.bb +++ /dev/null | |||
| @@ -1,20 +0,0 @@ | |||
| 1 | SUMMARY = "Notes plugin for the Xfce Panel" | ||
| 2 | HOMEPAGE = "http://goodies.xfce.org/projects/panel-plugins/xfce4-notes-plugin" | ||
| 3 | LICENSE = "GPLv2" | ||
| 4 | LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f" | ||
| 5 | |||
| 6 | inherit xfce-panel-plugin | ||
| 7 | |||
| 8 | DEPENDS += "gtk+ libxfce4ui xfce4-panel xfconf libunique" | ||
| 9 | |||
| 10 | SRC_URI += " \ | ||
| 11 | file://0001-main-status-icon.c-remove-deprecated-g_type_init.patch \ | ||
| 12 | file://01_fix_format-string.patch \ | ||
| 13 | " | ||
| 14 | SRC_URI[md5sum] = "31cb9520b01512a94344770b4befdb3b" | ||
| 15 | SRC_URI[sha256sum] = "07a4c3e71431c24f97d2e270452dd0fa51ff0bdb6219a13a20d0bfa8d9de54b2" | ||
| 16 | |||
| 17 | FILES_${PN} += "${libdir}/xfce4/panel-plugins/*.so.*" | ||
| 18 | |||
| 19 | # *.so are required for plugin detection | ||
| 20 | INSANE_SKIP_${PN} = "dev-so" | ||
diff --git a/meta-xfce/recipes-xfce/packagegroups/packagegroup-xfce-extended.bb b/meta-xfce/recipes-xfce/packagegroups/packagegroup-xfce-extended.bb index 7f1c172616..cd3fa26aa6 100644 --- a/meta-xfce/recipes-xfce/packagegroups/packagegroup-xfce-extended.bb +++ b/meta-xfce/recipes-xfce/packagegroups/packagegroup-xfce-extended.bb | |||
| @@ -40,7 +40,6 @@ RRECOMMENDS_${PN} = " \ | |||
| 40 | xfce4-mount-plugin \ | 40 | xfce4-mount-plugin \ |
| 41 | xfce4-powermanager-plugin \ | 41 | xfce4-powermanager-plugin \ |
| 42 | xfce4-closebutton-plugin \ | 42 | xfce4-closebutton-plugin \ |
| 43 | xfce4-notes-plugin \ | ||
| 44 | xfce4-whiskermenu-plugin \ | 43 | xfce4-whiskermenu-plugin \ |
| 45 | xfce4-mailwatch-plugin \ | 44 | xfce4-mailwatch-plugin \ |
| 46 | xfce4-smartbookmark-plugin \ | 45 | xfce4-smartbookmark-plugin \ |
