1
0
forked from ports/contrib

spice-gtk: 0.21 -> 0.23

This commit is contained in:
Thomas Penteker 2014-02-13 00:05:37 +01:00
parent 61494671fb
commit 45cbd8f432
4 changed files with 6 additions and 50 deletions

View File

@ -36,9 +36,9 @@ drwxr-xr-x root/root usr/include/spice-controller/
drwxr-xr-x root/root usr/lib/
-rw-r--r-- root/root usr/lib/libspice-client-glib-2.0.a
-rwxr-xr-x root/root usr/lib/libspice-client-glib-2.0.la
lrwxrwxrwx root/root usr/lib/libspice-client-glib-2.0.so -> libspice-client-glib-2.0.so.8.4.0
lrwxrwxrwx root/root usr/lib/libspice-client-glib-2.0.so.8 -> libspice-client-glib-2.0.so.8.4.0
-rwxr-xr-x root/root usr/lib/libspice-client-glib-2.0.so.8.4.0
lrwxrwxrwx root/root usr/lib/libspice-client-glib-2.0.so -> libspice-client-glib-2.0.so.8.5.0
lrwxrwxrwx root/root usr/lib/libspice-client-glib-2.0.so.8 -> libspice-client-glib-2.0.so.8.5.0
-rwxr-xr-x root/root usr/lib/libspice-client-glib-2.0.so.8.5.0
-rw-r--r-- root/root usr/lib/libspice-client-gtk-3.0.a
-rwxr-xr-x root/root usr/lib/libspice-client-gtk-3.0.la
lrwxrwxrwx root/root usr/lib/libspice-client-gtk-3.0.so -> libspice-client-gtk-3.0.so.4.0.0

View File

@ -1,2 +1,2 @@
fe45af8456292e2effd1bf1a90bbc3da palette_remove.patch
290d1ad5ab8f1e5708fa2549dde2e024 spice-gtk-0.21.tar.bz2
575c6f532067e4003754e9b050a27bec spice-gtk-0.23.tar.bz2

View File

@ -4,17 +4,14 @@
# Depends on: gtk3 openssl celt51 cyrus-sasl
name=spice-gtk
version=0.21
version=0.23
release=1
source=(http://spice-space.org/download/gtk/spice-gtk-$version.tar.bz2 \
palette_remove.patch)
source=(http://spice-space.org/download/gtk/spice-gtk-$version.tar.bz2)
build() {
cd $name-$version
patch -i ../palette_remove.patch -p1
./configure --prefix=/usr \
--datarootdir=/usr/lib \
--disable-smartcard \

View File

@ -1,41 +0,0 @@
From 02c4d61263230e3dbd7900822677c720045b80cf Mon Sep 17 00:00:00 2001
From: Marc-André Lureau <marcandre.lureau@redhat.com>
Date: Thu, 03 Oct 2013 11:50:15 +0000
Subject: display: fix palette regression
palette_get() used to return a ref, and palette_release() used to
release that ref.
Since ed877341, the palette is no longer refcount'ed, since its usage is
exclusively local in common/canvas code.
palette_release() shouldn't remove the palette from the cache.
https://bugzilla.redhat.com/show_bug.cgi?id=1011936
---
diff --git a/gtk/channel-display.c b/gtk/channel-display.c
index 794f4eb..e0f17eb 100644
--- a/gtk/channel-display.c
+++ b/gtk/channel-display.c
@@ -546,8 +546,8 @@ static SpicePalette *palette_get(SpicePaletteCache *cache, uint64_t id)
SPICE_CONTAINEROF(cache, SpiceDisplayChannelPrivate, palette_cache);
/* here the returned pointer is weak, no ref given to caller. it
- * seems spice canvas usage is exclusively temporary, so it's ok
- * (for now) */
+ * seems spice canvas usage is exclusively temporary, so it's ok.
+ * palette_release is a noop. */
return cache_find(c->palettes, id);
}
@@ -561,7 +561,7 @@ static void palette_remove(SpicePaletteCache *cache, uint32_t id)
static void palette_release(SpicePaletteCache *cache, SpicePalette *palette)
{
- palette_remove(cache, palette->unique);
+ /* there is no refcount of palette, see palette_get() */
}
#ifdef SW_CANVAS_CACHE
--
cgit v0.9.0.2-2-gbebe