[gnome-boxes/wip/less-actors2] build, app: Drop clutter-gtk requirement



commit 0b8e3dd2f0de998dbe8ff25896a86c6dae3be223
Author: Zeeshan Ali (Khattak) <zeeshanak gnome org>
Date:   Thu Feb 20 14:00:38 2014 +0000

    build,app: Drop clutter-gtk requirement
    
    This implies clutter and cogl requirement getting dropped as well.

 configure.ac          |    6 ------
 src/Makefile.am       |    2 --
 src/app.vala          |    3 +--
 src/selectionbar.vala |    1 -
 4 files changed, 1 insertions(+), 11 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index c82d961..211ca1f 100644
--- a/configure.ac
+++ b/configure.ac
@@ -48,8 +48,6 @@ AC_PATH_PROG(GLIB_COMPILE_RESOURCES, glib-compile-resources)
 # GSettings support
 GLIB_GSETTINGS
 
-CLUTTER_GTK_MIN_VERSION=1.3.2
-CLUTTER_MIN_VERSION=1.11.14
 GLIB_MIN_VERSION=2.38.0
 AC_SUBST(GLIB_MIN_VERSION)
 GOBJECT_INTROSPECTION_MIN_VERSION=0.9.6
@@ -67,8 +65,6 @@ UUID_REQUIRED=1.41.3
 LIBSOUP_REQUIRED=2.38
 
 PKG_CHECK_MODULES(BOXES, [
-  clutter-gtk-1.0 >= $CLUTTER_GTK_MIN_VERSION
-  clutter-1.0 >= $CLUTTER_MIN_VERSION
   glib-2.0 >= $GLIB_MIN_VERSION
   gobject-introspection-1.0 >= $GOBJECT_INTROSPECTION_MIN_VERSION
   gtk+-3.0 >= $GTK_MIN_VERSION
@@ -132,8 +128,6 @@ fi
 AM_CONDITIONAL([HAVE_OVIRT], [test "x$have_govirt" = "xyes"])
 
 VALA_CHECK([0.23.1.1], [
-  clutter-gtk-1.0
-  cogl-1.0
   gdk-pixbuf-2.0
   glib-2.0
   gtk+-3.0
diff --git a/src/Makefile.am b/src/Makefile.am
index fe969a8..7d2e9e6 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -21,8 +21,6 @@ AM_VALAFLAGS =                                                \
        --vapidir=$(top_srcdir)/libgd                   \
        --vapidir=$(top_srcdir)/vapi                    \
        --vapidir=$(top_srcdir)/vapi/upstream           \
-       --pkg clutter-gtk-1.0                           \
-       --pkg cogl-1.0                                  \
        --pkg config                                    \
        --pkg common                                    \
        --pkg gd-1.0                                    \
diff --git a/src/app.vala b/src/app.vala
index 1c222a1..8c7f1a9 100644
--- a/src/app.vala
+++ b/src/app.vala
@@ -1,7 +1,6 @@
 // This file is part of GNOME Boxes. License: LGPLv2+
 using Gtk;
 using Gdk;
-using Clutter;
 
 private abstract class Boxes.Broker : GLib.Object {
     // Overriding subclass should chain-up at the end of its implementation
@@ -188,7 +187,7 @@ private class Boxes.App: GLib.Object, Boxes.UI {
     public void startup () {
         string [] args = {};
         unowned string [] args2 = args;
-        GtkClutter.init (ref args2);
+        Gtk.init (ref args2);
 
         var menu = new GLib.Menu ();
         menu.append (_("New"), "app.new");
diff --git a/src/selectionbar.vala b/src/selectionbar.vala
index 0fa045e..d605cbf 100644
--- a/src/selectionbar.vala
+++ b/src/selectionbar.vala
@@ -1,5 +1,4 @@
 // This file is part of GNOME Boxes. License: LGPLv2+
-using Clutter;
 using Gtk;
 
 [GtkTemplate (ui = "/org/gnome/Boxes/ui/selectionbar.ui")]


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