File clutter-gtk-0.11.4-win32.patch of Package mingw32-clutter-gtk

Overview Repositories Revisions Requests Users Attributes Meta

File clutter-gtk-0.11.4-win32.patch of Package mingw32-clutter-gtk (Revision bfb5e049fff0b23da4c7b04348d30e40)

Currently displaying revision bfb5e049fff0b23da4c7b04348d30e40 , Show latest

--- clutter-gtk-0.11.4/clutter-gtk/gtk-clutter-actor.c	2011-02-10 14:04:19.000000000 +0100
+++ clutter-gtk-0.11.4/clutter-gtk/gtk-clutter-actor.c	2011-06-01 16:57:48.336791135 +0200
@@ -56,7 +56,7 @@
 
 #elif defined(HAVE_CLUTTER_GTK_WIN32)
 
-#include <clutter/clutter-win32.h>
+#include <clutter/win32/clutter-win32.h>
 #include <gdk/gdkwin32.h>
 
 #endif /* HAVE_CLUTTER_GTK_{X11,WIN32} */
@@ -139,8 +139,10 @@
   gdk_drawable_set_colormap (priv->pixmap, gtk_widget_get_colormap (priv->embed));
   gdk_drawable_get_size (priv->pixmap, &pixmap_width, &pixmap_height);
 
+#if defined(HAVE_CLUTTER_GTK_X11)
   clutter_x11_texture_pixmap_set_pixmap (CLUTTER_X11_TEXTURE_PIXMAP (priv->texture),
                                          GDK_PIXMAP_XID (priv->pixmap));
+#endif
   clutter_actor_set_size (priv->texture, pixmap_width, pixmap_height);
 }
 
@@ -248,8 +250,10 @@
 
           gdk_drawable_set_colormap (priv->pixmap, gtk_widget_get_colormap (clutter->priv->embed));
 
+#if defined(HAVE_CLUTTER_GTK_X11)
           clutter_x11_texture_pixmap_set_pixmap (CLUTTER_X11_TEXTURE_PIXMAP (priv->texture),
                                                  GDK_PIXMAP_XID (priv->pixmap));
+#endif
         }
     }
 
--- clutter-gtk-0.11.4/clutter-gtk/gtk-clutter-embed.c	2011-02-10 14:04:13.000000000 +0100
+++ clutter-gtk-0.11.4/clutter-gtk/gtk-clutter-embed.c	2011-06-01 16:52:53.547891148 +0200
@@ -52,7 +52,7 @@
 
 #elif defined(HAVE_CLUTTER_GTK_WIN32)
 
-#include <clutter/clutter-win32.h>
+#include <clutter/win32/clutter-win32.h>
 #include <gdk/gdkwin32.h>
 
 #endif /* HAVE_CLUTTER_GTK_{X11,WIN32} */
@@ -183,9 +183,9 @@
                          GdkEvent  *event         G_GNUC_UNUSED,
                          gpointer   user_data     G_GNUC_UNUSED)
 {
+#ifdef HAVE_CLUTTER_GTK_X11
   XEvent *xevent = native_event;
 
-#ifdef HAVE_CLUTTER_GTK_X11
   /* let Clutter handle all events coming from the windowing system */
   clutter_x11_handle_event (xevent);
 #endif
--- clutter-gtk-0.11.4/clutter-gtk/gtk-clutter-util.c	2011-02-10 14:04:13.000000000 +0100
+++ clutter-gtk-0.11.4/clutter-gtk/gtk-clutter-util.c	2011-06-01 16:42:50.201937193 +0200
@@ -18,7 +18,7 @@
 
 #elif defined(HAVE_CLUTTER_GTK_WIN32)
 
-#include <clutter/clutter-win32.h>
+#include <clutter/win32/clutter-win32.h>
 #include <gdk/gdkwin32.h>
 
 #endif /* HAVE_CLUTTER_GTK_{X11,WIN32} */
--- clutter-gtk-0.11.4/clutter-gtk/Makefile.am	2011-02-10 14:04:13.000000000 +0100
+++ clutter-gtk-0.11.4/clutter-gtk/Makefile.am	2011-06-01 16:44:57.518689169 +0200
@@ -51,7 +51,7 @@
 # please, keep the list sorted alphabetically
 libclutter_gtk_@CLUTTER_GTK_API_VERSION@_la_SOURCES = $(source_c) $(source_h) $(source_h_private)
 libclutter_gtk_@CLUTTER_GTK_API_VERSION@_la_LIBADD  = $(CLUTTER_LIBS) $(GTK_LIBS)
-libclutter_gtk_@CLUTTER_GTK_API_VERSION@_la_LDFLAGS = $(CLUTTER_LT_LDFLAGS)
+libclutter_gtk_@CLUTTER_GTK_API_VERSION@_la_LDFLAGS = $(CLUTTER_LT_LDFLAGS) -no-undefined
 
 cluttergtkheadersdir = $(includedir)/clutter-gtk-@CLUTTER_GTK_API_VERSION@/clutter-gtk
 
--- clutter-gtk-0.11.4/configure.ac	2011-02-10 14:16:54.000000000 +0100
+++ clutter-gtk-0.11.4/configure.ac	2011-06-01 16:43:50.282011009 +0200
@@ -87,10 +87,10 @@
         [win32],
         [
           AC_DEFINE([HAVE_CLUTTER_GTK_WIN32], 1, [Using the Win32 flavour])
-          PKG_CHECK_MODULES(CLUTTER, clutter-win32-1.0 >= $CLUTTER_REQUIRED)
+          PKG_CHECK_MODULES(CLUTTER, clutter-win32-1.0 >= clutter_req_version)
           PKG_CHECK_MODULES(GTK, gtk+-2.0 >= gtk_req_version)
           CLUTTER_GTK_REQUIRES="clutter-win32-1.0 gtk+-2.0"
-        ]
+        ],
 
         [AC_MSG_ERROR([Invalid argument for --with-flavour])]
 )

Places

File clutter-gtk-0.11.4-win32.patch of Package mingw32-clutter-gtk (Revision bfb5e049fff0b23da4c7b04348d30e40)

Places