Gentoo Archives: gentoo-commits

From: Ben Kohler <bkohler@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: net-misc/remmina/, net-misc/remmina/files/
Date: Sat, 27 Jun 2020 11:30:41
Message-Id: 1593257400.4282fb89d694f550fb900f4ba51895396e12a4c7.bkohler@gentoo
1 commit: 4282fb89d694f550fb900f4ba51895396e12a4c7
2 Author: Ben Kohler <bkohler <AT> gentoo <DOT> org>
3 AuthorDate: Sat Jun 27 11:28:53 2020 +0000
4 Commit: Ben Kohler <bkohler <AT> gentoo <DOT> org>
5 CommitDate: Sat Jun 27 11:30:00 2020 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4282fb89
7
8 net-misc/remmina: backport examples patch
9
10 Closes: https://bugs.gentoo.org/729844
11
12 Package-Manager: Portage-2.3.103, Repoman-2.3.23
13 Signed-off-by: Ben Kohler <bkohler <AT> gentoo.org>
14
15 .../files/remmina-1.4.5-with-examples.patch | 37 ++++++++++++++++++++++
16 net-misc/remmina/remmina-1.4.5.ebuild | 1 +
17 2 files changed, 38 insertions(+)
18
19 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
20 new file mode 100644
21 index 00000000000..10ac35744d7
22 --- /dev/null
23 +++ b/net-misc/remmina/files/remmina-1.4.5-with-examples.patch
24 @@ -0,0 +1,37 @@
25 +--- /dev/null
26 ++++ b/net-misc/remmina/files/remmina-1.4.6-with-examples.patch
27 +@@ -0,0 +1,34 @@
28 ++diff -Nupr a/plugins/tool_hello_world/plugin.c b/plugins/tool_hello_world/plugin.c
29 ++--- a/plugins/tool_hello_world/plugin.c 2020-06-08 22:07:44.000000000 +0200
30 +++++ b/plugins/tool_hello_world/plugin.c 2020-06-10 20:18:48.495507560 +0200
31 ++@@ -42,17 +42,19 @@
32 ++ #include <gdk/gdkx.h>
33 ++
34 ++ static RemminaPluginService *remmina_plugin_service = NULL;
35 +++#define remmina_plugin_debug(fmt, ...) remmina_plugin_service->_remmina_debug(__func__, fmt __VA_OPT__(,) __VA_ARGS__)
36 +++
37 ++
38 ++ static void remmina_plugin_tool_init(RemminaProtocolWidget *gp)
39 ++ {
40 ++ TRACE_CALL(__func__);
41 ++- remmina_plugin_service->_debug("[%s] Plugin init", PLUGIN_NAME);
42 +++ remmina_plugin_debug("[%s] Plugin init", PLUGIN_NAME);
43 ++ }
44 ++
45 ++ static gboolean remmina_plugin_tool_open_connection(RemminaProtocolWidget *gp)
46 ++ {
47 ++ TRACE_CALL(__func__);
48 ++- remmina_plugin_service->_debug("[%s] Plugin open connection", PLUGIN_NAME);
49 +++ remmina_plugin_debug("[%s] Plugin open connection", PLUGIN_NAME);
50 ++
51 ++ GtkDialog *dialog;
52 ++ dialog = GTK_DIALOG(gtk_message_dialog_new(NULL, GTK_DIALOG_MODAL | GTK_DIALOG_USE_HEADER_BAR,
53 ++@@ -65,7 +67,7 @@ static gboolean remmina_plugin_tool_open
54 ++ static gboolean remmina_plugin_tool_close_connection(RemminaProtocolWidget *gp)
55 ++ {
56 ++ TRACE_CALL(__func__);
57 ++- remmina_plugin_service->_debug("[%s] Plugin close connection", PLUGIN_NAME);
58 +++ remmina_plugin_debug("[%s] Plugin close connection", PLUGIN_NAME);
59 ++ remmina_plugin_service->protocol_plugin_emit_signal(gp, "disconnect");
60 ++ return FALSE;
61 ++ }
62
63 diff --git a/net-misc/remmina/remmina-1.4.5.ebuild b/net-misc/remmina/remmina-1.4.5.ebuild
64 index f247dfe1992..04a7d55f4b7 100644
65 --- a/net-misc/remmina/remmina-1.4.5.ebuild
66 +++ b/net-misc/remmina/remmina-1.4.5.ebuild
67 @@ -58,6 +58,7 @@ DOCS=( AUTHORS CHANGELOG.md README.md THANKS.md )
68 S="${WORKDIR}/${MY_P}"
69
70 src_prepare() {
71 + eapply "${FILESDIR}"/${P}-with-examples.patch
72 cmake_src_prepare
73 xdg_src_prepare
74 }