Hello community,
here is the log from the commit of package spice-gtk for openSUSE:Factory checked in at 2013-08-15 14:55:38
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/spice-gtk (Old)
and /work/SRC/openSUSE:Factory/.spice-gtk.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "spice-gtk"
Changes:
--------
--- /work/SRC/openSUSE:Factory/spice-gtk/spice-gtk.changes 2013-07-01 16:00:28.000000000 +0200
+++ /work/SRC/openSUSE:Factory/.spice-gtk.new/spice-gtk.changes 2013-08-15 14:55:39.000000000 +0200
@@ -1,0 +2,6 @@
+Wed Aug 14 17:04:39 UTC 2013 - dimstar@opensuse.org
+
+- Add spice-gtk-mapfile.patch: Add spice_channel_string_to_type to
+ map files (bnc#834896).
+
+-------------------------------------------------------------------
New:
----
spice-gtk-mapfile.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ spice-gtk.spec ++++++
--- /var/tmp/diff_new_pack.5nR6X9/_old 2013-08-15 14:55:39.000000000 +0200
+++ /var/tmp/diff_new_pack.5nR6X9/_new 2013-08-15 14:55:39.000000000 +0200
@@ -28,6 +28,8 @@
Source: http://spice-space.org/download/gtk/%{name}-%{version}.tar.bz2
# PATCH-FIX-OPENSUSE spice-gtk-polkit-privs.patch bnc#804184 dimstar@opensuse.org -- Set the polkit defaults to auth_admin
Patch0: spice-gtk-polkit-privs.patch
+# PATCH-FIX-UPSTRAM spice-gtk-mapfile.patch bnc#834896 dimstar@opensuse.org -- Add spice_channel_string_to_type to map files, taken from git commit b85ca7.
+Patch1: spice-gtk-mapfile.patch
BuildRequires: cyrus-sasl-devel
BuildRequires: intltool
BuildRequires: libacl-devel
@@ -140,6 +142,7 @@
%prep
%setup -q
%patch0 -p1
+%patch1 -p1
# Replace usbredirhost with usbredirhost-0.5... fail if no longer needed
grep usbredirhost-0.5 configure && false
sed -i "s:libusbredirparser:libusbredirparser-0.5:g" configure{.ac,}
++++++ spice-gtk-mapfile.patch ++++++
From b85ca792af72d5f1e10aa6af9515eb96a044fc5c Mon Sep 17 00:00:00 2001
From: Hans de Goede
Date: Wed, 26 Jun 2013 15:39:39 +0000
Subject: Add spice_channel_string_to_type to map files
And document both spice_channel_string_to_type and
spice_channel_type_to_string.
Signed-off-by: Hans de Goede
---
diff --git a/doc/reference/spice-gtk-sections.txt b/doc/reference/spice-gtk-sections.txt
index e1e2833..8d61aa9 100644
--- a/doc/reference/spice-gtk-sections.txt
+++ b/doc/reference/spice-gtk-sections.txt
@@ -98,6 +98,7 @@ spice_channel_disconnect
spice_channel_test_capability
spice_channel_test_common_capability
spice_channel_type_to_string
+spice_channel_string_to_type
spice_channel_set_capability
spice_channel_flush_async
spice_channel_flush_finish
diff --git a/gtk/map-file b/gtk/map-file
index a0b7330..a69eb40 100644
--- a/gtk/map-file
+++ b/gtk/map-file
@@ -11,6 +11,7 @@ spice_channel_get_type;
spice_channel_new;
spice_channel_open_fd;
spice_channel_set_capability;
+spice_channel_string_to_type;
spice_channel_test_capability;
spice_channel_test_common_capability;
spice_channel_type_to_string;
diff --git a/gtk/spice-channel.c b/gtk/spice-channel.c
index 0a32d6c..093b292 100644
--- a/gtk/spice-channel.c
+++ b/gtk/spice-channel.c
@@ -1884,6 +1884,15 @@ static const char *to_string[] = {
[ SPICE_CHANNEL_PORT ] = "port",
};
+/**
+ * spice_channel_type_to_string:
+ * @type: a channel-type property value
+ *
+ * Convert a channel-type property value to a string.
+ *
+ * Returns: string representation of @type.
+ * Since: 0.20
+ **/
const gchar* spice_channel_type_to_string(gint type)
{
const char *str = NULL;
@@ -1895,6 +1904,15 @@ const gchar* spice_channel_type_to_string(gint type)
return str ? str : "unknown channel type";
}
+/**
+ * spice_channel_string_to_type:
+ * @str: a string representation of the channel-type property
+ *
+ * Convert a channel-type property value to a string.
+ *
+ * Returns: the channel-type property value for a @str channel
+ * Since: 0.21
+ **/
gint spice_channel_string_to_type(const gchar *str)
{
int i;
diff --git a/gtk/spice-glib-sym-file b/gtk/spice-glib-sym-file
index 2b172d0..8540307 100644
--- a/gtk/spice-glib-sym-file
+++ b/gtk/spice-glib-sym-file
@@ -14,6 +14,7 @@ spice_channel_set_capability
spice_channel_test_capability
spice_channel_test_common_capability
spice_channel_type_to_string
+spice_channel_string_to_type
spice_client_error_quark
spice_cursor_channel_get_type
spice_display_channel_get_type
--
cgit v0.9.0.2-2-gbebe
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org