[jhbuild] Add gtk3 build fix for gtk-vnc



commit 7723194b8899653ca511af7cf20adbd68ee4a3f7
Author: Matthias Clasen <mclasen redhat com>
Date:   Thu Dec 9 16:47:11 2010 -0500

    Add gtk3 build fix for gtk-vnc

 modulesets/gnome-apps-3.0.modules |    4 ++++
 patches/gtk-vnc.drawable.patch    |   26 ++++++++++++++++++++++++++
 2 files changed, 30 insertions(+), 0 deletions(-)
---
diff --git a/modulesets/gnome-apps-3.0.modules b/modulesets/gnome-apps-3.0.modules
index cde4bce..56da854 100644
--- a/modulesets/gnome-apps-3.0.modules
+++ b/modulesets/gnome-apps-3.0.modules
@@ -76,6 +76,10 @@
     <dependencies>
       <dep package="gtk+-3"/>
     </dependencies>
+    <patches>
+      <!-- fix from git, drop with 0.4.3 -->
+      <patch file="gtk-vnc.drawable.patch" strip="1"/>
+    </patches>
   </tarball>
 
   <tarball id="libgda" version="4.2.0" autogenargs="--with-java=no --disable-introspection">
diff --git a/patches/gtk-vnc.drawable.patch b/patches/gtk-vnc.drawable.patch
new file mode 100644
index 0000000..c3906f2
--- /dev/null
+++ b/patches/gtk-vnc.drawable.patch
@@ -0,0 +1,26 @@
+diff --git a/src/vncdisplay.c b/src/vncdisplay.c
+index 33d2623..fdb56b5 100644
+--- a/src/vncdisplay.c
++++ b/src/vncdisplay.c
+@@ -629,9 +629,9 @@ static gboolean motion_event(GtkWidget *widget, GdkEventMotion *motion)
+ 
+ 	/* Next adjust the real client pointer */
+ 	if (!priv->absolute) {
+-		GdkDrawable *drawable = GDK_DRAWABLE(gtk_widget_get_window(widget));
+-		GdkDisplay *display = gdk_drawable_get_display(drawable);
+-		GdkScreen *screen = gdk_drawable_get_screen(drawable);
++		GdkWindow *window = gtk_widget_get_window(widget);
++		GdkDisplay *display = gdk_window_get_display(window);
++		GdkScreen *screen = gdk_window_get_screen(window);
+ 		int x = (int)motion->x_root;
+ 		int y = (int)motion->y_root;
+ 
+@@ -1260,7 +1260,7 @@ static void on_cursor_changed(VncConnection *conn G_GNUC_UNUSED,
+ 	}
+ 
+ 	if (cursor) {
+-		GdkDisplay *display = gdk_drawable_get_display(GDK_DRAWABLE(gtk_widget_get_window(GTK_WIDGET(obj))));
++		GdkDisplay *display = gtk_widget_get_display(GTK_WIDGET(obj));
+ 		GdkPixbuf *pixbuf = gdk_pixbuf_new_from_data(vnc_cursor_get_data(cursor),
+ 							     GDK_COLORSPACE_RGB,
+ 							     TRUE, 8,



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]