[gentoo-commits] repo/gentoo:master commit in: net-misc/remmina/files/

[gentoo-commits] repo/gentoo:master commit in: net-misc/remmina/files/

[Ben Kohler]

commit:     54a385d1d66d042549760b5479775a5f266e7a38
Author:     Ben Kohler <bkohler <AT> gentoo <DOT> org>
AuthorDate: Tue Jun 30 11:08:02 2020 +0000
Commit:     Ben Kohler <bkohler <AT> gentoo <DOT> org>
CommitDate: Tue Jun 30 11:10:24 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=54a385d1

net-misc/remmina: update examples patch for 1.4.5

Closes: https://bugs.gentoo.org/729844
Package-Manager: Portage-2.3.103, Repoman-2.3.23
Signed-off-by: Ben Kohler <bkohler <AT> gentoo.org>

 .../files/remmina-1.4.5-with-examples.patch        | 84 ++++++++++++----------
 1 file changed, 47 insertions(+), 37 deletions(-)

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
index 10ac35744d7..930f326b27b 100644
--- a/net-misc/remmina/files/remmina-1.4.5-with-examples.patch
+++ b/net-misc/remmina/files/remmina-1.4.5-with-examples.patch
@@ -1,37 +1,47 @@
---- /dev/null
-+++ b/net-misc/remmina/files/remmina-1.4.6-with-examples.patch
-@@ -0,0 +1,34 @@
-+diff -Nupr a/plugins/tool_hello_world/plugin.c b/plugins/tool_hello_world/plugin.c
-+--- a/plugins/tool_hello_world/plugin.c	2020-06-08 22:07:44.000000000 +0200
-++++ b/plugins/tool_hello_world/plugin.c	2020-06-10 20:18:48.495507560 +0200
-+@@ -42,17 +42,19 @@
-+ #include <gdk/gdkx.h>
-+ 
-+ static RemminaPluginService *remmina_plugin_service = NULL;
-++#define remmina_plugin_debug(fmt, ...) remmina_plugin_service->_remmina_debug(__func__, fmt __VA_OPT__(,) __VA_ARGS__)
-++
-+ 
-+ static void remmina_plugin_tool_init(RemminaProtocolWidget *gp)
-+ {
-+ 	TRACE_CALL(__func__);
-+-	remmina_plugin_service->_debug("[%s] Plugin init", PLUGIN_NAME);
-++	remmina_plugin_debug("[%s] Plugin init", PLUGIN_NAME);
-+ }
-+ 
-+ static gboolean remmina_plugin_tool_open_connection(RemminaProtocolWidget *gp)
-+ {
-+ 	TRACE_CALL(__func__);
-+-	remmina_plugin_service->_debug("[%s] Plugin open connection", PLUGIN_NAME);
-++	remmina_plugin_debug("[%s] Plugin open connection", PLUGIN_NAME);
-+ 
-+ 	GtkDialog *dialog;
-+ 	dialog = GTK_DIALOG(gtk_message_dialog_new(NULL, GTK_DIALOG_MODAL | GTK_DIALOG_USE_HEADER_BAR,
-+@@ -65,7 +67,7 @@ static gboolean remmina_plugin_tool_open
-+ static gboolean remmina_plugin_tool_close_connection(RemminaProtocolWidget *gp)
-+ {
-+ 	TRACE_CALL(__func__);
-+-	remmina_plugin_service->_debug("[%s] Plugin close connection", PLUGIN_NAME);
-++	remmina_plugin_debug("[%s] Plugin close connection", PLUGIN_NAME);
-+ 	remmina_plugin_service->protocol_plugin_emit_signal(gp, "disconnect");
-+ 	return FALSE;
-+ }
+From 5d569e04f33b2c9a8f735d928ad2c9cec9d1c4b5 Mon Sep 17 00:00:00 2001
+From: Antenore Gatta <antenore@simbiosi.org>
+Date: Sun, 14 Jun 2020 09:05:18 +0200
+Subject: [PATCH] Build failure with -DWITH_EXAMPLES=yes, closes #2228
+
+Signed-off-by: Antenore Gatta <antenore@simbiosi.org>
+---
+ plugins/tool_hello_world/plugin.c | 7 ++++---
+ 1 file changed, 4 insertions(+), 3 deletions(-)
+
+diff --git a/plugins/tool_hello_world/plugin.c b/plugins/tool_hello_world/plugin.c
+index 3e277435d..9695fd586 100644
+--- a/plugins/tool_hello_world/plugin.c
++++ b/plugins/tool_hello_world/plugin.c
+@@ -42,17 +42,18 @@
+ #include <gdk/gdkx.h>
+ 
+ static RemminaPluginService *remmina_plugin_service = NULL;
++#define REMMINA_PLUGIN_DEBUG(fmt, ...) remmina_plugin_service->_remmina_debug(__func__, fmt, ##__VA_ARGS__)
+ 
+ static void remmina_plugin_tool_init(RemminaProtocolWidget *gp)
+ {
+ 	TRACE_CALL(__func__);
+-	remmina_plugin_service->_debug("[%s] Plugin init", PLUGIN_NAME);
++	REMMINA_PLUGIN_DEBUG("[%s] Plugin init", PLUGIN_NAME);
+ }
+ 
+ static gboolean remmina_plugin_tool_open_connection(RemminaProtocolWidget *gp)
+ {
+ 	TRACE_CALL(__func__);
+-	remmina_plugin_service->_debug("[%s] Plugin open connection", PLUGIN_NAME);
++	REMMINA_PLUGIN_DEBUG("[%s] Plugin open connection", PLUGIN_NAME);
+ 
+ 	GtkDialog *dialog;
+ 	dialog = GTK_DIALOG(gtk_message_dialog_new(NULL, GTK_DIALOG_MODAL | GTK_DIALOG_USE_HEADER_BAR,
+@@ -65,7 +66,7 @@ static gboolean remmina_plugin_tool_open_connection(RemminaProtocolWidget *gp)
+ static gboolean remmina_plugin_tool_close_connection(RemminaProtocolWidget *gp)
+ {
+ 	TRACE_CALL(__func__);
+-	remmina_plugin_service->_debug("[%s] Plugin close connection", PLUGIN_NAME);
++	REMMINA_PLUGIN_DEBUG("[%s] Plugin close connection", PLUGIN_NAME);
+ 	remmina_plugin_service->protocol_plugin_emit_signal(gp, "disconnect");
+ 	return FALSE;
+ }
+-- 
+GitLab
+

[gentoo-commits] repo/gentoo:master commit in: net-misc/remmina/files/

[Ben Kohler]

commit:     5788eb793c9090b0bc9dcf310662d9981017b098
Author:     Ben Kohler <bkohler <AT> gentoo <DOT> org>
AuthorDate: Tue Dec 27 17:59:44 2022 +0000
Commit:     Ben Kohler <bkohler <AT> gentoo <DOT> org>
CommitDate: Tue Dec 27 18:00:47 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5788eb79

net-misc/remmina: remove unused patch

Closes: https://github.com/gentoo/gentoo/pull/28856

Signed-off-by: Ben Kohler <bkohler <AT> gentoo.org>

 .../remmina-1.4.27_p20221128-missing-gdk-include.patch      | 13 -------------
 1 file changed, 13 deletions(-)

diff --git a/net-misc/remmina/files/remmina-1.4.27_p20221128-missing-gdk-include.patch b/net-misc/remmina/files/remmina-1.4.27_p20221128-missing-gdk-include.patch
deleted file mode 100644
index 618dd721a293..000000000000
--- a/net-misc/remmina/files/remmina-1.4.27_p20221128-missing-gdk-include.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/src/remmina.c b/src/remmina.c
-index 5b59339f8..43834b9bd 100644
---- a/src/remmina.c
-+++ b/src/remmina.c
-@@ -32,6 +32,8 @@
-  *
-  */
- 
-+#include <gdk/gdk.h>
-+
- #define G_LOG_USE_STRUCTURED
- #ifndef G_LOG_DOMAIN
- #define G_LOG_DOMAIN    ((gchar*)"remmina")