From 17ad3d254e3f9996077d8ca7b3ce418746009b58 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= Date: Wed, 16 Apr 2014 11:13:54 +0200 Subject: [PATCH] Update v0.25 --- .gitignore | 2 + ...crash-when-releasing-primary-surface.patch | 39 ------------------- sources | 2 +- spice-gtk.spec | 11 ++++-- 4 files changed, 10 insertions(+), 44 deletions(-) delete mode 100644 0001-display-fix-crash-when-releasing-primary-surface.patch diff --git a/.gitignore b/.gitignore index 08444ac..81bf5ff 100644 --- a/.gitignore +++ b/.gitignore @@ -23,3 +23,5 @@ /spice-gtk-0.21.tar.bz2 /spice-gtk-0.22.tar.bz2 /spice-gtk-0.23.tar.bz2 +/spice-gtk-0.24.tar.bz2 +/spice-gtk-0.25.tar.bz2 diff --git a/0001-display-fix-crash-when-releasing-primary-surface.patch b/0001-display-fix-crash-when-releasing-primary-surface.patch deleted file mode 100644 index 8067f9f..0000000 --- a/0001-display-fix-crash-when-releasing-primary-surface.patch +++ /dev/null @@ -1,39 +0,0 @@ -From 055a310f655ad436599c4fef965f2b3e7bc0f17f Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= -Date: Tue, 25 Feb 2014 11:42:47 +0100 -Subject: [PATCH spice-gtk] display: fix crash when releasing primary surface - -Since 1fcaaa15f8aca362f9e6afc87fb43cfbccf6ff62, display_surface is -allocated using gslice. However MSG_DISPLAY_MODE handler didn't allocate -using GSlice. This can eventually lead to a crash when freeing, such as: - -Thread no. 1 (6 frames) - #2 g_slice_free1 at gslice.c:1097 - #3 iter_remove_or_steal at ghash.c:787 - #4 clear_surfaces at /lib64/libspice-client-glib-2.0.so.8 - #5 spice_display_channel_finalize at - /lib64/libspice-client-glib-2.0.so.8 - #7 spice_channel_delayed_unref at /lib64/libspice-client-glib-2.0.so.8 - #12 gtk_main at gtkmain.c:1158 - -https://bugzilla.redhat.com/show_bug.cgi?id=1069546 ---- - gtk/channel-display.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/gtk/channel-display.c b/gtk/channel-display.c -index e464abf..96fd764 100644 ---- a/gtk/channel-display.c -+++ b/gtk/channel-display.c -@@ -886,7 +886,7 @@ static void display_handle_mode(SpiceChannel *channel, SpiceMsgIn *in) - - g_warn_if_fail(c->mark == FALSE); - -- surface = spice_new0(display_surface, 1); -+ surface = g_slice_new0(display_surface); - surface->format = mode->bits == 32 ? - SPICE_SURFACE_FMT_32_xRGB : SPICE_SURFACE_FMT_16_555; - surface->width = mode->x_res; --- -1.8.5.3 - diff --git a/sources b/sources index 2cf4d4f..7b09e42 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -575c6f532067e4003754e9b050a27bec spice-gtk-0.23.tar.bz2 +a79f1ff8b21d295b2a028e52708fb551 spice-gtk-0.25.tar.bz2 diff --git a/spice-gtk.spec b/spice-gtk.spec index 86d04af..977810e 100644 --- a/spice-gtk.spec +++ b/spice-gtk.spec @@ -12,8 +12,8 @@ #define _version_suffix Name: spice-gtk -Version: 0.23 -Release: 2%{?dist} +Version: 0.25 +Release: 1%{?dist} Summary: A GTK+ widget for SPICE clients Group: System Environment/Libraries @@ -21,7 +21,6 @@ License: LGPLv2+ URL: http://spice-space.org/page/Spice-Gtk #VCS: git:git://anongit.freedesktop.org/spice/spice-gtk Source0: http://www.spice-space.org/download/gtk/%{name}-%{version}%{?_version_suffix}.tar.bz2 -Patch0001: 0001-display-fix-crash-when-releasing-primary-surface.patch BuildRequires: intltool BuildRequires: gtk2-devel >= 2.14 @@ -40,6 +39,7 @@ BuildRequires: polkit-devel BuildRequires: gtk-doc BuildRequires: vala-tools BuildRequires: usbutils +BuildRequires: libphodav-1.0-devel %if %{with_gtk3} BuildRequires: gtk3-devel %endif @@ -148,7 +148,6 @@ if [ -n '%{?_version_suffix}' ]; then fi pushd spice-gtk-%{version} -%patch0001 -p1 find . -name '*.stamp' | xargs touch popd @@ -270,6 +269,10 @@ rm -rf %{buildroot}%{_datadir}/pkgconfig/spice-protocol.pc %{_bindir}/spicy-stats %changelog +* Tue Feb 25 2014 Marc-André Lureau - 0.25-1 +- Update to upstream release v0.25 +- Added phodav dependency + * Tue Feb 25 2014 Marc-André Lureau - 0.23-2 - Fix crash on finishing display rhbz#1069546