summaryrefslogtreecommitdiff
path: root/net-misc/remmina
diff options
context:
space:
mode:
Diffstat (limited to 'net-misc/remmina')
-rw-r--r--net-misc/remmina/Manifest2
-rw-r--r--net-misc/remmina/files/remmina-1.4.5-with-examples.patch84
2 files changed, 48 insertions, 38 deletions
diff --git a/net-misc/remmina/Manifest b/net-misc/remmina/Manifest
index ce62b7f77a42..ca36d27bc4c8 100644
--- a/net-misc/remmina/Manifest
+++ b/net-misc/remmina/Manifest
@@ -1,4 +1,4 @@
-AUX remmina-1.4.5-with-examples.patch 1594 BLAKE2B becf55ac5b0d5d4909dc49da5b43590990ce91de05d5b2c25cc6abbd915b25310866903ac73d79cef3b6971627d59aaed4b64628071d9b41498d767d4f651f26 SHA512 f833872508b01de26dc12fd09370a98415b065e40746a8e0afacf485107e375c21d9566a48adf2128cd828ba8c8006b390e44959df128f9ae2038db026b304bc
+AUX remmina-1.4.5-with-examples.patch 1845 BLAKE2B 0da938e4f9c6ce8f0dc094449477d030c4b26c05b0758d9669d6f29311ee4c3273374addd92c2e191cb86c91dbce7ebb7681ebec46462986696c746e0dcd03ec SHA512 7a4c09378238a675e76eadeaa29215d32ea5f6afa618bdb60569b30ed9fba0dcbf7ae7cf3a1de47a05d25c5b61a3bd14313930dc02967477c20e212483af1e59
DIST Remmina-v1.4.3.tar.gz 1705751 BLAKE2B 4d49b5d5da4017cc1870a5e37a73db767862997cffdd58b080ab5707eeb293eed7e756ca974a4f4922bb9417e94610fe07b1e774f5ad7e269e797362ff264e83 SHA512 9f555f9ff60e2a136f6379a0f2828d091aa972dcff7ebd09eaf1834dc10f506d218e5cb6856c17f625c1040a11240da2ed5ebe9f4fe32a083494cfcbbdef1a41
DIST Remmina-v1.4.5.tar.gz 1787506 BLAKE2B 095a01cca168daaef9ef59ff5adb9bb475467e8e8c42cac74a1a605627b09aa7246aa941b514b0de29739516aa988148f377040ed8629df3d5b17f0b1158cf76 SHA512 fec07b488db8d438aa6a0263e13557c10f1401a81b3371a2da03a1037d51f8e58e88652a15c6d6ce9e02535ef93ed0f9c5b674ab5efab430380f4b7dd57c4d9d
DIST Remmina-v1.4.7.tar.gz 1908687 BLAKE2B a6656821d727914f70bafe50d5c3764e3c36a4753c618048b91eadc1fa27b8f03bcd313b99cfd46cadc446b85b583994528895f9fb755d6c8ee28e0b0bab66d1 SHA512 ebe1e62e090062107ed6674d494255bac9e3d175553bc5ae949aa1bfc9e1de4b59f35f523ee36b08bb02580513d3b585344b9864001dd991cac656f1c13116e9
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 10ac35744d7f..930f326b27b4 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
+