diff options
Diffstat (limited to 'net-misc/spice-gtk/files')
10 files changed, 0 insertions, 362 deletions
diff --git a/net-misc/spice-gtk/files/0.12-parallel-install.patch b/net-misc/spice-gtk/files/0.12-parallel-install.patch deleted file mode 100644 index 04a22bdf066d..000000000000 --- a/net-misc/spice-gtk/files/0.12-parallel-install.patch +++ /dev/null @@ -1,16 +0,0 @@ -diff --git a/gtk/Makefile.am b/gtk/Makefile.am -index 7b29e61..86b3939 100644 ---- a/gtk/Makefile.am -+++ b/gtk/Makefile.am -@@ -505,6 +505,11 @@ vncdisplaykeymap_win322xtkbd.c: - if WITH_PYTHON - pyexec_LTLIBRARIES = SpiceClientGtk.la - -+# workaround for broken parallel install support in automake with LTLIBRARIES -+# http://debbugs.gnu.org/cgi/bugreport.cgi?bug=7328 -+install_pyexecLTLIBRARIES = install-pyexecLTLIBRARIES -+$(install_pyexecLTLIBRARIES): install-libLTLIBRARIES -+ - SpiceClientGtk_la_LIBADD = libspice-client-gtk-2.0.la libspice-client-glib-2.0.la $(PYGTK_LIBS) - SpiceClientGtk_la_CFLAGS = $(GTK_CFLAGS) $(PYTHON_INCLUDES) $(PYGTK_CFLAGS) $(WARN_PYFLAGS) - SpiceClientGtk_la_LDFLAGS = -module -avoid-version -fPIC diff --git a/net-misc/spice-gtk/files/0.14-Deal-with-libusbredirparser.pc-rename-to-libusbredir.patch b/net-misc/spice-gtk/files/0.14-Deal-with-libusbredirparser.pc-rename-to-libusbredir.patch deleted file mode 100644 index 046794531803..000000000000 --- a/net-misc/spice-gtk/files/0.14-Deal-with-libusbredirparser.pc-rename-to-libusbredir.patch +++ /dev/null @@ -1,57 +0,0 @@ -From a8a6ac1d0f4893860efad48833ce6168f684054a Mon Sep 17 00:00:00 2001 -From: Hans de Goede <hdegoede@redhat.com> -Date: Tue, 25 Sep 2012 12:59:13 +0200 -Subject: [PATCH 01/21] Deal with libusbredirparser.pc rename to - libusbredirparser-0.5.pc - -The usbredir 0.5 release introduced the new API for 64 bit packet ids, but -it kept the libusbredirparser.pc name as is, meaning that older versions of -qemu will still have their pkg-config check for usbredirparser fulfilled, -and build with the usb-redir device. Due to the API change there will be -some compiler warnings, but the build will succeed, however the usb-redir -device will be broken on 32 bit machines. - -To solve this, the usbredir-0.5.2 release renames the libusbredirparser.pc -file to libusbredirparser-0.5.pc, so that it will no longer fulfill the -pkg-config check of the qemu-1.2 and older releases, stopping the (silent) -breakage. - -spice-gtk does not use the changed parts of the API, but does -use libusbredirparser for the usbredirfilter* functions. This patch adapts -spice-gtk's configure to accept both the libusbredirparser-0.5 and the -libusbredirparser pkg-config names. - -Signed-off-by: Hans de Goede <hdegoede@redhat.com> ---- - configure.ac | 15 +++++++++++---- - 1 file changed, 11 insertions(+), 4 deletions(-) - -diff --git a/configure.ac b/configure.ac -index c7367cc..7c59575 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -349,10 +349,17 @@ AC_ARG_ENABLE([usbredir], - if test "x$enable_usbredir" = "xno"; then - have_usbredir="no" - else -- PKG_CHECK_MODULES([USBREDIR], -- [libusb-1.0 >= 1.0.9 libusbredirhost >= 0.4.2 libusbredirparser >= 0.4], -- [have_usbredir=yes], -- [have_usbredir=no]) -+ if ${PKG_CONFIG} libusbredirparser-0.5; then -+ PKG_CHECK_MODULES([USBREDIR], -+ [libusb-1.0 >= 1.0.9 libusbredirhost libusbredirparser-0.5], -+ [have_usbredir=yes], -+ [have_usbredir=no]) -+ else -+ PKG_CHECK_MODULES([USBREDIR], -+ [libusb-1.0 >= 1.0.9 libusbredirhost >= 0.4.2 libusbredirparser >= 0.4], -+ [have_usbredir=yes], -+ [have_usbredir=no]) -+ fi - if test "x$have_usbredir" = "xno" && test "x$enable_usbredir" = "xyes"; then - AC_MSG_ERROR([usbredir support explicitly requested, but some required packages are not available]) - fi --- -1.7.12.1 - diff --git a/net-misc/spice-gtk/files/0001-build-sys-fix-out-of-tree-build-with-vala.patch b/net-misc/spice-gtk/files/0001-build-sys-fix-out-of-tree-build-with-vala.patch deleted file mode 100644 index 92be8ccc5aa4..000000000000 --- a/net-misc/spice-gtk/files/0001-build-sys-fix-out-of-tree-build-with-vala.patch +++ /dev/null @@ -1,35 +0,0 @@ -From 6d454e4100a01499c13d55057fdd9307437a5f87 Mon Sep 17 00:00:00 2001 -From: Andrew Hughes <gnu.andrew@redhat.com> -Date: Wed, 16 Jan 2013 22:47:18 +0000 -Subject: build-sys: fix out-of-tree build with vala - ---- -diff --git a/gtk/controller/Makefile.am b/gtk/controller/Makefile.am -index f2abf93..00552e8 100644 ---- a/gtk/controller/Makefile.am -+++ b/gtk/controller/Makefile.am -@@ -76,14 +76,16 @@ spice_controller_dump_SOURCES = dump.c - spice_controller_dump_LDADD = libspice-controller.la - - controller.vala.stamp: $(libspice_controller_la_VALASOURCES) custom.vapi -- @if test -z "$(VALAC)"; then \ -- echo "" ; \ -- echo " *** Error: missing valac!" ; \ -+ @if test -z "$(VALAC)"; then \ -+ echo "" ; \ -+ echo " *** Error: missing valac!" ; \ - echo " *** You must run autogen.sh or configure --enable-vala" ; \ -- echo "" ; \ -- exit 1 ; \ -+ echo "" ; \ -+ exit 1 ; \ - fi -- $(VALA_V)$(VALAC) $(VALAFLAGS) $(AM_VALAFLAGS) $(libspice_controller_la_VALASOURCES) -H spice-controller.h -+ $(VALA_V)$(VALAC) $(VALAFLAGS) $(AM_VALAFLAGS) \ -+ $(addprefix $(srcdir)/,$(libspice_controller_la_VALASOURCES)) \ -+ -H spice-controller.h - @touch $@ - - $(libspice_controller_la_BUILT_SOURCES): controller.vala.stamp --- -cgit v0.9.0.2-2-gbebe diff --git a/net-misc/spice-gtk/files/spice-gtk-0.20-add-spice-channel-string-to-type.patch b/net-misc/spice-gtk/files/spice-gtk-0.20-add-spice-channel-string-to-type.patch deleted file mode 100644 index 3375d801ab2d..000000000000 --- a/net-misc/spice-gtk/files/spice-gtk-0.20-add-spice-channel-string-to-type.patch +++ /dev/null @@ -1,84 +0,0 @@ -From b85ca792af72d5f1e10aa6af9515eb96a044fc5c Mon Sep 17 00:00:00 2001 -From: Hans de Goede <hdegoede@redhat.com> -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 <hdegoede@redhat.com> ---- -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 diff --git a/net-misc/spice-gtk/files/spice-gtk-0.21-fix-g-clear-pointer-on-old-glib.patch b/net-misc/spice-gtk/files/spice-gtk-0.21-fix-g-clear-pointer-on-old-glib.patch deleted file mode 100644 index 83e51db67d8b..000000000000 --- a/net-misc/spice-gtk/files/spice-gtk-0.21-fix-g-clear-pointer-on-old-glib.patch +++ /dev/null @@ -1,22 +0,0 @@ -From f31bc2a9a6700bebc258130e802f40180af77d8e Mon Sep 17 00:00:00 2001 -From: Marc-André Lureau <marcandre.lureau@redhat.com> -Date: Fri, 20 Sep 2013 15:54:58 +0000 -Subject: build-sys: fix g_clear_pointer usage on old glib - -As pointed out and verified on the ML after 0.21 release by Klaus -Hochlehnert. ---- -diff --git a/gtk/channel-cursor.c b/gtk/channel-cursor.c -index 0443b9f..bbfb3c9 100644 ---- a/gtk/channel-cursor.c -+++ b/gtk/channel-cursor.c -@@ -15,6 +15,7 @@ - You should have received a copy of the GNU Lesser General Public - License along with this library; if not, see <http://www.gnu.org/licenses/>. - */ -+#include "glib-compat.h" - #include "spice-client.h" - #include "spice-common.h" - --- -cgit v0.9.0.2-2-gbebe diff --git a/net-misc/spice-gtk/files/spice-gtk-0.25-Do-not-depend-on-libsoup-directly.patch b/net-misc/spice-gtk/files/spice-gtk-0.25-Do-not-depend-on-libsoup-directly.patch deleted file mode 100644 index fe24734ed0d5..000000000000 --- a/net-misc/spice-gtk/files/spice-gtk-0.25-Do-not-depend-on-libsoup-directly.patch +++ /dev/null @@ -1,29 +0,0 @@ -From 1dcf7acb4288a27f125458bfa86cf614437657d5 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Tiziano=20M=C3=BCller?= <tiziano.mueller@stepping-stone.ch> -Date: Tue, 20 May 2014 18:49:28 +0200 -Subject: [PATCH 2/2] Do not depend on libsoup directly - -The libsoup-dependency is not directly used but comes in as a dependency -of phodav and phodav has libsoup correctly recorded in its pkg-config -file. ---- - configure.ac | 3 --- - 1 file changed, 3 deletions(-) - -diff --git a/configure.ac b/configure.ac -index 70ab75c..f47ee20 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -267,9 +267,6 @@ PKG_CHECK_MODULES(GTHREAD, gthread-2.0 > 2.0.0) - AC_SUBST(GTHREAD_CFLAGS) - AC_SUBST(GTHREAD_LIBS) - --PKG_CHECK_MODULES(SOUP, libsoup-2.4) --AC_SUBST(SOUP_CFLAGS) --AC_SUBST(SOUP_LIBS) - AC_ARG_ENABLE([webdav], - AS_HELP_STRING([--enable-webdav=@<:@auto/yes/no@:>@], - [Enable webdav support @<:@default=auto@:>@]), --- -1.9.2 - diff --git a/net-misc/spice-gtk/files/spice-gtk-0.25-Introduce-enable-disable-webdav-option.patch b/net-misc/spice-gtk/files/spice-gtk-0.25-Introduce-enable-disable-webdav-option.patch deleted file mode 100644 index 817a9b0a6d0a..000000000000 --- a/net-misc/spice-gtk/files/spice-gtk-0.25-Introduce-enable-disable-webdav-option.patch +++ /dev/null @@ -1,54 +0,0 @@ -From f25626a68a2fb83b02ee7a13dd4887d1305bc068 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Tiziano=20M=C3=BCller?= <tiziano.mueller@stepping-stone.ch> -Date: Tue, 20 May 2014 18:48:05 +0200 -Subject: [PATCH 1/2] Introduce --enable/disable-webdav option - -This makes the phodav dependency configureable. -And name it after the corresponding channel. ---- - configure.ac | 21 +++++++++++++++++---- - 1 file changed, 17 insertions(+), 4 deletions(-) - -diff --git a/configure.ac b/configure.ac -index d89bd6f..70ab75c 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -270,10 +270,23 @@ AC_SUBST(GTHREAD_LIBS) - PKG_CHECK_MODULES(SOUP, libsoup-2.4) - AC_SUBST(SOUP_CFLAGS) - AC_SUBST(SOUP_LIBS) -+AC_ARG_ENABLE([webdav], -+ AS_HELP_STRING([--enable-webdav=@<:@auto/yes/no@:>@], -+ [Enable webdav support @<:@default=auto@:>@]), -+ [], -+ [enable_webdav="auto"]) -+ -+if test "x$enable_webdav" = "xno"; then -+ have_phodav="no" -+else -+ PKG_CHECK_MODULES(PHODAV, [libphodav-1.0], [have_phodav=yes], [have_phodav=no]) -+ AC_SUBST(PHODAV_CFLAGS) -+ AC_SUBST(PHODAV_LIBS) - --PKG_CHECK_MODULES(PHODAV, [libphodav-1.0], [have_phodav=yes], [have_phodav=no]) --AC_SUBST(PHODAV_CFLAGS) --AC_SUBST(PHODAV_LIBS) -+ if test "x$have_phodav" = "xno" && test "x$enable_webdav" = "xyes"; then -+ AC_MSG_ERROR([webdav support explicitly requested, but some required packages are not available]) -+ fi -+fi - AS_IF([test "x$have_phodav" = "xyes"], - AC_DEFINE(USE_PHODAV, [1], [Define if supporting phodav])) - -@@ -754,7 +767,7 @@ AC_MSG_NOTICE([ - Smartcard support: ${have_smartcard} - USB redirection support: ${have_usbredir} ${with_usbredir_hotplug} - DBus: ${have_dbus} -- PhoDAV: ${have_phodav} -+ WebDAV support: ${have_phodav} - - Now type 'make' to build $PACKAGE - --- -1.9.2 - diff --git a/net-misc/spice-gtk/files/spice-gtk-0.25-missing_gio_libs.patch b/net-misc/spice-gtk/files/spice-gtk-0.25-missing_gio_libs.patch deleted file mode 100644 index 8429afd50609..000000000000 --- a/net-misc/spice-gtk/files/spice-gtk-0.25-missing_gio_libs.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff --git a/gtk/Makefile.am b/gtk/Makefile.am -index 8da1a11..6332db9 100644 ---- a/gtk/Makefile.am -+++ b/gtk/Makefile.am -@@ -189,6 +189,7 @@ libspice_client_glib_2_0_la_LIBADD = \ - $(top_builddir)/spice-common/common/libspice-common-client.la \ - $(GLIB2_LIBS) \ - $(SOUP_LIBS) \ -+ $(GIO_LIBS) \ - $(GOBJECT2_LIBS) \ - $(CELT051_LIBS) \ - $(OPUS_LIBS) \ diff --git a/net-misc/spice-gtk/files/spice.protocol b/net-misc/spice-gtk/files/spice.protocol deleted file mode 100644 index 348247f8ca12..000000000000 --- a/net-misc/spice-gtk/files/spice.protocol +++ /dev/null @@ -1,12 +0,0 @@ -[Protocol] -exec=/usr/bin/spicy --uri="%u" -protocol=spice -input=none -output=none -helper=true -listing= -reading=false -writing=false -makedir=false -deleting=false - diff --git a/net-misc/spice-gtk/files/spice.schemas b/net-misc/spice-gtk/files/spice.schemas deleted file mode 100644 index 43b12171c847..000000000000 --- a/net-misc/spice-gtk/files/spice.schemas +++ /dev/null @@ -1,41 +0,0 @@ -<?xml version="1.0"?> -<gconfschemafile> -<schemalist> -<schema> - <key>/schemas/desktop/gnome/url-handlers/spice/enabled</key> - <applyto>/desktop/gnome/url-handlers/spice/enabled</applyto> - <owner>spice</owner> - <type>bool</type> - <default>true</default> - <locale name="C"> - <short>How to handle spice URLs</short> - <long>Set to true to have a program specified in command handle spice URLs</long> - </locale> -</schema> - - <schema> - <key>/schemas/desktop/gnome/url-handlers/spice/command</key> - <applyto>/desktop/gnome/url-handlers/spice/command</applyto> - <owner>spice</owner> - <type>string</type> - <default>/usr/bin/spicy --uri="%s"</default> - <locale name="C"> - <short>URL handler for spice URIs</short> - <long>URL handler for spice URIs</long> - </locale> - </schema> - - <schema> - <key>/schemas/desktop/gnome/url-handlers/spice/need-terminal</key> - <applyto>/desktop/gnome/url-handlers/spice/need-terminal</applyto> - <owner>spice</owner> - <type>bool</type> - <default>false</default> - <locale name="C"> - <short>Run program in terminal</short> - <long>True if the program to handle this URL should be run in a terminal</long> - </locale> - </schema> -</schemalist> -</gconfschemafile> - |