appindicator: Add patch to fix crash

5 files changed, 90 insertions, 0 deletions

diff --git a/libappindicator/libappindicator-fix-crash-from-incorrect-signal-emission.patch b/libappindicator/libappindicator-fix-crash-from-incorrect-signal-emission.patch
new file mode 100644
index 0000000..28927a3
--- /dev/null
+++ b/libappindicator/libappindicator-fix-crash-from-incorrect-signal-emission.patch
@@ -0,0 +1,74 @@
+--- libappindicator-12.10.0/src/app-indicator.c	2012-07-11 13:28:34.415113869 -0400
++++ wrk/src/app-indicator.c	2020-03-19 12:14:47.813191652 -0400
+@@ -443,7 +443,7 @@
+ 	                                  G_STRUCT_OFFSET (AppIndicatorClass, new_icon),
+ 	                                  NULL, NULL,
+ 	                                  g_cclosure_marshal_VOID__VOID,
+-	                                  G_TYPE_NONE, 0, G_TYPE_NONE);
++	                                  G_TYPE_NONE, 0);
+ 
+ 	/**
+ 	 * AppIndicator::new-attention-icon:
+@@ -457,7 +457,7 @@
+ 	                                            G_STRUCT_OFFSET (AppIndicatorClass, new_attention_icon),
+ 	                                            NULL, NULL,
+ 	                                            g_cclosure_marshal_VOID__VOID,
+-	                                            G_TYPE_NONE, 0, G_TYPE_NONE);
++	                                            G_TYPE_NONE, 0);
+ 
+ 	/**
+ 	 * AppIndicator::new-status:
+@@ -505,7 +505,7 @@
+ 	                                            G_STRUCT_OFFSET (AppIndicatorClass, connection_changed),
+ 	                                            NULL, NULL,
+ 	                                            g_cclosure_marshal_VOID__BOOLEAN,
+-	                                            G_TYPE_NONE, 1, G_TYPE_BOOLEAN, G_TYPE_NONE);
++	                                            G_TYPE_NONE, 1, G_TYPE_BOOLEAN);
+ 
+ 	/**
+ 	 * AppIndicator::new-icon-theme-path:
+@@ -1175,7 +1175,7 @@
+ 	gchar * guide = priv->label_guide != NULL ? priv->label_guide : "";
+ 
+ 	g_signal_emit(G_OBJECT(self), signals[NEW_LABEL], 0,
+-	              label, guide, TRUE);
++	              label, guide);
+ 	if (priv->dbus_registration != 0 && priv->connection != NULL) {
+ 		GError * error = NULL;
+ 
+@@ -1490,7 +1490,7 @@
+ static void
+ theme_changed_cb (GtkIconTheme * theme, gpointer user_data)
+ {
+-	g_signal_emit (user_data, signals[NEW_ICON], 0, TRUE);
++	g_signal_emit (user_data, signals[NEW_ICON], 0);
+ 
+ 	AppIndicator * self = (AppIndicator *)user_data;
+ 	AppIndicatorPrivate *priv = self->priv;
+@@ -1904,7 +1904,7 @@
+ 	}
+ 
+ 	if (changed) {
+-		g_signal_emit (self, signals[NEW_ATTENTION_ICON], 0, TRUE);
++		g_signal_emit (self, signals[NEW_ATTENTION_ICON], 0);
+ 
+ 		if (self->priv->dbus_registration != 0 && self->priv->connection != NULL) {
+ 			GError * error = NULL;
+@@ -1982,7 +1982,7 @@
+ 	}
+ 
+ 	if (changed) {
+-		g_signal_emit (self, signals[NEW_ICON], 0, TRUE);
++		g_signal_emit (self, signals[NEW_ICON], 0);
+ 
+ 		if (self->priv->dbus_registration != 0 && self->priv->connection != NULL) {
+ 			GError * error = NULL;
+@@ -2048,7 +2048,7 @@
+ 
+ 		self->priv->icon_theme_path = g_strdup(icon_theme_path);
+ 
+-		g_signal_emit (self, signals[NEW_ICON_THEME_PATH], 0, self->priv->icon_theme_path, TRUE);
++		g_signal_emit (self, signals[NEW_ICON_THEME_PATH], 0, self->priv->icon_theme_path);
+ 
+ 		if (self->priv->dbus_registration != 0 && self->priv->connection != NULL) {
+ 			GError * error = NULL;
diff --git a/libappindicator/libappindicator-gtk2-12.10.json b/libappindicator/libappindicator-gtk2-12.10.json
index b65cfa3..06007f1 100644
--- a/libappindicator/libappindicator-gtk2-12.10.json
+++ b/libappindicator/libappindicator-gtk2-12.10.json
@@ -34,6 +34,10 @@
       "path": "libappindicator-no-python.patch"
     },
     {
+      "type": "patch",
+      "path": "libappindicator-fix-crash-from-incorrect-signal-emission.patch"
+    },
+    {
       "type": "script",
       "commands": ["autoreconf -sfi"],
       "dest-filename": "autogen.sh"
diff --git a/libappindicator/libappindicator-gtk3-12.10.json b/libappindicator/libappindicator-gtk3-12.10.json
index 46e6f43..409d7ed 100644
--- a/libappindicator/libappindicator-gtk3-12.10.json
+++ b/libappindicator/libappindicator-gtk3-12.10.json
@@ -34,6 +34,10 @@
       "path": "libappindicator-no-python.patch"
     },
     {
+      "type": "patch",
+      "path": "libappindicator-fix-crash-from-incorrect-signal-emission.patch"
+    },
+    {
       "type": "script",
       "commands": ["autoreconf -sfi"],
       "dest-filename": "autogen.sh"
diff --git a/libappindicator/libappindicator-gtk3-introspection-12.10.json b/libappindicator/libappindicator-gtk3-introspection-12.10.json
index 5df8252..169c1de 100644
--- a/libappindicator/libappindicator-gtk3-introspection-12.10.json
+++ b/libappindicator/libappindicator-gtk3-introspection-12.10.json
@@ -34,6 +34,10 @@
       "path": "libappindicator-no-python.patch"
     },
     {
+      "type": "patch",
+      "path": "libappindicator-fix-crash-from-incorrect-signal-emission.patch"
+    },
+    {
       "type": "script",
       "commands": ["autoreconf -sfi"],
       "dest-filename": "autogen.sh"
diff --git a/libappindicator/libappindicator.json.in b/libappindicator/libappindicator.json.in
index 2b383af..a6afc66 100644
--- a/libappindicator/libappindicator.json.in
+++ b/libappindicator/libappindicator.json.in
@@ -34,6 +34,10 @@
       "path": "libappindicator-no-python.patch"
     },
     {
+      "type": "patch",
+      "path": "libappindicator-fix-crash-from-incorrect-signal-emission.patch"
+    },
+    {
       "type": "script",
       "commands": ["autoreconf -sfi"],
       "dest-filename": "autogen.sh"