Update to 0.12.101
GNOME Boxes 3.5.5 needs it.
This commit is contained in:
Christophe Fergeau
parent
9ba135289c
commit
61f322e99f
1
.gitignore
vendored
1
.gitignore
vendored
@ -9,3 +9,4 @@
|
||||
/spice-gtk-0.10.tar.bz2
|
||||
/spice-gtk-0.11.tar.bz2
|
||||
/spice-gtk-0.12.tar.bz2
|
||||
/spice-gtk-0.12.101.tar.bz2
|
||||
|
||||
@ -1,50 +0,0 @@
|
||||
From da0071300e1191f26757b4cf5146418c8b1db997 Mon Sep 17 00:00:00 2001
|
||||
From: =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= <marcandre.lureau@redhat.com>
|
||||
Date: Wed, 2 May 2012 14:01:16 +0200
|
||||
Subject: [PATCH spice-gtk] Fix parsing URI query
|
||||
|
||||
Do not depend on uninitialized "len" variable to set the query string.
|
||||
|
||||
https://bugzilla.redhat.com/show_bug.cgi?id=818169
|
||||
---
|
||||
gtk/spice-session.c | 8 +++-----
|
||||
1 file changed, 3 insertions(+), 5 deletions(-)
|
||||
|
||||
diff --git a/gtk/spice-session.c b/gtk/spice-session.c
|
||||
index 959e099..b3c66ce 100644
|
||||
--- a/gtk/spice-session.c
|
||||
+++ b/gtk/spice-session.c
|
||||
@@ -249,7 +249,6 @@ static int spice_uri_parse(SpiceSession *session, const char *original_uri)
|
||||
gchar key[32], value[128];
|
||||
gchar *host = NULL, *port = NULL, *tls_port = NULL, *uri = NULL, *password = NULL;
|
||||
gchar **target_key;
|
||||
- int len;
|
||||
gchar *path = NULL;
|
||||
gchar *authority = NULL;
|
||||
gchar *query = NULL;
|
||||
@@ -277,12 +276,10 @@ static int spice_uri_parse(SpiceSession *session, const char *original_uri)
|
||||
|
||||
if (path) {
|
||||
size_t prefix = strcspn(path, URI_QUERY_START);
|
||||
- if (len)
|
||||
- query = path + prefix;
|
||||
+ query = path + prefix;
|
||||
} else {
|
||||
size_t prefix = strcspn(authority, URI_QUERY_START);
|
||||
- if (len)
|
||||
- query = authority + prefix;
|
||||
+ query = authority + prefix;
|
||||
}
|
||||
|
||||
if (query && query[0]) {
|
||||
@@ -320,6 +317,7 @@ static int spice_uri_parse(SpiceSession *session, const char *original_uri)
|
||||
}
|
||||
|
||||
while (query && query[0] != '\0') {
|
||||
+ int len;
|
||||
if (sscanf(query, "%31[-a-zA-Z0-9]=%127[^;&]%n", key, value, &len) != 2) {
|
||||
g_warning("Failed to parse URI query '%s'", query);
|
||||
goto fail;
|
||||
--
|
||||
1.7.10
|
||||
|
||||
@ -1,44 +0,0 @@
|
||||
From bac3fd5ae1b783237100a1e5edf989ce7bd39d51 Mon Sep 17 00:00:00 2001
|
||||
From: =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= <marcandre.lureau@redhat.com>
|
||||
Date: Thu, 10 May 2012 02:55:14 +0200
|
||||
Subject: [PATCH spice-gtk] python: fix Spice.Audio binding
|
||||
|
||||
The spice_audio_new() function is not correctly generated h2def.py
|
||||
anymore because of the surrounding #ifdef and macros. Add it in
|
||||
the manual.defs instead.
|
||||
|
||||
Avoid API breakage:
|
||||
2012-05-10 01:56:48,884 (cli:83): Uncaught exception:
|
||||
Traceback (most recent call last):
|
||||
File /usr/share/virt-manager/virtManager/console.py, line 475, in
|
||||
_channel_new_cb
|
||||
self.audio = spice.Audio(self.spice_session)
|
||||
TypeError: GObject.__init__() takes exactly 0 arguments (1 given)
|
||||
|
||||
https://bugzilla.redhat.com/show_bug.cgi?id=820335
|
||||
---
|
||||
gtk/spice-client-gtk-manual.defs | 11 +++++++++++
|
||||
1 file changed, 11 insertions(+)
|
||||
|
||||
diff --git a/gtk/spice-client-gtk-manual.defs b/gtk/spice-client-gtk-manual.defs
|
||||
index 60f207c..9631b74 100644
|
||||
--- a/gtk/spice-client-gtk-manual.defs
|
||||
+++ b/gtk/spice-client-gtk-manual.defs
|
||||
@@ -104,3 +104,14 @@
|
||||
'("failed" "SPICE_CLIENT_ERROR_FAILED")
|
||||
)
|
||||
)
|
||||
+
|
||||
+(define-function spice_audio_new
|
||||
+ (c-name "spice_audio_new")
|
||||
+ (is-constructor-of "SpiceAudio")
|
||||
+ (return-type "SpiceAudio*")
|
||||
+ (parameters
|
||||
+ '("SpiceSession*" "session")
|
||||
+ '("GMainContext*" "context")
|
||||
+ '("const-char*" "name")
|
||||
+ )
|
||||
+)
|
||||
--
|
||||
1.7.10.1
|
||||
|
||||
2
sources
2
sources
@ -1 +1 @@
|
||||
2fec0ba391447b5b4d9242455c55b2a3 spice-gtk-0.12.tar.bz2
|
||||
4bc1243654ca0f1561b8023f5c5c3a74 spice-gtk-0.12.101.tar.bz2
|
||||
|
||||
@ -12,16 +12,14 @@
|
||||
#define _version_suffix -ab64
|
||||
|
||||
Name: spice-gtk
|
||||
Version: 0.12
|
||||
Release: 5%{?dist}
|
||||
Version: 0.12.101
|
||||
Release: 1%{?dist}
|
||||
Summary: A GTK+ widget for SPICE clients
|
||||
|
||||
Group: System Environment/Libraries
|
||||
License: LGPLv2+
|
||||
URL: http://spice-space.org/page/Spice-Gtk
|
||||
Source0: http://www.spice-space.org/download/gtk/%{name}-%{version}%{?_version_suffix}.tar.bz2
|
||||
Patch1: 0001-Fix-parsing-URI-query.patch
|
||||
Patch2: 0002-python-fix-Spice.Audio-binding.patch
|
||||
|
||||
BuildRequires: intltool
|
||||
BuildRequires: gtk2-devel >= 2.14
|
||||
@ -147,11 +145,6 @@ if [ -n '%{?_version_suffix}' ]; then
|
||||
mv spice-gtk-%{version}%{?_version_suffix} spice-gtk-%{version}
|
||||
fi
|
||||
|
||||
pushd spice-gtk-%{version}
|
||||
%patch1 -p1
|
||||
%patch2 -p1
|
||||
popd
|
||||
|
||||
%if %{with_gtk3}
|
||||
cp -a spice-gtk-%{version} spice-gtk3-%{version}
|
||||
%endif
|
||||
@ -262,6 +255,10 @@ rm -f %{buildroot}%{_libdir}/python*/site-packages/*.la
|
||||
%{_bindir}/spicy-stats
|
||||
|
||||
%changelog
|
||||
* Tue Aug 07 2012 Christophe Fergeau <cfergeau@redhat.com> - 0.12.101-1
|
||||
- Update to the spice-gtk 0.12.101 development release (needed by Boxes
|
||||
3.5.5)
|
||||
|
||||
* Sat Jul 21 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.12-5
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
|
||||
|
||||
|
||||
Loading…
Reference in New Issue
Block a user