gentoo resync : 21.06.2020

3 files changed, 38 insertions, 2 deletions

diff --git a/net-misc/remmina/Manifest b/net-misc/remmina/Manifest
index 5a7e8e0579a4..bdc49c3377a1 100644
--- a/net-misc/remmina/Manifest
+++ b/net-misc/remmina/Manifest
@@ -1,7 +1,8 @@
+AUX remmina-1.4.6-with-examples.patch 1466 BLAKE2B b2291567efa16b13e100d7b21795a497bb93d3839faa776b634e449db133e79d228d973d1d0f0117390e4e5e6b371988ea366d070cd73544f2cddc127cf17fa9 SHA512 9701f769865ecb003aee8fb16c39bb8b7f9bc28039b4f2759ef5bfe33f0c06b3f274c650be332f86d07e99ae14b1b913f89bba4c6e84e04602dedf0180caff3a
 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.6.tar.gz 1895441 BLAKE2B 38dbda1976f3af3ad89c84eaecf50c42a2a22186dd013d30ae0cea83f5ee54af1443c196b79c1b4684e6afbc6f3d8fc8461fae18806476b8ae1a79148a2ccb12 SHA512 8b918502622957f6a1637d5d79ec605f7bf1c164f902c76a3a65dc316a8ccd11de63066182ffad4783bcb7f86d5e04ca6462f6a5d2e4256c4ae14c6f483419ea
 EBUILD remmina-1.4.3.ebuild 2614 BLAKE2B e87cb2e5c2e626fbc8309bfeaddf385b9dd47fae9d0244ac3a79a631ebda8df235d3dfd59009b5882520fef7e697b6d75fb6fc16204cb6c747608a58b9092684 SHA512 855a700ce278a7385e5240c7767fa37b2478d227aa5fa9f899c08c1012e7669a94efb27a2bbce3d3f25d7fcc3047778141e56739524d4d72960175a5bdb545a3
 EBUILD remmina-1.4.5.ebuild 2477 BLAKE2B f3e4eb101a87010ceaaf2ac7b717885e122cb16f563135224a0b5215ac780de3ca45b3437eba9a24ee5bcc4cac6b93834ed8d63c8a9e1e6bebbc13a35f242e20 SHA512 8d7a30d2a406edbd9928a75fe749decb593393a6e40e498d1b7fda3bfebaa1592296eb3cc3d43cf767270b32c3b55d5b281908aec8e20a5d2a97af8221acd8b3
-EBUILD remmina-1.4.6.ebuild 2519 BLAKE2B 0cb9245e01e3e36d022a76089cfb57d4f50681585b01e1a54f22d32c34a8b26f39721d882ee2628a442f915684ec0fbd0441caeafe34dc962535181f058b6ce8 SHA512 77134ae29285309a7e3d4e453475047d0c28110d849df984307bfff2ba00c4633e1a7cafc8593a065dd15d18c39d31ab62ece614a48f535001d7d40f66bc67c4
+EBUILD remmina-1.4.6.ebuild 2576 BLAKE2B e69f281212f854010d576642b5b8de538003c320d9c8ddaebf542e099cd6bd6cf0ba6551d4520c105b5c10a1b0ce79e12e9b768b683bc320c298ef6d53e03ca0 SHA512 457a54501dbedaa6538460710df82c8aa909e35165ed686b32d801385e14a04b9ca1071a4b06325025f1ff9adb5e57ce7e46e430f8d956626c9792ad8fd693b1
 MISC metadata.xml 1084 BLAKE2B e4bb4c696f1ef71959b779ccad19d3ee380a6e846e42b1e02caf2a772df07d168bb9623b8f29cfdcc7fb37f60523e6c1fc471f016ea3437c18b3e7512a4bcad4 SHA512 c0b50eca7d4cdd6dfa201aabec7c195b7dca44938ee627919a000bdc47fc95acd4107936a61399fab2c78dfcd3b97ce06753e97fc6bb21015758afe91337a346
diff --git a/net-misc/remmina/files/remmina-1.4.6-with-examples.patch b/net-misc/remmina/files/remmina-1.4.6-with-examples.patch
new file mode 100644
index 000000000000..259ef19e0fc8
--- /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;
+ }
diff --git a/net-misc/remmina/remmina-1.4.6.ebuild b/net-misc/remmina/remmina-1.4.6.ebuild
index f429622f2dc7..8902bb75ac42 100644
--- a/net-misc/remmina/remmina-1.4.6.ebuild
+++ b/net-misc/remmina/remmina-1.4.6.ebuild
@@ -54,12 +54,13 @@ RDEPEND="
 "
 
 DOCS=( AUTHORS CHANGELOG.md README.md THANKS.md )
+PATCHES=( "${FILESDIR}"/${P}-with-examples.patch )
 
 S="${WORKDIR}/${MY_P}"
 
 src_prepare() {
+	xdg_environment_reset
 	cmake_src_prepare
-	xdg_src_prepare
 }
 
 src_configure() {