In order to build this Enlightenment based on lower EFL version, modify some code.

Change-Id: I6ee00a2a42e7c3e6f7f554fada08dedbf975e8cf

diff --git a/configure.ac b/configure.ac
index 952085f2f538472b5629feaf41e09575338e71d2..38f96c7a2466c9106ba06e05ab880924a2a3a128 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -92,7 +92,7 @@ extern char **environ;
 AC_DEFINE(HAVE_ENVIRON, 1, [Have environ var])
     ])
 
-efl_version="1.11"
+efl_version="1.9.3"
 AC_SUBST(efl_version)
 
 AC_CHECK_HEADERS([sys/timerfd.h sys/ptrace.h arpa/inet.h netinet/in.h])

diff --git a/src/bin/e_comp_x.c b/src/bin/e_comp_x.c
index 2c9d37e16ac045a4b20995513226e5f7186e00f2..ff89c993cada1bf0e7d96a52a2d7052a5638236c 100644 (file)
--- a/src/bin/e_comp_x.c
+++ b/src/bin/e_comp_x.c
@@ -4998,7 +4998,8 @@ _e_comp_x_setup(E_Comp *c, Ecore_X_Window root, int w, int h)
         // gl drivers etc. - this addresses a vbox crash bug with vm
         // opengl acceleration
         elm_config_preferred_engine_set("none");
-        elm_config_accel_preference_override_set(EINA_TRUE);
+        /* Comment out this for now, it can be removed if Elementary is updated. */
+        // elm_config_accel_preference_override_set(EINA_TRUE);
         elm_config_all_flush();
         elm_config_save();
      }

diff --git a/src/bin/e_int_menus.c b/src/bin/e_int_menus.c
index 5819ed96f7a56eff8a32426e00db210e33c5295d..db41f7b00836818c3281070bb7b136e3bc3ce22b 100644 (file)
--- a/src/bin/e_int_menus.c
+++ b/src/bin/e_int_menus.c
@@ -801,7 +801,7 @@ _e_int_menus_apps_scan(E_Menu *m, Efreet_Menu *menu)
                   E_Menu *subm;
 
                   subm = e_menu_new();
-                  efreet_menu_ref(entry);
+                  // efreet_menu_ref(entry);
                   e_menu_pre_activate_callback_set(subm,
                                                    _e_int_menus_apps_start,
                                                    entry);
@@ -930,7 +930,7 @@ _e_int_menus_apps_start(void *data, E_Menu *m)
    _e_int_menus_apps_scan(m, menu);
    if (m->pre_activate_cb.func == _e_int_menus_apps_start)
      {
-        efreet_menu_unref(m->pre_activate_cb.data);
+        // efreet_menu_unref(m->pre_activate_cb.data);
         m->pre_activate_cb.func = NULL;
         m->pre_activate_cb.data = NULL;
      }
@@ -951,7 +951,7 @@ _e_int_menus_apps_free_hook2(void *obj)
    // unref the e menu we had pointed to in the pre activate cb */
    if (m->pre_activate_cb.func == _e_int_menus_apps_start)
      {
-        efreet_menu_unref(m->pre_activate_cb.data);
+        // efreet_menu_unref(m->pre_activate_cb.data);
         m->pre_activate_cb.func = NULL;
         m->pre_activate_cb.data = NULL;
      }

diff --git a/src/bin/e_screensaver.c b/src/bin/e_screensaver.c
index e6a479cc42e4a3a2ae281d535923292964eb8ce9..bcf0a4df09ec9cf668a9c9abb2686f263e2a51da 100644 (file)
--- a/src/bin/e_screensaver.c
+++ b/src/bin/e_screensaver.c
@@ -442,7 +442,8 @@ e_screensaver_activate(void)
 #ifndef HAVE_WAYLAND_ONLY
    if (e_comp_get(NULL)->comp_type == E_PIXMAP_TYPE_X)
      {
-        ecore_x_screensaver_activate();
+        NULL;
+        // ecore_x_screensaver_activate();
      }
 #else
 #endif
@@ -454,7 +455,8 @@ e_screensaver_deactivate(void)
 #ifndef HAVE_WAYLAND_ONLY
    if (e_comp_get(NULL)->comp_type == E_PIXMAP_TYPE_X)
      {
-        ecore_x_screensaver_reset();
+        NULL;
+        // ecore_x_screensaver_reset();
      }
 #else
 #endif