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

2024-02-24 Thread Ben Kohler 
commit: 4899fcb650f55e7d584ae05f5c773ac8e758f4f5
Author: Ben Kohler  gentoo  org>
AuthorDate: Sat Feb 24 17:54:07 2024 +
Commit: Ben Kohler  gentoo  org>
CommitDate: Sat Feb 24 17:54:26 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4899fcb6

net-misc/remmina: drop 1.4.33-r1, 1.4.34

Signed-off-by: Ben Kohler  gentoo.org>

 net-misc/remmina/Manifest  |   2 -
 .../remmina/files/remmina-1.4.32-REM-2981.patch|  54 --
 net-misc/remmina/remmina-1.4.33-r1.ebuild  | 111 -
 net-misc/remmina/remmina-1.4.34.ebuild | 110 
 4 files changed, 277 deletions(-)

diff --git a/net-misc/remmina/Manifest b/net-misc/remmina/Manifest
index afe6f16e7906..6b1761e3817b 100644
--- a/net-misc/remmina/Manifest
+++ b/net-misc/remmina/Manifest
@@ -1,4 +1,2 @@
 DIST Remmina-v1.4.31.tar.bz2 2078380 BLAKE2B 
daee0b68305e3ec0eedcc8cb3622ed5649303562fccd766bf5cc6ed1e96f27c1608286afa1b9bbaf44480bdc210f71a863bf442974ebbc1c50ebfbcf2dfeea35
 SHA512 
288e7fb5b5251d251e9502ec310f2bfe526f1a28a91c9dd9e79c712191c5d2b287844bd994596dc5097ec50ed8282d0af11144f6c5f0a74cb444aa4c6a8f6838
-DIST Remmina-v1.4.33.tar.bz2 2105164 BLAKE2B 
94f73f895f7e0478779d71097ee57ba049299e702527df2cf8a48ea41647f641684131b10b2f4faa7cf831ccea29611a68c2427127a2ebea87acac54f996a446
 SHA512 
c019131d2c3756946a332a3037286c8370a2e07b20a416c657cc2852ece9e59236499a2c5e45d4e9f391d9265089763957c6968c668e110c350e668053db6d82
-DIST Remmina-v1.4.34.tar.bz2 2133029 BLAKE2B 
696eafe6df62c30968d9f628ac58f738fa03adc4a92f8c6c27f3e131aaed500ea863de8691d28a1cf7ea0b248ff7059421072b6667a11a99df7233fc93c438e8
 SHA512 
1b9811f55e7a491f9f49d0384b84ae6ab84ee143421d4478b02f3ba8b311ab30babc8fbc47ff2fffc8adb6749d6af6d200f4aff511098e4f047313e5e05d8f66
 DIST Remmina-v1.4.35.tar.bz2 2150047 BLAKE2B 
3ba730cd4009a797ee7d66bbe4390e9db221ee5cf0b008e0eb3df4a992d7260ddc65983c8c34d1aa1bb2190ed1104653e269369565d7e4eecaf3078ffc84330c
 SHA512 
36dc419b4473c71f6b3e53338f4a3cf7a1fe60534ea0dce375b4c9fd00cd9d8a618c4376be4d031bdee1eed8b4aade4538a6cc414629ef6dde41cdcd513a6d36

diff --git a/net-misc/remmina/files/remmina-1.4.32-REM-2981.patch 
b/net-misc/remmina/files/remmina-1.4.32-REM-2981.patch
deleted file mode 100644
index 5725349b2cae..
--- a/net-misc/remmina/files/remmina-1.4.32-REM-2981.patch
+++ /dev/null
@@ -1,54 +0,0 @@
-From dbd6f94974c4d7df313963ffefecb1ff8ca9ecb6 Mon Sep 17 00:00:00 2001
-From: myheroyuki 
-Date: Sun, 24 Sep 2023 23:15:58 +0900
-Subject: [PATCH] [REM-2981] Move ssh-unrelated code outside of HAVE_LIBSSH
- ifdef
-

- src/remmina_file_editor.c | 23 ---
- 1 file changed, 12 insertions(+), 11 deletions(-)
-
-diff --git a/src/remmina_file_editor.c b/src/remmina_file_editor.c
-index feee4a031..1c1fa9858 100644
 a/src/remmina_file_editor.c
-+++ b/src/remmina_file_editor.c
-@@ -361,17 +361,6 @@ static GtkWidget 
*remmina_file_editor_create_notebook_tab(RemminaFileEditor *gfe
-   return grid;
- }
- 
--#ifdef HAVE_LIBSSH
--
--static void 
remmina_file_editor_ssh_tunnel_server_custom_radio_on_toggled(GtkToggleButton 
*togglebutton, RemminaFileEditor *gfe)
--{
--  TRACE_CALL(__func__);
--  gtk_widget_set_sensitive(GTK_WIDGET(gfe->priv->ssh_tunnel_server_entry),
--   
gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(gfe->priv->ssh_tunnel_enabled_check))
 &&
--   (gfe->priv->ssh_tunnel_server_custom_radio == 
NULL ||
--
gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(gfe->priv->ssh_tunnel_server_custom_radio;
--}
--
- 
- static void 
remmina_file_editor_assistance_enabled_check_on_toggled(GtkToggleButton 
*togglebutton,
-   
RemminaFileEditor *gfe)
-@@ -392,6 +381,18 @@ static void 
remmina_file_editor_assistance_enabled_check_on_toggled(GtkToggleBut
-   }
- }
- 
-+#ifdef HAVE_LIBSSH
-+
-+static void 
remmina_file_editor_ssh_tunnel_server_custom_radio_on_toggled(GtkToggleButton 
*togglebutton, RemminaFileEditor *gfe)
-+{
-+  TRACE_CALL(__func__);
-+  gtk_widget_set_sensitive(GTK_WIDGET(gfe->priv->ssh_tunnel_server_entry),
-+   
gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(gfe->priv->ssh_tunnel_enabled_check))
 &&
-+   (gfe->priv->ssh_tunnel_server_custom_radio == 
NULL ||
-+
gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(gfe->priv->ssh_tunnel_server_custom_radio;
-+}
-+
-+
- static void 
remmina_file_editor_ssh_tunnel_enabled_check_on_toggled(GtkToggleButton 
*togglebutton,
-   
RemminaFileEditor *gfe, RemminaProtocolSSHSetting ssh_setting)
- {
--- 
-2.42.0
-

diff --git a/net-misc/remmina/remmina-1.4.33-r1.ebuild 
b/net-misc/remmina/remmina-1.4.33-r1.ebuild
deleted file mode 100644
index de2dbe944bb

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

2023-10-02 Thread Ben Kohler 
commit: 7b7b08a26f6128f5467e26715a4ae074caaadb01
Author: Branko Grubic  gmail  com>
AuthorDate: Thu Sep 28 16:52:10 2023 +
Commit: Ben Kohler  gentoo  org>
CommitDate: Mon Oct  2 14:47:57 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7b7b08a2

net-misc/remmina: Fixes build with USE="-ssh"

Bug: https://gitlab.com/Remmina/Remmina/-/issues/2981
Bug: https://bugs.gentoo.org/914851

Signed-off-by: Branko Grubic  gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/33106
Signed-off-by: Ben Kohler  gentoo.org>

 .../remmina/files/remmina-1.4.32-REM-2981.patch| 54 ++
 net-misc/remmina/remmina-1.4.32.ebuild |  1 +
 2 files changed, 55 insertions(+)

diff --git a/net-misc/remmina/files/remmina-1.4.32-REM-2981.patch 
b/net-misc/remmina/files/remmina-1.4.32-REM-2981.patch
new file mode 100644
index ..5725349b2cae
--- /dev/null
+++ b/net-misc/remmina/files/remmina-1.4.32-REM-2981.patch
@@ -0,0 +1,54 @@
+From dbd6f94974c4d7df313963ffefecb1ff8ca9ecb6 Mon Sep 17 00:00:00 2001
+From: myheroyuki 
+Date: Sun, 24 Sep 2023 23:15:58 +0900
+Subject: [PATCH] [REM-2981] Move ssh-unrelated code outside of HAVE_LIBSSH
+ ifdef
+
+---
+ src/remmina_file_editor.c | 23 ---
+ 1 file changed, 12 insertions(+), 11 deletions(-)
+
+diff --git a/src/remmina_file_editor.c b/src/remmina_file_editor.c
+index feee4a031..1c1fa9858 100644
+--- a/src/remmina_file_editor.c
 b/src/remmina_file_editor.c
+@@ -361,17 +361,6 @@ static GtkWidget 
*remmina_file_editor_create_notebook_tab(RemminaFileEditor *gfe
+   return grid;
+ }
+ 
+-#ifdef HAVE_LIBSSH
+-
+-static void 
remmina_file_editor_ssh_tunnel_server_custom_radio_on_toggled(GtkToggleButton 
*togglebutton, RemminaFileEditor *gfe)
+-{
+-  TRACE_CALL(__func__);
+-  gtk_widget_set_sensitive(GTK_WIDGET(gfe->priv->ssh_tunnel_server_entry),
+-   
gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(gfe->priv->ssh_tunnel_enabled_check))
 &&
+-   (gfe->priv->ssh_tunnel_server_custom_radio == 
NULL ||
+-
gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(gfe->priv->ssh_tunnel_server_custom_radio;
+-}
+-
+ 
+ static void 
remmina_file_editor_assistance_enabled_check_on_toggled(GtkToggleButton 
*togglebutton,
+   
RemminaFileEditor *gfe)
+@@ -392,6 +381,18 @@ static void 
remmina_file_editor_assistance_enabled_check_on_toggled(GtkToggleBut
+   }
+ }
+ 
++#ifdef HAVE_LIBSSH
++
++static void 
remmina_file_editor_ssh_tunnel_server_custom_radio_on_toggled(GtkToggleButton 
*togglebutton, RemminaFileEditor *gfe)
++{
++  TRACE_CALL(__func__);
++  gtk_widget_set_sensitive(GTK_WIDGET(gfe->priv->ssh_tunnel_server_entry),
++   
gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(gfe->priv->ssh_tunnel_enabled_check))
 &&
++   (gfe->priv->ssh_tunnel_server_custom_radio == 
NULL ||
++
gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(gfe->priv->ssh_tunnel_server_custom_radio;
++}
++
++
+ static void 
remmina_file_editor_ssh_tunnel_enabled_check_on_toggled(GtkToggleButton 
*togglebutton,
+   
RemminaFileEditor *gfe, RemminaProtocolSSHSetting ssh_setting)
+ {
+-- 
+2.42.0
+

diff --git a/net-misc/remmina/remmina-1.4.32.ebuild 
b/net-misc/remmina/remmina-1.4.32.ebuild
index 86fae2ec9b89..772019a15889 100644
--- a/net-misc/remmina/remmina-1.4.32.ebuild
+++ b/net-misc/remmina/remmina-1.4.32.ebuild
@@ -71,6 +71,7 @@ pkg_setup() {
 }
 
 src_prepare() {
+   PATCHES+=( ${FILESDIR}/${P}-REM-2981.patch ) #914851
xdg_environment_reset
cmake_src_prepare
 }

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

2022-12-27 Thread Ben Kohler 
commit: 5788eb793c9090b0bc9dcf310662d9981017b098
Author: Ben Kohler  gentoo  org>
AuthorDate: Tue Dec 27 17:59:44 2022 +
Commit: Ben Kohler  gentoo  org>
CommitDate: Tue Dec 27 18:00:47 2022 +
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  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..
--- 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 
-+
- #define G_LOG_USE_STRUCTURED
- #ifndef G_LOG_DOMAIN
- #define G_LOG_DOMAIN((gchar*)"remmina")

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

2021-01-21 Thread Ben Kohler 
commit: c17369e82411e9f33bfb5a59a08d2a4c4ce8d940
Author: Ben Kohler  gentoo  org>
AuthorDate: Thu Jan 21 13:03:32 2021 +
Commit: Ben Kohler  gentoo  org>
CommitDate: Thu Jan 21 13:03:52 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c17369e8

net-misc/remmina: drop old

Package-Manager: Portage-3.0.14, Repoman-3.0.2
Signed-off-by: Ben Kohler  gentoo.org>

 net-misc/remmina/Manifest  |  2 -
 .../files/remmina-1.4.5-with-examples.patch| 47 ---
 net-misc/remmina/remmina-1.4.8-r1.ebuild   | 98 --
 net-misc/remmina/remmina-1.4.9.ebuild  | 98 --
 4 files changed, 245 deletions(-)

diff --git a/net-misc/remmina/Manifest b/net-misc/remmina/Manifest
index 33ac4b91541..56f27d40e87 100644
--- a/net-misc/remmina/Manifest
+++ b/net-misc/remmina/Manifest
@@ -1,3 +1 @@
 DIST Remmina-v1.4.10.tar.gz 2072202 BLAKE2B 
38b6a3cca9b5956a252d4d4433910d46d0d36a2232a2a107b1e556f118f3b1a6d3c02b0bea26a39a52d572c1380dbb5bdac1acd8d6ba07c97b9acc9a64a9142f
 SHA512 
89fed0b0ed17ac1db57a1d9ad33b80f4d17f6cfb4ff7db9b6434d9d4dabf708971e4d93dd573dbf606d1899311e564f159a656223d66bc4a9d7a15a29b5b5963
-DIST Remmina-v1.4.8.tar.gz 1998851 BLAKE2B 
80427d06c041d6315fa8fabe90aa8a52ebd2cd1a76ab0e74672f54328d5fa9d0d287e551a5027e5ef60471ce4d934cfe745742058f26e7b93a95e2a1f85dbfd9
 SHA512 
cf8ea93904a1643f480d7de72bc4154570bcf184150ffc4b3b06699c95f354bc2f4f595c3b00c6c87e9797dc60bcb9993913647b2073f1e85977026f290d81bf
-DIST Remmina-v1.4.9.tar.gz 2033555 BLAKE2B 
901e0118f8231a6bf021a0389a1db9462f19527b21954f3deba24e92e3c04d0d323efa3aeb475f0ec915e8cdc4b55cf331ba2010598e8a58567cba0f353b5177
 SHA512 
21c5141619874a3d90fd1e2ee9ae87dd4ca4b7dc14c0e16f06bca01b38f84db6e7ab178b0f6e9db703bf5d1ddcb17db45553786bb047cf814b1ff67f4aa6139f

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
deleted file mode 100644
index 930f326b27b..000
--- a/net-misc/remmina/files/remmina-1.4.5-with-examples.patch
+++ /dev/null
@@ -1,47 +0,0 @@
-From 5d569e04f33b2c9a8f735d928ad2c9cec9d1c4b5 Mon Sep 17 00:00:00 2001
-From: Antenore Gatta 
-Date: Sun, 14 Jun 2020 09:05:18 +0200
-Subject: [PATCH] Build failure with -DWITH_EXAMPLES=yes, closes #2228
-
-Signed-off-by: Antenore Gatta 

- 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 
- 
- 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
-

diff --git a/net-misc/remmina/remmina-1.4.8-r1.ebuild 
b/net-misc/remmina/remmina-1.4.8-r1.ebuild
deleted file mode 100644
index 4222860b898..000
--- a/net-misc/remmina/remmina-1.4.8-r1.ebuild
+++ /dev/null
@@ -1,98 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake optfeature xdg
-
-MY_P="${PN^}-v${PV}"
-
-DESCRIPTION="A GTK+ RDP, SPICE, VNC, XDMCP and SSH client"
-HOMEPAGE="https://remmina.org/";
-SRC_URI="https://gitlab.com/Remmina/Remmina/-/archive/v${PV}/${MY_P}.tar.gz";
-
-LICENSE="GPL-2+-with-openssl-exception"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="appindicator crypt cups examples gnome-keyring kwallet libressl nls 
spice ssh rdp telemetry telepathy vnc webkit zeroconf"
-
-DEPEND="
-   dev-libs/glib:2
-   dev-libs/json-glib
-   dev-libs/libsodium:=
-   net-libs/libsoup
-   x11-libs/gdk-pixbuf
-   x11-libs/gtk+:3
-   x1

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

2020-06-30 Thread Ben Kohler 
commit: 54a385d1d66d042549760b5479775a5f266e7a38
Author: Ben Kohler  gentoo  org>
AuthorDate: Tue Jun 30 11:08:02 2020 +
Commit: Ben Kohler  gentoo  org>
CommitDate: Tue Jun 30 11:10:24 2020 +
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  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.0 
+0200
- b/plugins/tool_hello_world/plugin.c   2020-06-10 20:18:48.495507560 
+0200
-+@@ -42,17 +42,19 @@
-+ #include 
-+ 
-+ 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 
+Date: Sun, 14 Jun 2020 09:05:18 +0200
+Subject: [PATCH] Build failure with -DWITH_EXAMPLES=yes, closes #2228
+
+Signed-off-by: Antenore Gatta 
+---
+ 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 
+ 
+ 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/, net-misc/remmina/

2020-06-18 Thread Ben Kohler 
commit: 0eae940a426b85831abb2deea89fdcbbcd55b4e4
Author: Ben Kohler  gentoo  org>
AuthorDate: Thu Jun 18 13:26:45 2020 +
Commit: Ben Kohler  gentoo  org>
CommitDate: Thu Jun 18 13:27:28 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0eae940a

net-misc/remmina: add patch for USE=examples

Also drop (afaik) unneeded xdg_src_prepare as it caused double-applied
patches & is not needed.

Closes: https://bugs.gentoo.org/727870
Package-Manager: Portage-2.3.101, Repoman-2.3.22
Signed-off-by: Ben Kohler  gentoo.org>

 .../files/remmina-1.4.6-with-examples.patch| 34 ++
 net-misc/remmina/remmina-1.4.6.ebuild  |  2 +-
 2 files changed, 35 insertions(+), 1 deletion(-)

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 000..259ef19e0fc
--- /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.c2020-06-08 22:07:44.0 
+0200
 b/plugins/tool_hello_world/plugin.c2020-06-10 20:18:48.495507560 
+0200
+@@ -42,17 +42,19 @@
+ #include 
+ 
+ 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 f429622f2dc..b1bcb852ddf 100644
--- a/net-misc/remmina/remmina-1.4.6.ebuild
+++ b/net-misc/remmina/remmina-1.4.6.ebuild
@@ -54,12 +54,12 @@ RDEPEND="
 "
 
 DOCS=( AUTHORS CHANGELOG.md README.md THANKS.md )
+PATCHES=( "${FILESDIR}"/${P}-with-examples.patch )
 
 S="${WORKDIR}/${MY_P}"
 
 src_prepare() {
cmake_src_prepare
-   xdg_src_prepare
 }
 
 src_configure() {

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

2020-02-09 Thread Ben Kohler 
commit: e2ba17ea684c685b213acc48dc7eefcac684b7a2
Author: Ben Kohler  gentoo  org>
AuthorDate: Sun Feb  9 13:31:48 2020 +
Commit: Ben Kohler  gentoo  org>
CommitDate: Sun Feb  9 13:32:13 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e2ba17ea

net-misc/remmina: add -fno-common/gcc10 fix from upstream

Closes: https://bugs.gentoo.org/708740
Package-Manager: Portage-2.3.88, Repoman-2.3.20
Signed-off-by: Ben Kohler  gentoo.org>

 net-misc/remmina/files/remmina-gcc10.patch | 36 ++
 net-misc/remmina/remmina-1.3.10.ebuild |  1 +
 2 files changed, 37 insertions(+)

diff --git a/net-misc/remmina/files/remmina-gcc10.patch 
b/net-misc/remmina/files/remmina-gcc10.patch
new file mode 100644
index 000..214a8c88787
--- /dev/null
+++ b/net-misc/remmina/files/remmina-gcc10.patch
@@ -0,0 +1,36 @@
+From 27f84d1c0a2e4c2432281f25ef3026bb00bbdc15 Mon Sep 17 00:00:00 2001
+From: Antenore Gatta 
+Date: Sun, 9 Feb 2020 02:34:50 +0100
+Subject: [PATCH] Removing struct declaration utsname as not used - Closes
+ #2080
+
+---
+ src/remmina_stats.c | 5 -
+ 1 file changed, 5 deletions(-)
+
+diff --git a/src/remmina_stats.c b/src/remmina_stats.c
+index a6eb6f609..3b7cbf0bf 100644
+--- a/src/remmina_stats.c
 b/src/remmina_stats.c
+@@ -159,8 +159,6 @@
+ #endif
+ #include "remmina_stats.h"
+ 
+-struct utsname u;
+-
+ struct ProfilesData {
+   GHashTable *proto_count;
+   GHashTable *proto_date;
+@@ -864,9 +862,6 @@ JsonNode *remmina_stats_get_all()
+   json_builder_set_member_name(b, "REMMINAVERSION");
+   json_builder_add_value(b, n);
+ 
+-  if (uname(&u) == -1)
+-  g_print("uname:");
+-
+   n = remmina_stats_get_os_info();
+   json_builder_set_member_name(b, "SYSTEM");
+   json_builder_add_value(b, n);
+-- 
+2.24.1
+

diff --git a/net-misc/remmina/remmina-1.3.10.ebuild 
b/net-misc/remmina/remmina-1.3.10.ebuild
index 42a9e58cb1c..37a05502cf5 100644
--- a/net-misc/remmina/remmina-1.3.10.ebuild
+++ b/net-misc/remmina/remmina-1.3.10.ebuild
@@ -51,6 +51,7 @@ RDEPEND="${CDEPEND}
 "
 
 DOCS=( AUTHORS CHANGELOG.md README.md THANKS.md )
+PATCHES=( "${FILESDIR}"/${PN}-gcc10.patch )
 
 S="${WORKDIR}/${MY_P}"

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

2016-11-06 Thread David Seifert 
commit: 569f04d7daf8710d815810599c4ca09de21b429d
Author: Diogo Pereira  gmail  com>
AuthorDate: Fri Nov  4 21:41:39 2016 +
Commit: David Seifert  gentoo  org>
CommitDate: Sun Nov  6 20:17:08 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=569f04d7

net-misc/remmina: drop old

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

Signed-off-by: David Seifert  gentoo.org>

 net-misc/remmina/Manifest  |  1 -
 .../files/remmina-1.0.0_p20121004-avahi.patch  | 68 
 ...mina-1.2.0_rc14-allow-disabling-libsecret.patch | 22 -
 net-misc/remmina/metadata.xml  |  1 -
 net-misc/remmina/remmina-1.2.0_rc14-r1.ebuild  | 94 --
 net-misc/remmina/remmina-1.2.0_rc14.ebuild | 92 -
 net-misc/remmina/remmina-1.2.0_rc3.ebuild  | 91 -
 7 files changed, 369 deletions(-)

diff --git a/net-misc/remmina/Manifest b/net-misc/remmina/Manifest
index b1c5bfc..0a72bd2 100644
--- a/net-misc/remmina/Manifest
+++ b/net-misc/remmina/Manifest
@@ -1,4 +1,3 @@
-DIST remmina-1.2.0_rc14.tar.gz 940432 SHA256 
00c854cd08438399f3788606bf5ee6e4fad48016bab25b3c853c93e85e371050 SHA512 
02d5db7c061b760d2b101e2e5b906015c8192b5cc30d75ce649c522e4d7f53ade2dff65324c244139bfce491d31a413342a330dfe0b217af5847e1adbb53935f
 WHIRLPOOL 
31ac11f07665d05e4d48712b8364670c8529a9a96a76809c28fa52327b5a75efff561b7ae4e38f70c8579e15356b7b8ab98ed8af30bc967a8a75c8b913bb7e3e
 DIST remmina-1.2.0_rc15.tar.gz 968892 SHA256 
ba3ab12d1701cf00c09edddbd65293c1b9024195297cce3e8812238e0b5b82f7 SHA512 
f899eb57688f1106c607fefc59e44be006e804259e681604747e8af1dcf8527dcae3ca8a1a3dd868a079f37870184100adfde33dc9181bab6a067491147d6aba
 WHIRLPOOL 
e79cca76c6585e8531ab4386ad3a6125dd98f917239369e88794d672661a0f188f680fe0aa5c09f09cb1d54c1b038120db4de2754e995fe58604b5638324f43d
 DIST remmina-1.2.0_rc16.tar.gz 1008438 SHA256 
edb347f9e4d0a2e682f7ffd22caa364b477653a1aca31d1c1922a86d81df4995 SHA512 
a6d2fb95a3fc68ee7ce4c8205c775cbc7bb83fa2f90b68d04f355b4ca8b4d0956a29ecbc028260c432b55c582802e9f243ad62426212d9fd0f02f7e50a56856f
 WHIRLPOOL 
a5d136e1abaeafcc1ad070c400a0c7456e29d1406ea3542add5eb36c4cb1e32cedf0a2bac855298a5e1e703e19774d007ec70c822c49ec13a9f565123b33181d
 DIST remmina-1.2.0_rc3.tar.gz 791812 SHA256 
bfe352cd87b031585d867d519c3a36ee117cca9cc79efb7c11cd11d0f9697208 SHA512 
e740cbeda40bfca96c846c77140120ff92803f1bf5fff15c3eb3ba90e7ebe9ccbfa04825ad3fca96c09a5440f496934711141dedc665572965bf0d9c32e053da
 WHIRLPOOL 
1686a4e029a9cd3019b2dc0b59c715cc67b66d6c75337c7032a72ee0228e1df7d7dfd8dc7fb7f51d6298a1c886b29d45b7352bf7a9e025ecb1cd184b08d385ed

diff --git a/net-misc/remmina/files/remmina-1.0.0_p20121004-avahi.patch 
b/net-misc/remmina/files/remmina-1.0.0_p20121004-avahi.patch
deleted file mode 100644
index abb058a..
--- a/net-misc/remmina/files/remmina-1.0.0_p20121004-avahi.patch
+++ /dev/null
@@ -1,68 +0,0 @@
-https://bugs.gentoo.org/show_bug.cgi?id=438060
-https://github.com/FreeRDP/Remmina/issues/120
-
-diff --git a/cmake/FindAVAHI.cmake b/cmake/FindAVAHI.cmake
-index 0a5cc21..91878dc 100644
 a/cmake/FindAVAHI.cmake
-+++ b/cmake/FindAVAHI.cmake
-@@ -17,29 +17,42 @@
- # Foundation, Inc., 59 Temple Place, Suite 330, 
- # Boston, MA 02111-1307, USA.
- 
--if(GTK3_FOUND)
--  set(_AVAHI_LIB_NAME avahi-ui-gtk3)
--  set(_AVAHI_PKG_NAME avahi-ui-gtk3>=0.6.30 avahi-client>=0.6.30)
--else()
--  set(_AVAHI_LIB_NAME avahi-ui)
--  set(_AVAHI_PKG_NAME avahi-ui>=0.6.30 avahi-client>=0.6.30)
-+include(FindPkgConfig)
-+
-+if(PKG_CONFIG_FOUND)
-+  pkg_check_modules(PC_AVAHI_CLIENT avahi-client)
-+  if(GTK3_FOUND)
-+  set(_AVAHI_UI_LIB_NAME avahi-ui-gtk3)
-+  set(_AVAHI_UI_PKG_NAME avahi-ui-gtk3>=0.6.30 
avahi-client>=0.6.30)
-+  else()
-+  set(_AVAHI_UI_LIB_NAME avahi-ui)
-+  set(_AVAHI_UI_PKG_NAME avahi-ui>=0.6.30 avahi-client>=0.6.30)
-+  endif()
-+  pkg_check_modules(PC_AVAHI_UI ${_AVAHI_UI_PKG_NAME})
- endif()
- 
--find_package(PkgConfig)
--pkg_check_modules(PC_AVAHI ${_AVAHI_PKG_NAME})
- 
--find_path(AVAHI_INCLUDE_DIR avahi-ui/avahi-ui.h
--  HINTS ${PC_AVAHI_INCLUDEDIR} ${PC_AVAHI_INCLUDE_DIRS})
--
--find_library(AVAHI_LIBRARY NAMES ${_AVAHI_LIB_NAME}
--  HINTS ${PC_AVAHI_LIBDIR} ${PC_AVAHI_LIBRARY_DIRS})
-+find_library(AVAHI_COMMON_LIBRARY NAMES avahi-common PATHS 
${PC_AVAHI_CLIENT_LIBRARY_DIRS})
-+if(AVAHI_COMMON_LIBRARY)
-+  set(AVAHI_COMMON_FOUND TRUE)
-+endif()
- 
--include(FindPackageHandleStandardArgs)
-+find_library(AVAHI_CLIENT_LIBRARY NAMES avahi-client PATHS 
${PC_AVAHI_CLIENT_LIBRARY_DIRS})
-+if(AVAHI_CLIENT_LIBRARY)
-+  set(AVAHI_CLIENT_FOUND TRUE)
-+endif()
- 
--find_package_handle_standard_args(AVAHI DEFAULT_MSG AVAHI_LIBRARY 
AVAHI_INCLUDE_DIR)
-+find_path(AVAHI_UI_INCLUDE_DIR avahi-ui/avahi-ui.h PATHS 
${PC_AVAHI_UI_INCLUDE_DIRS})
-+find_library(AVAHI_UI_LIBRARY NAMES ${_AVAHI_UI_LIB_NAME} PATHS 
${

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

2016-08-07 Thread Patrice Clement 
commit: 598f548fb0bd385f40887eb78a25013cb86fd664
Author: Diogo Pereira  gmail  com>
AuthorDate: Sun Aug  7 16:45:05 2016 +
Commit: Patrice Clement  gentoo  org>
CommitDate: Sun Aug  7 20:43:39 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=598f548f

net-misc/remmina: libsecret and webkit-gtk fixes.

* Patch build to properly allow disabling libsecret.
* Switch from libsecret to gnome-keyring USE flag.
* Hard depend on net-libs/webkit-gtk:4.

Gentoo-Bug: http://bugs.gentoo.org/590704
Reported-by: Pacho Ramos  gentoo.org>
Closes: https://github.com/gentoo/gentoo/pull/2037

Signed-off-by: Patrice Clement  gentoo.org>

 ...mina-1.2.0_rc14-allow-disabling-libsecret.patch | 22 +
 net-misc/remmina/remmina-1.2.0_rc14-r1.ebuild  | 94 ++
 2 files changed, 116 insertions(+)

diff --git 
a/net-misc/remmina/files/remmina-1.2.0_rc14-allow-disabling-libsecret.patch 
b/net-misc/remmina/files/remmina-1.2.0_rc14-allow-disabling-libsecret.patch
new file mode 100644
index 000..06ce4c9
--- /dev/null
+++ b/net-misc/remmina/files/remmina-1.2.0_rc14-allow-disabling-libsecret.patch
@@ -0,0 +1,22 @@
+From d22cc5aa53f6c7312fb1da7a2a507155bab8fabc Mon Sep 17 00:00:00 2001
+From: Diogo Pereira 
+Date: Wed, 3 Aug 2016 01:15:52 +0100
+Subject: [PATCH] Allow disabling libsecret dependency
+
+---
+ remmina-plugins-gnome/CMakeLists.txt | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/remmina-plugins-gnome/CMakeLists.txt 
b/remmina-plugins-gnome/CMakeLists.txt
+index adf2d03..b392ad6 100644
+--- a/remmina-plugins-gnome/CMakeLists.txt
 b/remmina-plugins-gnome/CMakeLists.txt
+@@ -31,7 +31,7 @@
+ # files in the program, then also delete it here.
+ 
+ 
+-find_package(Libsecret)
++find_suggested_package(Libsecret)
+ if(LIBSECRET_FOUND)
+   set(REMMINA_PLUGINS_GNOME_SRCS
+   src/glibsecret_plugin.c

diff --git a/net-misc/remmina/remmina-1.2.0_rc14-r1.ebuild 
b/net-misc/remmina/remmina-1.2.0_rc14-r1.ebuild
new file mode 100644
index 000..70c7b33
--- /dev/null
+++ b/net-misc/remmina/remmina-1.2.0_rc14-r1.ebuild
@@ -0,0 +1,94 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+inherit cmake-utils gnome2-utils versionator
+
+MY_PV_MAIN=$(get_version_component_range 1-3)
+MY_PV_RC=$(get_version_component_range 4)
+MY_PV="${MY_PV_MAIN}-${MY_PV_RC//rc/rcgit.}"
+
+if [[ ${PV} !=  ]]; then
+   SRC_URI="https://github.com/FreeRDP/Remmina/archive/v${MY_PV}.tar.gz -> 
${P}.tar.gz"
+   KEYWORDS="~amd64 ~x86"
+else
+   inherit git-r3
+   SRC_URI=""
+   EGIT_REPO_URI="git://github.com/FreeRDP/Remmina.git
+   https://github.com/FreeRDP/Remmina.git";
+fi
+
+DESCRIPTION="A GTK+ RDP, VNC, XDMCP and SSH client"
+HOMEPAGE="http://remmina.org/ https://github.com/FreeRDP/Remmina";
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="ayatana crypt debug freerdp gnome-keyring nls ssh telepathy vte webkit 
zeroconf"
+REQUIRED_USE="ssh? ( vte )" #546886
+
+RDEPEND="
+   >=dev-libs/glib-2.31.18:2
+   >=net-libs/libvncserver-0.9.8.2
+   x11-libs/libxkbfile
+   x11-libs/gdk-pixbuf
+   x11-libs/gtk+:3
+   x11-libs/libX11
+   virtual/freedesktop-icon-theme
+   ayatana? ( dev-libs/libappindicator:3 )
+   crypt? ( dev-libs/libgcrypt:0= )
+   freerdp? ( >=net-misc/freerdp-2 )
+   gnome-keyring? ( app-crypt/libsecret )
+   ssh? ( net-libs/libssh[sftp] )
+   telepathy? ( net-libs/telepathy-glib )
+   vte? ( x11-libs/vte:2.91 )
+   webkit? ( net-libs/webkit-gtk:4 )
+   zeroconf? ( net-dns/avahi[gtk3] )
+"
+DEPEND="${RDEPEND}
+   dev-util/intltool
+   virtual/pkgconfig
+   nls? ( sys-devel/gettext )
+"
+RDEPEND+="
+   x11-base/xorg-server[kdrive]
+   !net-misc/remmina-plugins
+"
+
+DOCS=( README.md )
+
+PATCHES=( "${FILESDIR}/${P}-allow-disabling-libsecret.patch" )
+
+S="${WORKDIR}/Remmina-${MY_PV}"
+
+src_configure() {
+   local mycmakeargs=(
+   -DWITH_APPINDICATOR=$(usex ayatana)
+   -DWITH_GCRYPT=$(usex crypt)
+   -DWITH_FREERDP=$(usex freerdp)
+   -DWITH_LIBSECRET=$(usex gnome-keyring)
+   -DWITH_GETTEXT=$(usex nls)
+   -DWITH_TRANSLATIONS=$(usex nls)
+   -DWITH_LIBSSH=$(usex ssh)
+   -DWITH_TELEPATHY=$(usex telepathy)
+   -DWITH_VTE=$(usex vte)
+   -DWITH_SURVEY=$(usex webkit)
+   -DWITH_AVAHI=$(usex zeroconf)
+   -DGTK_VERSION=3
+   )
+   cmake-utils_src_configure
+}
+
+pkg_preinst() {
+   gnome2_icon_savelist
+}
+
+pkg_postinst() {
+   gnome2_icon_cache_update
+
+   elog "XDMCP support requires x11-base/xorg-server[xephyr]."
+}
+
+pkg_postrm() {
+   gnome2_icon_cache_update
+}