<pre style='margin:0'>
Dan Villiom Podlaski Christiansen (danchr) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/8e08d3793fbd1f3c804420d221eb854aa3abd2f4">https://github.com/macports/macports-ports/commit/8e08d3793fbd1f3c804420d221eb854aa3abd2f4</a></p>
<pre style="white-space: pre; background: #F8F8F8">The following commit(s) were added to refs/heads/master by this push:
<span style='display:block; white-space:pre;color:#404040;'> new 8e08d37 spice-gtk: upgrade to 0.34
</span>8e08d37 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 8e08d3793fbd1f3c804420d221eb854aa3abd2f4
</span>Author: Dan Villiom Podlaski Christiansen <danchr@macports.org>
AuthorDate: Sun Oct 1 00:10:06 2017 +0200
<span style='display:block; white-space:pre;color:#404040;'> spice-gtk: upgrade to 0.34
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> I've added a +quartz variant and also a warning that the +x11 variant
</span><span style='display:block; white-space:pre;color:#404040;'> is untested.
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> The +quartz variant forces the build system to build all C sources as
</span><span style='display:block; white-space:pre;color:#404040;'> Objective-C due to some #include oddities. Yes, this is rather large
</span><span style='display:block; white-space:pre;color:#404040;'> hammer for this particular nail, but Objective-C is supposed to be a
</span><span style='display:block; white-space:pre;color:#404040;'> strict superset of C, so... it works...
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> See: https://trac.macports.org/ticket/54439
</span>---
gnome/spice-gtk/Portfile | 52 +++++++----
gnome/spice-gtk/files/no-egl.diff | 159 ---------------------------------
gnome/spice-gtk/files/no-usbredir.diff | 22 -----
3 files changed, 34 insertions(+), 199 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/gnome/spice-gtk/Portfile b/gnome/spice-gtk/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index b7212ba..77ebcc5 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/gnome/spice-gtk/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/gnome/spice-gtk/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,9 +1,11 @@
</span> # -*- coding: utf-8; mode: tcl; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- vim:fenc=utf-8:ft=tcl:et:sw=4:ts=4:sts=4
PortSystem 1.0
<span style='display:block; white-space:pre;background:#e0ffe0;'>+PortGroup active_variants 1.1
</span>
name spice-gtk
<span style='display:block; white-space:pre;background:#ffe0e0;'>-version 0.33
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+version 0.34
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 1
</span> maintainers {danchr @danchr} openmaintainer
categories devel
license LGPL-2.1+
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -22,33 +24,47 @@ long_description gtk-vnc is a VNC viewer widget for GTK. It is built using \
</span> homepage https://www.spice-space.org/page/Spice-Gtk
master_sites https://www.spice-space.org/download/gtk/
<span style='display:block; white-space:pre;background:#ffe0e0;'>-use_bzip2 yes
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+use_bzip2 yes
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums rmd160 0b546d9c9b253e243196373ebb33586b005231af \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 7daf33b786ab8ebc9fe6e7b11745100ee1ab66e61a5811d1d5aabe4d66eaaf39
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums rmd160 3c238174b293d09be175839630bcc730682f0b78 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 e9720e01165f8451c9f3f58ad50e3afb990993b81cc2db86b3661b7ac5b976ee
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-patchfiles no-usbredir.diff \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- no-egl.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+depends_build-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:pkgconfig \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:intltool port:vala
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-depends_build port:pkgconfig \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:intltool
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+depends_lib \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:spice-protocol \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:gtk3 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:libpixman \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:lz4 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:jpeg \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:pulseaudio \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:libepoxy \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:libusb
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-depends_lib port:spice-protocol \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:gtk3 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:libpixman \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:lz4 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:pulseaudio \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:libepoxy \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:libusb
</span>
# for ucontext
configure.cppflags-append \
-D_XOPEN_SOURCE
<span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> # depends_lib port:gtk3 \
# port:gnutls \
# port:libgcrypt \
# port:pulseaudio
<span style='display:block; white-space:pre;background:#ffe0e0;'>-# configure.cppflags-append \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# -D_XOPEN_SOURCE
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+variant quartz {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # src/vncdisplaykeymap.c includes <gdk/gdkquartz.h>, which in turn
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # includes AppKit -- which fails hard in a regular C compiler
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.cflags-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -ObjC
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+if {[variant_isset quartz]} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ require_active_variants gtk3 quartz
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+} else {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ require_active_variants gtk3 "" quartz
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ pre-build {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ui_warn "the +x11 variant is untested; if the build fails, try +quartz instead."
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/gnome/spice-gtk/files/no-egl.diff b/gnome/spice-gtk/files/no-egl.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 858461a..0000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/gnome/spice-gtk/files/no-egl.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,159 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git src/spice-widget-egl.c src/spice-widget-egl.c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- src/spice-widget-egl.c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ src/spice-widget-egl.c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -23,6 +23,9 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #define GL_GLEXT_PROTOTYPES
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include "spice-widget.h"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#ifndef GDK_WINDOWING_QUARTZ
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include "spice-widget-priv.h"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include "spice-gtk-session-priv.h"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include <libdrm/drm_fourcc.h>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -679,3 +682,4 @@ gboolean spice_egl_update_scanout(SpiceD
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- return TRUE;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git src/spice-widget-priv.h src/spice-widget-priv.h
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- src/spice-widget-priv.h
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ src/spice-widget-priv.h
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -24,7 +24,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include <windows.h>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--#ifndef G_OS_WIN32
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#if !defined(G_OS_WIN32) && !defined(GDK_WINDOWING_QUARTZ)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include <epoxy/egl.h>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -127,7 +127,7 @@ struct _SpiceDisplayPrivate {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- int x11_accel_denominator;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- int x11_threshold;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--#ifndef G_OS_WIN32
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#if !defined(G_OS_WIN32) && !defined(GDK_WINDOWING_QUARTZ)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- struct {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- gboolean context_ready;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- gboolean enabled;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git src/spice-widget.c src/spice-widget.c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- src/spice-widget.c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ src/spice-widget.c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -235,7 +235,7 @@ static gint get_display_id(SpiceDisplay
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- static bool egl_enabled(SpiceDisplayPrivate *d)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--#ifndef G_OS_WIN32
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#if !defined(G_OS_WIN32) && !defined(GDK_WINDOWING_QUARTZ)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- return d->egl.enabled;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #else
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- return false;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -567,7 +567,7 @@ static void grab_notify(SpiceDisplay *di
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #if GTK_CHECK_VERSION(3,16,0)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--#ifndef G_OS_WIN32
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#if !defined(G_OS_WIN32) && !defined(GDK_WINDOWING_QUARTZ)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- static gboolean
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- gl_area_render(GtkGLArea *area, GdkGLContext *context, gpointer user_data)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -636,7 +636,7 @@ static void spice_display_init(SpiceDisp
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- gtk_stack_set_visible_child(d->stack, area);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #if GTK_CHECK_VERSION(3,16,0)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--#ifndef G_OS_WIN32
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#if !defined(G_OS_WIN32) && !defined(GDK_WINDOWING_QUARTZ)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- area = gtk_gl_area_new();
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- gtk_gl_area_set_required_version(GTK_GL_AREA(area), 3, 2);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- gtk_gl_area_set_auto_render(GTK_GL_AREA(area), false);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -1221,7 +1221,7 @@ static gboolean do_color_convert(SpiceDi
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- return true;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--#ifndef G_OS_WIN32
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#if !defined(G_OS_WIN32) && !defined(GDK_WINDOWING_QUARTZ)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- static void set_egl_enabled(SpiceDisplay *display, bool enabled)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- SpiceDisplayPrivate *d = display->priv;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -1257,7 +1257,7 @@ static gboolean draw_event(GtkWidget *wi
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- SpiceDisplayPrivate *d = display->priv;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- g_return_val_if_fail(d != NULL, false);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--#ifndef G_OS_WIN32
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#if !defined(G_OS_WIN32) && !defined(GDK_WINDOWING_QUARTZ)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if (egl_enabled(d) &&
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- g_str_equal(gtk_stack_get_visible_child_name(d->stack), "draw-area")) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- spice_egl_update_display(display);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -2016,7 +2016,7 @@ static void size_allocate(GtkWidget *wid
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- d->ww = conf->width;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- d->wh = conf->height;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- recalc_geometry(widget);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--#ifndef G_OS_WIN32
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#if !defined(G_OS_WIN32) && !defined(GDK_WINDOWING_QUARTZ)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if (egl_enabled(d))
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- spice_egl_resize_display(display, conf->width, conf->height);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -2059,7 +2059,7 @@ static void realize(GtkWidget *widget)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- static void unrealize(GtkWidget *widget)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- spice_cairo_image_destroy(SPICE_DISPLAY(widget));
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--#ifndef G_OS_WIN32
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#if !defined(G_OS_WIN32) && !defined(GDK_WINDOWING_QUARTZ)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- spice_egl_unrealize_display(SPICE_DISPLAY(widget));
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -2377,7 +2377,7 @@ static void update_area(SpiceDisplay *di
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- .height = height
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- };
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--#ifndef G_OS_WIN32
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#if !defined(G_OS_WIN32) && !defined(GDK_WINDOWING_QUARTZ)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if (egl_enabled(d)) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- const SpiceGlScanout *so =
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- spice_display_get_gl_scanout(SPICE_DISPLAY_CHANNEL(d->display));
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -2474,7 +2474,7 @@ static void invalidate(SpiceChannel *cha
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- .height = h
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- };
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--#ifndef G_OS_WIN32
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#if !defined(G_OS_WIN32) && !defined(GDK_WINDOWING_QUARTZ)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set_egl_enabled(display, false);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -2538,7 +2538,7 @@ static void cursor_set(SpiceCursorChanne
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- } else
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- g_warn_if_reached();
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--#ifndef G_OS_WIN32
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#if !defined(G_OS_WIN32) && !defined(GDK_WINDOWING_QUARTZ)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if (egl_enabled(d))
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- spice_egl_cursor_set(display);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -2708,7 +2708,7 @@ static void inputs_channel_event(SpiceCh
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- spice_display_set_keypress_delay(display, delay);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--#ifndef G_OS_WIN32
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#if !defined(G_OS_WIN32) && !defined(GDK_WINDOWING_QUARTZ)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- G_GNUC_INTERNAL
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- void spice_display_widget_gl_scanout(SpiceDisplay *display)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -2814,7 +2814,7 @@ static void channel_new(SpiceSession *s,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- mark(display, primary.marked);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--#ifndef G_OS_WIN32
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#if !defined(G_OS_WIN32) && !defined(GDK_WINDOWING_QUARTZ)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- spice_g_signal_connect_object(channel, "notify::gl-scanout",
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- G_CALLBACK(spice_display_widget_gl_scanout),
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- display, G_CONNECT_SWAPPED);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -2974,7 +2974,7 @@ GdkPixbuf *spice_display_get_pixbuf(Spic
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- g_return_val_if_fail(d != NULL, NULL);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- g_return_val_if_fail(d->display != NULL, NULL);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--#ifndef G_OS_WIN32
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#if !defined(G_OS_WIN32) && !defined(GDK_WINDOWING_QUARTZ)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if (egl_enabled(d)) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- GdkPixbuf *tmp;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/gnome/spice-gtk/files/no-usbredir.diff b/gnome/spice-gtk/files/no-usbredir.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index cd3b2d6..0000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/gnome/spice-gtk/files/no-usbredir.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,22 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git src/map-file src/map-file
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- src/map-file
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ src/map-file
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -126,7 +126,6 @@ spice_uri_set_scheme;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- spice_uri_set_user;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- spice_uri_to_string;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- spice_usb_device_get_description;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--spice_usb_device_get_libusb_device;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- spice_usb_device_get_type;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- spice_usb_device_manager_can_redirect_device;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- spice_usb_device_manager_connect_device_async;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git src/spice-glib-sym-file src/spice-glib-sym-file
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- src/spice-glib-sym-file
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ src/spice-glib-sym-file
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -105,7 +105,6 @@ spice_uri_set_scheme
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- spice_uri_set_user
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- spice_uri_to_string
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- spice_usb_device_get_description
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--spice_usb_device_get_libusb_device
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- spice_usb_device_get_type
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- spice_usb_device_manager_can_redirect_device
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- spice_usb_device_manager_connect_device_async
</span></pre><pre style='margin:0'>
</pre>