gentoo auto-resync : 02:10:2023 - 17:46:37

4 files changed, 170 insertions, 1 deletions

diff --git a/net-misc/remmina/Manifest b/net-misc/remmina/Manifest
index c91b8ee9637b..ed99b38747ee 100644
--- a/net-misc/remmina/Manifest
+++ b/net-misc/remmina/Manifest
@@ -1,9 +1,12 @@
+AUX remmina-1.4.32-REM-2981.patch 2104 BLAKE2B e9cf4692a218e0abfbc1ef0b4e694d239ac70dcdf177e83c7250638d27171cf378055e0889836f1c94c9fcd3d536eaf1270844eebc67ba63d9b3ecdbf69fb485 SHA512 0e6fd380017054bad76176fce973cefc8607c6a80cfb5dd3a755972bb1bcfd8da6cb7919896307b6d53a8a5fa123606825615dc840ad7f264c29d160734f0b17
 DIST Remmina-v1.4.29.tar.bz2 2014832 BLAKE2B a5e3a54d510c74fd8399116dfd1cc67aaafdf93e3217a20ad77a2c959597b7be51cf187ffb459eb5cabe0a30f985f649aa59dba1397d7a8b3a0c10ea997b3fdf SHA512 8fbe822d07ec800bb739579b373003ee56cbc661fd0b635e5a7af0369d2e5450e7116907a87c34e82704c2aab790ac501ee6331946751660321c917ffd9a183e
 DIST Remmina-v1.4.30.tar.bz2 2026559 BLAKE2B 96b4946e5d9480239f5089369cca6fee7bbe9129bb87f685d849df745cef7eca5b20cd8053ec3250378c1ca2be34e1b3c40d463a45c655aca65a73e9ac018593 SHA512 4e2beb4fd27bd9060a95735bd43ee80260d036bb59c406aa0d9ef63fcbd04c6e358384416b2308367d88a1f87d6e1af42299a21d59fd06dce785b9cfe1b67c84
 DIST Remmina-v1.4.31.tar.bz2 2078380 BLAKE2B daee0b68305e3ec0eedcc8cb3622ed5649303562fccd766bf5cc6ed1e96f27c1608286afa1b9bbaf44480bdc210f71a863bf442974ebbc1c50ebfbcf2dfeea35 SHA512 288e7fb5b5251d251e9502ec310f2bfe526f1a28a91c9dd9e79c712191c5d2b287844bd994596dc5097ec50ed8282d0af11144f6c5f0a74cb444aa4c6a8f6838
 DIST Remmina-v1.4.32.tar.bz2 2096310 BLAKE2B 2b625e8dc79c4942093c141acc6c256dce4067176422552abafdecc3d933d3196a50023632de56b1036e0f4d740a9601e1367431899da63a8fb463d5ab58f6d4 SHA512 ad5289b63038846d96ca193c37b266b19e15dbd0f513ce8cea936a81cdbb6b7476c465657944938c34695cb3ff16ade81b4a7ed37c3ab08257537b121c2ad7e9
+DIST Remmina-v1.4.33.tar.bz2 2105164 BLAKE2B 94f73f895f7e0478779d71097ee57ba049299e702527df2cf8a48ea41647f641684131b10b2f4faa7cf831ccea29611a68c2427127a2ebea87acac54f996a446 SHA512 c019131d2c3756946a332a3037286c8370a2e07b20a416c657cc2852ece9e59236499a2c5e45d4e9f391d9265089763957c6968c668e110c350e668053db6d82
 EBUILD remmina-1.4.29-r2.ebuild 2646 BLAKE2B 6d1d8c99ac245ffc02a1b01a765c4a2d9ef16b800bcda161e97fcf30dcf0145e9011d099436d18b660718c22d56428f7db680b1269cebd4013e7b8c99ce802bf SHA512 614f34099c713427df58a34cd7730ab7ef3daa4ce354c6215ebf300d869b93df5e1b9756c8a3154444966024c049426ce9c8a3420424f01d795322862b583742
 EBUILD remmina-1.4.30.ebuild 2646 BLAKE2B 6d1d8c99ac245ffc02a1b01a765c4a2d9ef16b800bcda161e97fcf30dcf0145e9011d099436d18b660718c22d56428f7db680b1269cebd4013e7b8c99ce802bf SHA512 614f34099c713427df58a34cd7730ab7ef3daa4ce354c6215ebf300d869b93df5e1b9756c8a3154444966024c049426ce9c8a3420424f01d795322862b583742
 EBUILD remmina-1.4.31.ebuild 2646 BLAKE2B 6d1d8c99ac245ffc02a1b01a765c4a2d9ef16b800bcda161e97fcf30dcf0145e9011d099436d18b660718c22d56428f7db680b1269cebd4013e7b8c99ce802bf SHA512 614f34099c713427df58a34cd7730ab7ef3daa4ce354c6215ebf300d869b93df5e1b9756c8a3154444966024c049426ce9c8a3420424f01d795322862b583742
-EBUILD remmina-1.4.32.ebuild 2649 BLAKE2B 783a7abeefc83f740e6c2934b1f9c2e5fd4f3d0a3a3df2adc14dbae554ee718b136882042ba35bbc6d894d6facf7dfaebf5857e90f76ac33098b04b7745f1125 SHA512 2284c58eebf0a2f707df2d6b3b32729e7aa2244d57e41819485107277ada6f4e8c4d73488c63661b42168ab9858e0e71f10164aac317acd9794244fe204bdccc
+EBUILD remmina-1.4.32.ebuild 2705 BLAKE2B 85cda871f916a66176b3331b412685767682df20fcc423c1755b7c643f10595d51a53b5b1e062436263840d07abbd49b6290b3647441580ee622d2362a6dfdc7 SHA512 429d6d299cc7c84aef46cbc8be3bc2251ffb8bc4f19e1891ea4d9de62315977f80dc2cb9490b2e8c3e68582a85d83d869e374561d89ac1078c37f52d090c2401
+EBUILD remmina-1.4.33.ebuild 2762 BLAKE2B a999fc2fefab690a0137f1053d99145beddd5b596f8bc8a49ab24cf9d795a24cf32d032241b03555f4d3a0e7ae5d0ff9c7986d8dfc4cbbb06e217cda750e534b SHA512 c3694063a07300d906d4b5ba3e4b7b6fe23df53078dda4af1cd751b9eeac4d9e419c7443c11826f5a6dd1c4902236556ec144936e2934d5cc1bafd02d3c2a633
 MISC metadata.xml 1123 BLAKE2B 658714c247c6fbec6118a88bc5493a67aca30e949249407d421592b956c15b439b6d96c682d2d6d7cc9f1eb2dfdcc902c4c463c6a208af4bb9196656723f220a SHA512 cbf00348e2da27acbe9890ac2d6b19d5731496cf1aab303d64f036700fb779587cb7fe81a95d3a25f9ec5dcb79e2e7e880e345fc1ac267acd25da89844ab6f21
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 000000000000..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 <myheroyuki@outlook.com>
+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..f3cd0f535fb5 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
 }
diff --git a/net-misc/remmina/remmina-1.4.33.ebuild b/net-misc/remmina/remmina-1.4.33.ebuild
new file mode 100644
index 000000000000..9217f07d5493
--- /dev/null
+++ b/net-misc/remmina/remmina-1.4.33.ebuild
@@ -0,0 +1,111 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{10..12} )
+
+inherit cmake optfeature python-single-r1 xdg
+
+MY_P="${PN^}-v${PV}"
+
+DESCRIPTION="A GTK+ RDP, SPICE, VNC and SSH client"
+HOMEPAGE="https://remmina.org/"
+SRC_URI="https://gitlab.com/Remmina/Remmina/-/archive/v.${PV}/${MY_P}.tar.bz2"
+
+LICENSE="GPL-2+-with-openssl-exception"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~riscv ~x86"
+IUSE="+appindicator crypt cups examples keyring gvnc kwallet nls python spice ssh rdp vnc wayland webkit zeroconf"
+
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+
+COMMON_DEPEND="
+	dev-libs/glib:2
+	dev-libs/json-glib
+	dev-libs/libpcre2
+	dev-libs/libsodium:=
+	dev-libs/openssl:0=
+	x11-libs/gdk-pixbuf
+	x11-libs/gtk+:3[wayland?]
+	x11-libs/libX11
+	x11-libs/libxkbfile
+	appindicator? ( dev-libs/libayatana-appindicator )
+	crypt? ( dev-libs/libgcrypt:0= )
+	keyring? ( app-crypt/libsecret )
+	gvnc? ( net-libs/gtk-vnc )
+	kwallet? ( kde-frameworks/kwallet )
+	python? ( ${PYTHON_DEPS} )
+	rdp? ( >=net-misc/freerdp-2.0.0_rc4_p1129[X]
+		<net-misc/freerdp-3[X]
+		cups? ( net-print/cups:= ) )
+	spice? ( net-misc/spice-gtk[gtk3] )
+	ssh? ( net-libs/libssh:0=[sftp]
+		x11-libs/vte:2.91 )
+	vnc? ( net-libs/libvncserver[jpeg] )
+	webkit? ( net-libs/webkit-gtk:4.1 )
+	zeroconf? ( >=net-dns/avahi-0.8-r2[dbus,gtk] )
+"
+
+DEPEND="
+	${COMMON_DEPEND}
+	spice? ( app-emulation/spice-protocol )
+"
+
+BDEPEND="
+	virtual/pkgconfig
+	nls? ( sys-devel/gettext )
+"
+
+RDEPEND="
+	${COMMON_DEPEND}
+	virtual/freedesktop-icon-theme
+"
+
+DOCS=( AUTHORS CHANGELOG.md README.md THANKS.md )
+
+S="${WORKDIR}/${PN^}-v.${PV}-2c4e1479433e51418ecb6089f35182bfebc5b57e"
+
+pkg_setup() {
+	use python && python-single-r1_pkg_setup
+}
+
+src_prepare() {
+	PATCHES+=( "${FILESDIR}"/${PN}-1.4.32-REM-2981.patch ) #914851
+	xdg_environment_reset
+	cmake_src_prepare
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DHAVE_LIBAPPINDICATOR=$(usex appindicator ON OFF)
+		-DWITH_AVAHI=$(usex zeroconf)
+		-DWITH_CUPS=$(usex cups)
+		-DWITH_EXAMPLES=$(usex examples)
+		-DWITH_FREERDP=$(usex rdp)
+		-DWITH_FREERDP3=OFF
+		-DWITH_GCRYPT=$(usex crypt)
+		-DWITH_GETTEXT=$(usex nls)
+		-DWITH_ICON_CACHE=OFF
+		-DWITH_KF5WALLET=$(usex kwallet)
+		-DWITH_LIBSECRET=$(usex keyring)
+		-DWITH_LIBSSH=$(usex ssh)
+		-DWITH_LIBVNCSERVER=$(usex vnc)
+		-DWITH_PYTHONLIBS=$(usex python ON OFF)
+		-DWITH_SPICE=$(usex spice)
+		-DWITH_TRANSLATIONS=$(usex nls)
+		-DWITH_UPDATE_DESKTOP_DB=OFF
+		-DWITH_VTE=$(usex ssh)
+		-DWITH_WWW=$(usex webkit)
+		-DWITH_X2GO=OFF
+		# when this feature is stable, add python eclass usage to optionally enable
+		-DWITH_PYTHON=OFF
+	)
+	cmake_src_configure
+}
+
+pkg_postinst() {
+	xdg_pkg_postinst
+
+	optfeature "encrypted VNC connections" net-libs/libvncserver[gcrypt]
+}