From c0350239d3e71d68baa3e78b6285afd6d8c00934 Mon Sep 17 00:00:00 2001 From: Matthias Clasen Date: Sun, 2 Dec 2012 22:11:58 -0500 Subject: [PATCH 1/3] fix a crash when clicking on the statusicon --- vino.spec | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/vino.spec b/vino.spec index 355afac..b6fae5d 100644 --- a/vino.spec +++ b/vino.spec @@ -5,7 +5,7 @@ Summary: A remote desktop system for GNOME Name: vino Version: 3.6.2 -Release: 1%{?dist} +Release: 2%{?dist} URL: http://www.gnome.org #VCS: git:git://git.gnome.org/vino Source0: http://download.gnome.org/sources/vino/3.6/%{name}-%{version}.tar.xz @@ -57,7 +57,7 @@ make %{?_smp_mflags} %install make install DESTDIR=$RPM_BUILD_ROOT -desktop-file-install --vendor gnome --delete-original \ +desktop-file-install --delete-original \ --dir $RPM_BUILD_ROOT%{_datadir}/applications \ --add-only-show-in GNOME \ $RPM_BUILD_ROOT%{_datadir}/applications/vino-preferences.desktop @@ -96,6 +96,10 @@ glib-compile-schemas %{_datadir}/glib-2.0/schemas &>/dev/null || : %{_datadir}/GConf/gsettings/org.gnome.Vino.convert %changelog +* Sun Dec 2 2012 Matthias Clasen - 3.6.2-2 +- Don't add a vendor prefix to the desktop file, that breaks + activating the preferences from the statusicon (#827913) + * Tue Nov 13 2012 Kalev Lember - 3.6.2-1 - Update to 3.6.2 From 8779c08514a1dd433a2c24c1c6f521da42e5f702 Mon Sep 17 00:00:00 2001 From: Matthias Clasen Date: Mon, 10 Jun 2013 22:08:14 -0400 Subject: [PATCH 2/3] Fix a crash Conflicts: vino.spec --- vino-allocation.patch | 32 ++++++++++++++++++++++++++++++++ vino.spec | 7 +++++++ 2 files changed, 39 insertions(+) create mode 100644 vino-allocation.patch diff --git a/vino-allocation.patch b/vino-allocation.patch new file mode 100644 index 0000000..020f7a7 --- /dev/null +++ b/vino-allocation.patch @@ -0,0 +1,32 @@ +From 81b5e3780f69e7a3c465afbe6cae9712d47c7deb Mon Sep 17 00:00:00 2001 +From: Matthias Clasen +Date: Sat, 25 May 2013 00:52:07 -0400 +Subject: [PATCH] Be more careful with memory allocation + +Better to 0-initialize these structs, since GetValidIGD may +not end up filling them. +See https://bugzilla.redhat.com/attachment.cgi?id=707491 +for a related stacktrace. + +https://bugzilla.gnome.org/show_bug.cgi?id=700987 +--- + server/vino-upnp.c | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/server/vino-upnp.c b/server/vino-upnp.c +index fcccfc7..99d7a71 100644 +--- a/server/vino-upnp.c ++++ b/server/vino-upnp.c +@@ -91,8 +91,8 @@ update_upnp_status (VinoUpnp *upnp) + dprintf (UPNP, "found.\n"); + dprintf (UPNP, "UPnP: Looking for a valid IGD... "); + +- upnp->priv->urls = g_new (struct UPNPUrls, 1); +- upnp->priv->data = g_new (struct IGDdatas, 1); ++ upnp->priv->urls = g_new0 (struct UPNPUrls, 1); ++ upnp->priv->data = g_new0 (struct IGDdatas, 1); + + res = UPNP_GetValidIGD (devlist, + upnp->priv->urls, +-- +1.8.2.1 \ No newline at end of file diff --git a/vino.spec b/vino.spec index b6fae5d..1ec9022 100644 --- a/vino.spec +++ b/vino.spec @@ -10,6 +10,9 @@ URL: http://www.gnome.org #VCS: git:git://git.gnome.org/vino Source0: http://download.gnome.org/sources/vino/3.6/%{name}-%{version}.tar.xz +# https://bugzilla.gnome.org/show_bug.cgi?id=700987 +Patch0: vino-allocation.patch + License: GPLv2+ Group: User Interface/Desktops @@ -34,6 +37,7 @@ connect to a running GNOME session using VNC. %prep %setup -q +%patch0 -p1 # autoreconf -i -f # intltoolize --force @@ -96,6 +100,9 @@ glib-compile-schemas %{_datadir}/glib-2.0/schemas &>/dev/null || : %{_datadir}/GConf/gsettings/org.gnome.Vino.convert %changelog +* Mon Jun 10 2013 Matthias Clasen - 3.6.2-2 +- Be more careful with memory allocation + * Sun Dec 2 2012 Matthias Clasen - 3.6.2-2 - Don't add a vendor prefix to the desktop file, that breaks activating the preferences from the statusicon (#827913) From f50002d7bc99f3bee5be415f9c01d21e0a63c733 Mon Sep 17 00:00:00 2001 From: Matthias Clasen Date: Mon, 10 Jun 2013 23:10:49 -0400 Subject: [PATCH 3/3] bump rev --- vino.spec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/vino.spec b/vino.spec index 1ec9022..452d542 100644 --- a/vino.spec +++ b/vino.spec @@ -5,7 +5,7 @@ Summary: A remote desktop system for GNOME Name: vino Version: 3.6.2 -Release: 2%{?dist} +Release: 3%{?dist} URL: http://www.gnome.org #VCS: git:git://git.gnome.org/vino Source0: http://download.gnome.org/sources/vino/3.6/%{name}-%{version}.tar.xz @@ -100,7 +100,7 @@ glib-compile-schemas %{_datadir}/glib-2.0/schemas &>/dev/null || : %{_datadir}/GConf/gsettings/org.gnome.Vino.convert %changelog -* Mon Jun 10 2013 Matthias Clasen - 3.6.2-2 +* Mon Jun 10 2013 Matthias Clasen - 3.6.2-3 - Be more careful with memory allocation * Sun Dec 2 2012 Matthias Clasen - 3.6.2-2