From 21a8b35041d5889a70ee2c40a67d1501877d0a17 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= Date: Sat, 6 Jul 2013 15:10:36 +0200 Subject: [PATCH] Fix spice_channel_string_to_type symbol visibility (rhbz#981815) --- ..._channel_string_to_type-to-map-files.patch | 91 +++++++++++++++++++ spice-gtk.spec | 7 +- 2 files changed, 97 insertions(+), 1 deletion(-) create mode 100644 0001-Add-spice_channel_string_to_type-to-map-files.patch diff --git a/0001-Add-spice_channel_string_to_type-to-map-files.patch b/0001-Add-spice_channel_string_to_type-to-map-files.patch new file mode 100644 index 0000000..019c518 --- /dev/null +++ b/0001-Add-spice_channel_string_to_type-to-map-files.patch @@ -0,0 +1,91 @@ +From b85ca792af72d5f1e10aa6af9515eb96a044fc5c Mon Sep 17 00:00:00 2001 +From: Hans de Goede +Date: Wed, 26 Jun 2013 17:39:39 +0200 +Subject: [PATCH spice-gtk] 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 +--- + doc/reference/spice-gtk-sections.txt | 1 + + gtk/map-file | 1 + + gtk/spice-channel.c | 18 ++++++++++++++++++ + gtk/spice-glib-sym-file | 1 + + 4 files changed, 21 insertions(+) + +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 +-- +1.8.3.rc1.49.g8d97506 + diff --git a/spice-gtk.spec b/spice-gtk.spec index b3f8999..337c0ed 100644 --- a/spice-gtk.spec +++ b/spice-gtk.spec @@ -13,7 +13,7 @@ Name: spice-gtk Version: 0.20 -Release: 1%{?dist} +Release: 2%{?dist} Summary: A GTK+ widget for SPICE clients Group: System Environment/Libraries @@ -21,6 +21,7 @@ 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 +Patch1: 0001-Add-spice_channel_string_to_type-to-map-files.patch BuildRequires: intltool BuildRequires: gtk2-devel >= 2.14 @@ -147,6 +148,7 @@ if [ -n '%{?_version_suffix}' ]; then fi pushd spice-gtk-%{version} +%patch1 -p1 popd %if %{with_gtk3} @@ -267,6 +269,9 @@ rm -rf %{buildroot}%{_datadir}/pkgconfig/spice-protocol.pc %{_bindir}/spicy-stats %changelog +* Sat Jul 6 2013 Marc-André Lureau - 0.20-2 +- Fix spice_channel_string_to_type symbol visibility (rhbz#981815) + * Wed Jun 26 2013 Marc-André Lureau - 0.20-1 - Update to spice-gtk 0.20