Compare commits

...
Sign in to create a new pull request.

3 commits

Author SHA1 Message Date
Guido Aulisi
40b6a8e9ef Add rpd patch 2020-02-08 17:40:12 +01:00
Simone Caronni
e1faa8d168 Add <release> and <content_ratings> to appdata file
https://gitlab.gnome.org/GNOME/vinagre/merge_requests/7
2020-02-08 17:28:22 +01:00
Simone Caronni
931f4b2258 Rebuild for updated FreeRDP 2020-02-08 14:23:46 +01:00
3 changed files with 54 additions and 1 deletions

29
fix-appstream-data.patch Normal file
View file

@ -0,0 +1,29 @@
From ff84871ad2f8e276aaf805d596d8af832be74fde Mon Sep 17 00:00:00 2001
From: Felipe Borges <felipeborges@gnome.org>
Date: Wed, 13 Nov 2019 11:28:10 +0100
Subject: [PATCH] appdata: Add <release> and <content_rating> tags
To pass appstream-util validate-strict.
---
data/vinagre.appdata.xml.in | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/data/vinagre.appdata.xml.in b/data/vinagre.appdata.xml.in
index ec28520..1516a83 100644
--- a/data/vinagre.appdata.xml.in
+++ b/data/vinagre.appdata.xml.in
@@ -23,7 +23,11 @@
<_caption><!-- Describe this screenshot in less than ~10 words --></_caption>
</screenshot>
</screenshots>
+ <releases>
+ <release version="3.32.0" date="2016-09-20"/>
+ </releases>
<update_contact>amigadave@amigadave.com</update_contact>
<project_group>GNOME</project_group>
<translation type="gettext">vinagre</translation>
+ <content_rating type="oars-1.1" />
</component>
--
2.23.0

View file

@ -0,0 +1,13 @@
diff --git a/plugins/rdp/vinagre-rdp-tab.c b/plugins/rdp/vinagre-rdp-tab.c
index b731f9b..5b98c24 100644
--- a/plugins/rdp/vinagre-rdp-tab.c
+++ b/plugins/rdp/vinagre-rdp-tab.c
@@ -1218,7 +1218,7 @@ open_freerdp (VinagreRdpTab *rdp_tab)
init_freerdp (rdp_tab);
}
}
- while (!success && authentication_errors < 3);
+ while (!success && !cancelled && authentication_errors < 3);
if (!success)
{

View file

@ -4,7 +4,7 @@
Name: vinagre
Version: 3.22.0
Release: 14%{?dist}
Release: 16%{?dist}
Summary: VNC client for GNOME
License: GPLv2+
@ -15,6 +15,13 @@ Source0: https://download.gnome.org/sources/%{name}/3.22/%{name}-%{versio
# https://gitlab.gnome.org/GNOME/vinagre/merge_requests/3
Patch0: fix-build-with-recent-freerdp-versions.patch
# Let the user cancel the rdp auth dialog instead of looping forever
# https://bugzilla.gnome.org/show_bug.cgi?id=780713
Patch1: %{name}-rdp-let-cancel-auth-dialog.patch
# https://gitlab.gnome.org/GNOME/vinagre/merge_requests/7
Patch2: fix-appstream-data.patch
%if 0%{?with_spice}
BuildRequires: pkgconfig(spice-client-gtk-3.0)
%endif
@ -103,6 +110,10 @@ make check
%changelog
* Sat Feb 08 2020 Simone Caronni <negativo17@gmail.com> - 3.22.0-15
- Rebuild for updated FreeRDP.
- Update appstream data to pass validation
* Thu Feb 28 2019 Simone Caronni <negativo17@gmail.com> - 3.22.0-14
- Rebuild for FreeRDP update.