From 68a5d26b90a4cc3958663ec8f1b62508095100d0 Mon Sep 17 00:00:00 2001 From: CentOS Sources Date: Sep 29 2020 07:06:15 +0000 Subject: import vinagre-3.22.0-14.el7 --- diff --git a/SOURCES/vinagre-3.22.0-multiple-app-instances.patch b/SOURCES/vinagre-3.22.0-multiple-app-instances.patch new file mode 100644 index 0000000..38b2450 --- /dev/null +++ b/SOURCES/vinagre-3.22.0-multiple-app-instances.patch @@ -0,0 +1,36 @@ +From 154c8d5bbdc8a002116262690ef43e810a5eb7eb Mon Sep 17 00:00:00 2001 +From: Felipe Borges +Date: Mon, 8 Aug 2016 16:14:06 +0200 +Subject: [PATCH] Allow the launch of multiple application instances + +We advertize the --new-window application option but since the +port to GtkApplication we are requesting for a unique application +ID, which prevents the launch of new instances. + +The G_APPLICATION_NON_UNIQUE gapplication flag allows the launching +of new vinagre instances by not attempting to do any of the typical +single-instance application negotiation, even if the application +ID is given. The application neither attempts to become the owner +of the application ID nor does it check if an existing owner already +exists. Everything occurs in the local process. + +https://bugzilla.gnome.org/show_bug.cgi?id=769631 +--- + vinagre/vinagre-main.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/vinagre/vinagre-main.c b/vinagre/vinagre-main.c +index 9e66b72..91eba77 100644 +--- a/vinagre/vinagre-main.c ++++ b/vinagre/vinagre-main.c +@@ -182,7 +182,7 @@ int main (int argc, char **argv) { + g_set_application_name (_("Remote Desktop Viewer")); + optionstate.new_window = FALSE; + +- app = gtk_application_new ("org.gnome.vinagre", G_APPLICATION_HANDLES_COMMAND_LINE); ++ app = gtk_application_new ("org.gnome.vinagre", G_APPLICATION_HANDLES_COMMAND_LINE | G_APPLICATION_NON_UNIQUE); + /* https://bugzilla.gnome.org/show_bug.cgi?id=634990 */ + /* g_application_set_option_context (G_APPLICATION (app), context); */ + g_signal_connect (app, +-- +2.7.4 \ No newline at end of file diff --git a/SOURCES/vinagre-3.22.0-rdp-black-screen.patch b/SOURCES/vinagre-3.22.0-rdp-black-screen.patch new file mode 100644 index 0000000..39aea6f --- /dev/null +++ b/SOURCES/vinagre-3.22.0-rdp-black-screen.patch @@ -0,0 +1,47 @@ +--- vinagre-3.22.0/configure.ac.orig 2020-05-26 16:58:13.245774224 +0200 ++++ vinagre-3.22.0/configure.ac 2020-05-26 16:58:57.779911231 +0200 +@@ -59,7 +59,7 @@ AM_CONDITIONAL([VINAGRE_ENABLE_SSH], [te + + # Whether to enable support for RDP. + RDP_DEPS="freerdp x11" +-RDP_2_DEPS="freerdp2 x11" ++RDP_2_DEPS="freerdp2 >= 2.0.0 x11" + AC_ARG_ENABLE([rdp], + [AS_HELP_STRING([--disable-rdp], + [Disable Remote Desktop Protocol (RDP) support])]) +--- vinagre-3.22.0/plugins/rdp/vinagre-rdp-tab.c.orig 2020-05-26 16:58:13.248774233 +0200 ++++ vinagre-3.22.0/plugins/rdp/vinagre-rdp-tab.c 2020-05-26 16:59:15.511965782 +0200 +@@ -548,32 +548,7 @@ frdp_pre_connect (freerdp *instance) + { + rdpSettings *settings = instance->settings; + +-#ifdef HAVE_FREERDP_1_1 +- settings->OrderSupport[NEG_DSTBLT_INDEX] = TRUE; +- settings->OrderSupport[NEG_PATBLT_INDEX] = TRUE; +- settings->OrderSupport[NEG_SCRBLT_INDEX] = TRUE; +- settings->OrderSupport[NEG_OPAQUE_RECT_INDEX] = TRUE; +- settings->OrderSupport[NEG_DRAWNINEGRID_INDEX] = FALSE; +- settings->OrderSupport[NEG_MULTIDSTBLT_INDEX] = FALSE; +- settings->OrderSupport[NEG_MULTIPATBLT_INDEX] = FALSE; +- settings->OrderSupport[NEG_MULTISCRBLT_INDEX] = FALSE; +- settings->OrderSupport[NEG_MULTIOPAQUERECT_INDEX] = TRUE; +- settings->OrderSupport[NEG_MULTI_DRAWNINEGRID_INDEX] = FALSE; +- settings->OrderSupport[NEG_LINETO_INDEX] = TRUE; +- settings->OrderSupport[NEG_POLYLINE_INDEX] = TRUE; +- settings->OrderSupport[NEG_MEMBLT_INDEX] = TRUE; +- settings->OrderSupport[NEG_MEM3BLT_INDEX] = FALSE; +- settings->OrderSupport[NEG_MEMBLT_V2_INDEX] = TRUE; +- settings->OrderSupport[NEG_MEM3BLT_V2_INDEX] = FALSE; +- settings->OrderSupport[NEG_SAVEBITMAP_INDEX] = FALSE; +- settings->OrderSupport[NEG_GLYPH_INDEX_INDEX] = TRUE; +- settings->OrderSupport[NEG_FAST_INDEX_INDEX] = TRUE; +- settings->OrderSupport[NEG_FAST_GLYPH_INDEX] = FALSE; +- settings->OrderSupport[NEG_POLYGON_SC_INDEX] = FALSE; +- settings->OrderSupport[NEG_POLYGON_CB_INDEX] = FALSE; +- settings->OrderSupport[NEG_ELLIPSE_SC_INDEX] = FALSE; +- settings->OrderSupport[NEG_ELLIPSE_CB_INDEX] = FALSE; +-#else ++#ifndef HAVE_FREERDP_1_1 + settings->order_support[NEG_DSTBLT_INDEX] = true; + settings->order_support[NEG_PATBLT_INDEX] = true; + settings->order_support[NEG_SCRBLT_INDEX] = true; diff --git a/SPECS/vinagre.spec b/SPECS/vinagre.spec index 639f7d0..934be97 100644 --- a/SPECS/vinagre.spec +++ b/SPECS/vinagre.spec @@ -4,7 +4,7 @@ Name: vinagre Version: 3.22.0 -Release: 12%{?dist} +Release: 14%{?dist} Summary: VNC client for GNOME Group: Applications/System @@ -32,6 +32,12 @@ Patch5: vinagre-3.22.0-freerdp2.patch # https://bugzilla.redhat.com/show_bug.cgi?id=1569552 Patch6: vinagre-3.22.0-rdp-password-length.patch +# https://bugzilla.redhat.com/show_bug.cgi?id=1364527 +Patch7: vinagre-3.22.0-multiple-app-instances.patch + +# https://bugzilla.redhat.com/show_bug.cgi?id=1839745 +Patch8: vinagre-3.22.0-rdp-black-screen.patch + %if 0%{?with_spice} BuildRequires: pkgconfig(spice-client-gtk-3.0) %endif @@ -79,6 +85,8 @@ Apart from the VNC protocol, vinagre supports Spice and RDP. %patch4 -p1 -b .share-clipboard %patch5 -p1 -b .freerdp2 %patch6 -p1 -b .rdp-password-length +%patch7 -p1 -b .multiple-app-instances +%patch8 -p1 -b .rdp-black-screen %build autoreconf -ivf @@ -144,6 +152,15 @@ glib-compile-schemas %{_datadir}/glib-2.0/schemas &>/dev/null || : %changelog +* Wed May 27 2020 Marek Kasik - 3.22.0-14 +- Rebuild due to new version of FreeRDP +- Fix an issue when RDP connection shows just black screen +- Resolves: #1839745 + +* Thu Apr 16 2020 Felipe Borges - 3.22.0-13 +- Allow the launch of multiple application instances +- Resolves: #1364527 + * Fri Mar 15 2019 Marek Kasik - 3.22.0-12 - Apply the patch - Resolves: #1569552