| 1 |
commit: 54a385d1d66d042549760b5479775a5f266e7a38 |
| 2 |
Author: Ben Kohler <bkohler <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Tue Jun 30 11:08:02 2020 +0000 |
| 4 |
Commit: Ben Kohler <bkohler <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Tue Jun 30 11:10:24 2020 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=54a385d1 |
| 7 |
|
| 8 |
net-misc/remmina: update examples patch for 1.4.5 |
| 9 |
|
| 10 |
Closes: https://bugs.gentoo.org/729844 |
| 11 |
Package-Manager: Portage-2.3.103, Repoman-2.3.23 |
| 12 |
Signed-off-by: Ben Kohler <bkohler <AT> gentoo.org> |
| 13 |
|
| 14 |
.../files/remmina-1.4.5-with-examples.patch | 84 ++++++++++++---------- |
| 15 |
1 file changed, 47 insertions(+), 37 deletions(-) |
| 16 |
|
| 17 |
diff --git a/net-misc/remmina/files/remmina-1.4.5-with-examples.patch b/net-misc/remmina/files/remmina-1.4.5-with-examples.patch |
| 18 |
index 10ac35744d7..930f326b27b 100644 |
| 19 |
--- a/net-misc/remmina/files/remmina-1.4.5-with-examples.patch |
| 20 |
+++ b/net-misc/remmina/files/remmina-1.4.5-with-examples.patch |
| 21 |
@@ -1,37 +1,47 @@ |
| 22 |
---- /dev/null |
| 23 |
-+++ b/net-misc/remmina/files/remmina-1.4.6-with-examples.patch |
| 24 |
-@@ -0,0 +1,34 @@ |
| 25 |
-+diff -Nupr a/plugins/tool_hello_world/plugin.c b/plugins/tool_hello_world/plugin.c |
| 26 |
-+--- a/plugins/tool_hello_world/plugin.c 2020-06-08 22:07:44.000000000 +0200 |
| 27 |
-++++ b/plugins/tool_hello_world/plugin.c 2020-06-10 20:18:48.495507560 +0200 |
| 28 |
-+@@ -42,17 +42,19 @@ |
| 29 |
-+ #include <gdk/gdkx.h> |
| 30 |
-+ |
| 31 |
-+ static RemminaPluginService *remmina_plugin_service = NULL; |
| 32 |
-++#define remmina_plugin_debug(fmt, ...) remmina_plugin_service->_remmina_debug(__func__, fmt __VA_OPT__(,) __VA_ARGS__) |
| 33 |
-++ |
| 34 |
-+ |
| 35 |
-+ static void remmina_plugin_tool_init(RemminaProtocolWidget *gp) |
| 36 |
-+ { |
| 37 |
-+ TRACE_CALL(__func__); |
| 38 |
-+- remmina_plugin_service->_debug("[%s] Plugin init", PLUGIN_NAME); |
| 39 |
-++ remmina_plugin_debug("[%s] Plugin init", PLUGIN_NAME); |
| 40 |
-+ } |
| 41 |
-+ |
| 42 |
-+ static gboolean remmina_plugin_tool_open_connection(RemminaProtocolWidget *gp) |
| 43 |
-+ { |
| 44 |
-+ TRACE_CALL(__func__); |
| 45 |
-+- remmina_plugin_service->_debug("[%s] Plugin open connection", PLUGIN_NAME); |
| 46 |
-++ remmina_plugin_debug("[%s] Plugin open connection", PLUGIN_NAME); |
| 47 |
-+ |
| 48 |
-+ GtkDialog *dialog; |
| 49 |
-+ dialog = GTK_DIALOG(gtk_message_dialog_new(NULL, GTK_DIALOG_MODAL | GTK_DIALOG_USE_HEADER_BAR, |
| 50 |
-+@@ -65,7 +67,7 @@ static gboolean remmina_plugin_tool_open |
| 51 |
-+ static gboolean remmina_plugin_tool_close_connection(RemminaProtocolWidget *gp) |
| 52 |
-+ { |
| 53 |
-+ TRACE_CALL(__func__); |
| 54 |
-+- remmina_plugin_service->_debug("[%s] Plugin close connection", PLUGIN_NAME); |
| 55 |
-++ remmina_plugin_debug("[%s] Plugin close connection", PLUGIN_NAME); |
| 56 |
-+ remmina_plugin_service->protocol_plugin_emit_signal(gp, "disconnect"); |
| 57 |
-+ return FALSE; |
| 58 |
-+ } |
| 59 |
+From 5d569e04f33b2c9a8f735d928ad2c9cec9d1c4b5 Mon Sep 17 00:00:00 2001 |
| 60 |
+From: Antenore Gatta <antenore@××××××××.org> |
| 61 |
+Date: Sun, 14 Jun 2020 09:05:18 +0200 |
| 62 |
+Subject: [PATCH] Build failure with -DWITH_EXAMPLES=yes, closes #2228 |
| 63 |
+ |
| 64 |
+Signed-off-by: Antenore Gatta <antenore@××××××××.org> |
| 65 |
+--- |
| 66 |
+ plugins/tool_hello_world/plugin.c | 7 ++++--- |
| 67 |
+ 1 file changed, 4 insertions(+), 3 deletions(-) |
| 68 |
+ |
| 69 |
+diff --git a/plugins/tool_hello_world/plugin.c b/plugins/tool_hello_world/plugin.c |
| 70 |
+index 3e277435d..9695fd586 100644 |
| 71 |
+--- a/plugins/tool_hello_world/plugin.c |
| 72 |
++++ b/plugins/tool_hello_world/plugin.c |
| 73 |
+@@ -42,17 +42,18 @@ |
| 74 |
+ #include <gdk/gdkx.h> |
| 75 |
+ |
| 76 |
+ static RemminaPluginService *remmina_plugin_service = NULL; |
| 77 |
++#define REMMINA_PLUGIN_DEBUG(fmt, ...) remmina_plugin_service->_remmina_debug(__func__, fmt, ##__VA_ARGS__) |
| 78 |
+ |
| 79 |
+ static void remmina_plugin_tool_init(RemminaProtocolWidget *gp) |
| 80 |
+ { |
| 81 |
+ TRACE_CALL(__func__); |
| 82 |
+- remmina_plugin_service->_debug("[%s] Plugin init", PLUGIN_NAME); |
| 83 |
++ REMMINA_PLUGIN_DEBUG("[%s] Plugin init", PLUGIN_NAME); |
| 84 |
+ } |
| 85 |
+ |
| 86 |
+ static gboolean remmina_plugin_tool_open_connection(RemminaProtocolWidget *gp) |
| 87 |
+ { |
| 88 |
+ TRACE_CALL(__func__); |
| 89 |
+- remmina_plugin_service->_debug("[%s] Plugin open connection", PLUGIN_NAME); |
| 90 |
++ REMMINA_PLUGIN_DEBUG("[%s] Plugin open connection", PLUGIN_NAME); |
| 91 |
+ |
| 92 |
+ GtkDialog *dialog; |
| 93 |
+ dialog = GTK_DIALOG(gtk_message_dialog_new(NULL, GTK_DIALOG_MODAL | GTK_DIALOG_USE_HEADER_BAR, |
| 94 |
+@@ -65,7 +66,7 @@ static gboolean remmina_plugin_tool_open_connection(RemminaProtocolWidget *gp) |
| 95 |
+ static gboolean remmina_plugin_tool_close_connection(RemminaProtocolWidget *gp) |
| 96 |
+ { |
| 97 |
+ TRACE_CALL(__func__); |
| 98 |
+- remmina_plugin_service->_debug("[%s] Plugin close connection", PLUGIN_NAME); |
| 99 |
++ REMMINA_PLUGIN_DEBUG("[%s] Plugin close connection", PLUGIN_NAME); |
| 100 |
+ remmina_plugin_service->protocol_plugin_emit_signal(gp, "disconnect"); |
| 101 |
+ return FALSE; |
| 102 |
+ } |
| 103 |
+-- |
| 104 |
+GitLab |
| 105 |
+ |
Archives