[Spice-commits] 3 commits - configure hw/usb ui/gtk.c

[Gerd Hoffmann]

 configure         |    4 ++--
 hw/usb/redirect.c |    2 +-
 ui/gtk.c          |    1 +
 3 files changed, 4 insertions(+), 3 deletions(-)

New commits:
commit 5cbb08283789caf7dbfd0890dcff47124ad766c2
Author: Anthony Liguori <aliguori at us.ibm.com>
Date:   Fri Feb 22 08:40:30 2013 -0600

    ui/gtk: require at least GTK 2.18 and VTE 0.26
    
    This gives us the bare amount of features we need.  We can add work arounds
    for older versions and lower the requirement but this should be a good
    starting point.
    
    Suggested-by: Daniel Berrange <berrange at redhat.com>
    Signed-off-by: Anthony Liguori <aliguori at us.ibm.com>
    ---
    v1 -> v2
     - tremendous simplification suggested by danpb

diff --git a/configure b/configure
index 0dadd31..0eb25dd 100755
--- a/configure
+++ b/configure
@@ -1644,8 +1644,8 @@ fi
 # GTK probe
 
 if test "$gtk" != "no"; then
-    if $pkg_config gtk+-2.0 --modversion >/dev/null 2>/dev/null && \
-       $pkg_config vte --modversion >/dev/null 2>/dev/null; then
+    if $pkg_config --exists 'gtk+-2.0 >= 2.18.0' && \
+       $pkg_config --exists 'vte >= 0.26.0'; then
 	gtk_cflags=`$pkg_config --cflags gtk+-2.0 2>/dev/null`
 	gtk_libs=`$pkg_config --libs gtk+-2.0 2>/dev/null`
 	vte_cflags=`$pkg_config --cflags vte 2>/dev/null`
commit 82fb0c8908ccbf775be749be9eb3fc0a5813ceaa
Author: Gerd Hoffmann <kraxel at redhat.com>
Date:   Fri Feb 22 12:11:59 2013 +0100

    unbreak hw/usb/redirect.c build
    
    Commit 8550a02d1239415342959f6a32d178bc05c557cc added a streams
    parameter to usb_wakeup and didn't update redirect.c.  Fix it.
    
    Signed-off-by: Gerd Hoffmann <kraxel at redhat.com>
    Signed-off-by: Anthony Liguori <aliguori at us.ibm.com>

diff --git a/hw/usb/redirect.c b/hw/usb/redirect.c
index 7078403..c519b9b 100644
--- a/hw/usb/redirect.c
+++ b/hw/usb/redirect.c
@@ -1897,7 +1897,7 @@ static void usbredir_interrupt_packet(void *priv, uint64_t id,
         }
 
         if (QTAILQ_EMPTY(&dev->endpoint[EP2I(ep)].bufpq)) {
-            usb_wakeup(usb_ep_get(&dev->dev, USB_TOKEN_IN, ep & 0x0f));
+            usb_wakeup(usb_ep_get(&dev->dev, USB_TOKEN_IN, ep & 0x0f), 0);
         }
 
         /* bufp_alloc also adds the packet to the ep queue */
commit 3f58eadeed497445a0ce11468c7394cb3d3f1b65
Author: Stefan Weil <sw at weilnetz.de>
Date:   Fri Feb 22 07:28:01 2013 +0100

    ui/gtk: Fix build (missing include for setlocale)
    
    At least for Ubuntu Linux locale.h is needed.
    
    Signed-off-by: Stefan Weil <sw at weilnetz.de>
    Message-id: 1361514481-26164-1-git-send-email-sw at weilnetz.de
    Signed-off-by: Anthony Liguori <aliguori at us.ibm.com>

diff --git a/ui/gtk.c b/ui/gtk.c
index 29156be..5f91de4 100644
--- a/ui/gtk.c
+++ b/ui/gtk.c
@@ -37,6 +37,7 @@
 #include <gtk/gtk.h>
 #include <gdk/gdkkeysyms.h>
 #include <glib/gi18n.h>
+#include <locale.h>
 #include <vte/vte.h>
 #include <sys/types.h>
 #include <sys/socket.h>