libraries/clutter-gtk: Patched for new gtk.

Signed-off-by: Niels Horn <niels.horn@slackbuilds.org>

3 files changed, 77 insertions, 5 deletions

diff --git a/libraries/clutter-gtk/clutter-gtk.SlackBuild b/libraries/clutter-gtk/clutter-gtk.SlackBuild
index 57eed5c58c..1c795424bc 100644
--- a/libraries/clutter-gtk/clutter-gtk.SlackBuild
+++ b/libraries/clutter-gtk/clutter-gtk.SlackBuild
@@ -22,17 +22,17 @@
 # OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+# Modified by the SlackBuilds.org team
+
 PRGNAM=clutter-gtk
 VERSION=0.10.2
-BUILD=${BUILD:-1}
+BUILD=${BUILD:-2}
 TAG=${TAG:-_SBo}
 
-# Automatically determine the architecture we're building on:
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
     i?86) ARCH=i486 ;;
     arm*) ARCH=arm ;;
-    # Unless $ARCH is already set, use uname -m for all other archs:
        *) ARCH=$( uname -m ) ;;
   esac
 fi
@@ -67,6 +67,9 @@ cd $PRGNAM-$VERSION
 chown -R root:root .
 chmod -R u+w,go+r-w,a-s .
 
+# Patch for newer gtk
+patch -p1 < $CWD/clutter-gtk_newgtk.patch
+
 CFLAGS="$SLKCFLAGS" \
 CXXFLAGS="$SLKCFLAGS" \
 ./configure \
diff --git a/libraries/clutter-gtk/clutter-gtk_newgtk.patch b/libraries/clutter-gtk/clutter-gtk_newgtk.patch
new file mode 100644
index 0000000000..5fdfdd7b58
--- /dev/null
+++ b/libraries/clutter-gtk/clutter-gtk_newgtk.patch
@@ -0,0 +1,69 @@
+--- clutter-gtk-0.10.2/clutter-gtk/gtk-clutter-embed.c	2009-06-27 11:21:06.000000000 -0300
++++ clutter-gtk-0.10.2_patched/clutter-gtk/gtk-clutter-embed.c	2011-03-31 20:49:50.000000000 -0300
+@@ -131,7 +131,7 @@
+ {
+   GtkClutterEmbedPrivate *priv = GTK_CLUTTER_EMBED (widget)->priv;
+ 
+-  if (GTK_WIDGET_REALIZED (widget))
++  if (gtk_widget_get_realized (widget))
+     clutter_actor_show (priv->stage);
+ 
+   GTK_WIDGET_CLASS (gtk_clutter_embed_parent_class)->show (widget);
+@@ -178,7 +178,7 @@
+   }
+ #endif
+ 
+-  GTK_WIDGET_SET_FLAGS (widget, GTK_REALIZED);
++  gtk_widget_set_realized (widget,TRUE);
+ 
+   attributes.window_type = GDK_WINDOW_CHILD;
+   attributes.x = widget->allocation.x;
+@@ -222,7 +222,7 @@
+ 
+   clutter_actor_realize (priv->stage);
+ 
+-  if (GTK_WIDGET_VISIBLE (widget))
++  if (gtk_widget_get_visible (widget))
+     clutter_actor_show (priv->stage);
+ 
+   gtk_clutter_embed_send_configure (GTK_CLUTTER_EMBED (widget));
+@@ -246,7 +246,7 @@
+ 
+   widget->allocation = *allocation;
+ 
+-  if (GTK_WIDGET_REALIZED (widget))
++  if (gtk_widget_get_realized (widget))
+     {
+       gdk_window_move_resize (widget->window,
+                               allocation->x, allocation->y,
+@@ -586,8 +586,8 @@
+ 
+   embed->priv = priv = GTK_CLUTTER_EMBED_GET_PRIVATE (embed);
+ 
+-  GTK_WIDGET_SET_FLAGS (embed, GTK_CAN_FOCUS);
+-  GTK_WIDGET_UNSET_FLAGS (embed, GTK_NO_WINDOW);
++  gtk_widget_set_can_focus(GTK_WIDGET(embed),TRUE);
++  gtk_widget_set_has_window(GTK_WIDGET(embed),TRUE);
+ 
+   /* disable double-buffering: it's automatically provided
+    * by OpenGL
+--- clutter-gtk-0.10.2/clutter-gtk/gtk-clutter-util.c	2009-07-28 14:20:35.000000000 -0300
++++ clutter-gtk-0.10.2_patched/clutter-gtk/gtk-clutter-util.c	2011-03-31 20:57:19.000000000 -0300
+@@ -622,7 +622,7 @@
+     return CLUTTER_INIT_ERROR_GTK;
+ 
+ #if defined(HAVE_CLUTTER_GTK_X11)
+-  clutter_x11_set_display (GDK_DISPLAY());
++  clutter_x11_set_display (GDK_DISPLAY_XDISPLAY(gdk_display_get_default()));
+   clutter_x11_disable_event_retrieval ();
+ #elif defined(HAVE_CLUTTER_GTK_WIN32)
+   clutter_win32_disable_event_retrieval ();
+@@ -673,7 +673,7 @@
+     return CLUTTER_INIT_ERROR_GTK;
+ 
+ #if defined(GDK_WINDOWING_X11)
+-  clutter_x11_set_display (GDK_DISPLAY());
++  clutter_x11_set_display (GDK_DISPLAY_XDISPLAY(gdk_display_get_default()));
+   clutter_x11_disable_event_retrieval ();
+ #elif defined(GDK_WINDOWING_WIN32)
+   clutter_win32_disable_event_retrieval ();
diff --git a/libraries/clutter-gtk/slack-desc b/libraries/clutter-gtk/slack-desc
index b91569b29b..d9454699f6 100644
--- a/libraries/clutter-gtk/slack-desc
+++ b/libraries/clutter-gtk/slack-desc
@@ -5,9 +5,9 @@
 # make exactly 11 lines for the formatting to be correct.  It's also
 # customary to leave one space after the ':'.
 
-           |-----handy-ruler----------------------------------------------------|
+           |-----handy-ruler------------------------------------------------------|
 clutter-gtk: clutter-gtk (a Clutter library for GTK+ applications)
-clutter-gtk: 
+clutter-gtk:
 clutter-gtk: Clutter-GTK is a library providing facilities to integrate Clutter
 clutter-gtk: into GTK+ applications. It provides a GTK+ widget, GtkClutterEmbed,
 clutter-gtk: for embedding the default ClutterStage into any GtkContainer.