All of lore.kernel.org
 help / color / mirror / Atom feed
From: "Andreas Müller" <schnitzeltony@gmail.com>
To: openembedded-devel@lists.openembedded.org
Subject: [PATCH 26/28] xfce4-notes-plugin: remove for now
Date: Wed,  6 Jan 2021 16:17:15 +0100	[thread overview]
Message-ID: <20210106151717.1779543-26-schnitzeltony@gmail.com> (raw)
In-Reply-To: <20210106151717.1779543-1-schnitzeltony@gmail.com>

* 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>
---
 ...icon.c-remove-deprecated-g_type_init.patch | 32 -----------
 .../notes/files/01_fix_format-string.patch    | 53 -------------------
 .../notes/xfce4-notes-plugin_1.8.1.bb         | 20 -------
 .../packagegroup-xfce-extended.bb             |  1 -
 4 files changed, 106 deletions(-)
 delete mode 100644 meta-xfce/recipes-panel-plugins/notes/files/0001-main-status-icon.c-remove-deprecated-g_type_init.patch
 delete mode 100644 meta-xfce/recipes-panel-plugins/notes/files/01_fix_format-string.patch
 delete mode 100644 meta-xfce/recipes-panel-plugins/notes/xfce4-notes-plugin_1.8.1.bb

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 e1ede27c4..000000000
--- 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 @@
-From 0218e5ebf38f94d58b908fca451ba3789efa8899 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@googlemail.com>
-Date: Fri, 20 Sep 2013 23:09:25 +0200
-Subject: [PATCH] main-status-icon.c remove deprecated g_type_init
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-this file was auto created by valac and xfce-vala when creating tarball. So
-
-Upstream-Status: Inappropriate [other]
-
-Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
----
- src/main-status-icon.c | 1 -
- 1 file changed, 1 deletion(-)
-
-diff --git a/src/main-status-icon.c b/src/main-status-icon.c
-index c6d73f8..f7db773 100644
---- a/src/main-status-icon.c
-+++ b/src/main-status-icon.c
-@@ -290,7 +290,6 @@ gint _vala_main (char** args, int args_length1) {
- 
- 
- int main (int argc, char ** argv) {
--	g_type_init ();
- 	return _vala_main (argv, argc);
- }
- 
--- 
-1.8.3.1
-
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 8066df004..000000000
--- a/meta-xfce/recipes-panel-plugins/notes/files/01_fix_format-string.patch
+++ /dev/null
@@ -1,53 +0,0 @@
-Fix formatting strings when compiling with Wformat options
-
-Imported from debian
-
---- a/lib/application.c
-+++ b/lib/application.c
-@@ -352,7 +352,7 @@ static void xnp_application_update_notes
- 			XfconfChannel* _tmp16_;
- 			const gchar* _tmp17_;
- 			_tmp9_ = _ ("Select notes path");
--			_tmp10_ = (GtkMessageDialog*) gtk_message_dialog_new (NULL, 0, GTK_MESSAGE_ERROR, GTK_BUTTONS_CLOSE, _tmp9_);
-+			_tmp10_ = (GtkMessageDialog*) gtk_message_dialog_new (NULL, 0, GTK_MESSAGE_ERROR, GTK_BUTTONS_CLOSE, "%s", _tmp9_);
- 			g_object_ref_sink (_tmp10_);
- 			error_dialog = _tmp10_;
- 			_tmp11_ = error_dialog;
-@@ -419,7 +419,7 @@ static void xnp_application_update_notes
- 		XfconfChannel* _tmp35_;
- 		const gchar* _tmp36_;
- 		_tmp27_ = _ ("Select notes path");
--		_tmp28_ = (GtkMessageDialog*) gtk_message_dialog_new (NULL, 0, GTK_MESSAGE_ERROR, GTK_BUTTONS_CLOSE, _tmp27_);
-+		_tmp28_ = (GtkMessageDialog*) gtk_message_dialog_new (NULL, 0, GTK_MESSAGE_ERROR, GTK_BUTTONS_CLOSE, "%s", _tmp27_);
- 		g_object_ref_sink (_tmp28_);
- 		error_dialog = _tmp28_;
- 		_tmp29_ = error_dialog;
-@@ -2082,7 +2082,7 @@ static void xnp_application_delete_windo
- 		gint _tmp9_;
- 		_tmp3_ = window;
- 		_tmp4_ = _ ("Are you sure you want to delete this group?");
--		_tmp5_ = (GtkMessageDialog*) gtk_message_dialog_new ((GtkWindow*) _tmp3_, GTK_DIALOG_DESTROY_WITH_PARENT, GTK_MESSAGE_QUESTION, GTK_BUTTONS_YES_NO, _tmp4_);
-+		_tmp5_ = (GtkMessageDialog*) gtk_message_dialog_new ((GtkWindow*) _tmp3_, GTK_DIALOG_DESTROY_WITH_PARENT, GTK_MESSAGE_QUESTION, GTK_BUTTONS_YES_NO, "%s", _tmp4_);
- 		g_object_ref_sink (_tmp5_);
- 		dialog = _tmp5_;
- 		_tmp6_ = dialog;
-@@ -2721,7 +2721,7 @@ void xnp_application_open_settings_dialo
- 		e = _inner_error_;
- 		_inner_error_ = NULL;
- 		_tmp0_ = _ ("Unable to open the settings dialog");
--		_tmp1_ = (GtkMessageDialog*) gtk_message_dialog_new (NULL, GTK_DIALOG_DESTROY_WITH_PARENT, GTK_MESSAGE_ERROR, GTK_BUTTONS_CLOSE, _tmp0_);
-+		_tmp1_ = (GtkMessageDialog*) gtk_message_dialog_new (NULL, GTK_DIALOG_DESTROY_WITH_PARENT, GTK_MESSAGE_ERROR, GTK_BUTTONS_CLOSE, "%s", _tmp0_);
- 		g_object_ref_sink (_tmp1_);
- 		error_dialog = _tmp1_;
- 		_tmp2_ = error_dialog;
---- a/lib/window.c
-+++ b/lib/window.c
-@@ -3542,7 +3542,7 @@ void xnp_window_delete_note (XnpWindow*
- 		GtkMessageDialog* _tmp13_;
- 		gint _tmp14_;
- 		_tmp9_ = _ ("Are you sure you want to delete this note?");
--		_tmp10_ = (GtkMessageDialog*) gtk_message_dialog_new ((GtkWindow*) self, GTK_DIALOG_DESTROY_WITH_PARENT, GTK_MESSAGE_QUESTION, GTK_BUTTONS_YES_NO, _tmp9_);
-+		_tmp10_ = (GtkMessageDialog*) gtk_message_dialog_new ((GtkWindow*) self, GTK_DIALOG_DESTROY_WITH_PARENT, GTK_MESSAGE_QUESTION, GTK_BUTTONS_YES_NO, "%s", _tmp9_);
- 		g_object_ref_sink (_tmp10_);
- 		dialog = _tmp10_;
- 		_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 fcf98c181..000000000
--- a/meta-xfce/recipes-panel-plugins/notes/xfce4-notes-plugin_1.8.1.bb
+++ /dev/null
@@ -1,20 +0,0 @@
-SUMMARY = "Notes plugin for the Xfce Panel"
-HOMEPAGE = "http://goodies.xfce.org/projects/panel-plugins/xfce4-notes-plugin"
-LICENSE = "GPLv2"
-LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f"
-
-inherit xfce-panel-plugin
-
-DEPENDS += "gtk+ libxfce4ui xfce4-panel xfconf libunique"
-
-SRC_URI += " \
-    file://0001-main-status-icon.c-remove-deprecated-g_type_init.patch \
-    file://01_fix_format-string.patch \
-"
-SRC_URI[md5sum] = "31cb9520b01512a94344770b4befdb3b"
-SRC_URI[sha256sum] = "07a4c3e71431c24f97d2e270452dd0fa51ff0bdb6219a13a20d0bfa8d9de54b2"
-
-FILES_${PN} += "${libdir}/xfce4/panel-plugins/*.so.*"
-
-# *.so are required for plugin detection
-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 7f1c17261..cd3fa26aa 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} = " \
     xfce4-mount-plugin \
     xfce4-powermanager-plugin \
     xfce4-closebutton-plugin \
-    xfce4-notes-plugin \
     xfce4-whiskermenu-plugin \
     xfce4-mailwatch-plugin \
     xfce4-smartbookmark-plugin \
-- 
2.26.2


  parent reply	other threads:[~2021-01-06 15:18 UTC|newest]

Thread overview: 37+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2021-01-06 15:16 [PATCH 01/28] xfce4-dev-tools: upgrade 4.14.0 -> 4.16.0 Andreas Müller
2021-01-06 15:16 ` [PATCH 02/28] libxfce4util: " Andreas Müller
2021-01-06 15:16 ` [PATCH 03/28] xfconf: upgrade 4.14.3 " Andreas Müller
2021-01-06 15:16 ` [PATCH 04/28] libxfce4ui: upgrade 4.14.1 " Andreas Müller
2021-01-08 19:53   ` [oe] " Khem Raj
2021-01-08 20:29     ` Andreas Müller
2021-01-08 20:31       ` Khem Raj
2021-01-08 20:46         ` Andreas Müller
2021-01-09 18:42           ` Khem Raj
2021-01-10  3:27             ` Andreas Müller
2021-01-06 15:16 ` [PATCH 05/28] exo: upgrade 0.12.11 " Andreas Müller
2021-01-06 15:16 ` [PATCH 06/28] garcon: upgrade 0.7.0 -> 0.8.0 Andreas Müller
2021-01-06 15:16 ` [PATCH 07/28] xfwm4: upgrade 4.14.5 -> 4.16.0 Andreas Müller
2021-01-06 18:55   ` [oe] " Khem Raj
2021-01-08 17:25     ` Randy MacLeod
2021-01-09  9:11       ` kai
2021-01-06 15:16 ` [PATCH 08/28] xfce4-settings: upgrade 4.14.3 " Andreas Müller
2021-01-06 15:16 ` [PATCH 09/28] xfce4-panel: upgrade 4.14.4 " Andreas Müller
2021-01-06 15:16 ` [PATCH 10/28] xfce4-session: upgrade 4.14.2 " Andreas Müller
2021-01-06 15:17 ` [PATCH 11/28] xfdesktop: " Andreas Müller
2021-01-06 15:17 ` [PATCH 12/28] xfce4-power-manager: upgrade 1.6.6 " Andreas Müller
2021-01-06 15:17 ` [PATCH 13/28] tumbler: upgrade 0.3.1 " Andreas Müller
2021-01-06 15:17 ` [PATCH 14/28] thunar-volman: upgrade 0.9.5 " Andreas Müller
2021-01-06 15:17 ` [PATCH 15/28] thunar: upgrade 1.8.15 " Andreas Müller
2021-01-06 15:17 ` [PATCH 16/28] xfce4-appfinder: upgrade 4.14.0 " Andreas Müller
2021-01-06 15:17 ` [PATCH 17/28] xfce4-terminal: 0.8.9.2 -> 0.8.10 Andreas Müller
2021-01-06 15:17 ` [PATCH 18/28] xfce4-screensaver: upgrade 0.1.10 -> 4.16.0 Andreas Müller
2021-01-06 15:17 ` [PATCH 19/28] xfce4-taskmanager: remove exo-native from DEPENDS Andreas Müller
2021-01-06 15:17 ` [PATCH 20/28] xfce4-closebutton-plugin: upgrade 0.1.0+ -> 4.16.0 Andreas Müller
2021-01-06 15:17 ` [PATCH 21/28] xfce4-sensors-plugin: upgrade 1.3.92 -> 1.3.95 Andreas Müller
2021-01-06 15:17 ` [PATCH 22/28] xfce4-genmon-plugin: upgrade 4.0.2 -> 4.1.0 Andreas Müller
2021-01-06 15:17 ` [PATCH 23/28] xfce4-hotcorner-plugin: remove Andreas Müller
2021-01-06 15:17 ` [PATCH 24/28] xfce4-embed-plugin: remove for now Andreas Müller
2021-01-06 15:17 ` [PATCH 25/28] xfce4-equake-plugin: " Andreas Müller
2021-01-06 15:17 ` Andreas Müller [this message]
2021-01-06 15:17 ` [PATCH 27/28] fluidsynth: upgrade 2.1.5 -> 2.1.6 Andreas Müller
2021-01-06 15:17 ` [PATCH 28/28] blueman: upgrade 2.1.3 -> 2.1.4 Andreas Müller

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20210106151717.1779543-26-schnitzeltony@gmail.com \
    --to=schnitzeltony@gmail.com \
    --cc=openembedded-devel@lists.openembedded.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.