Remove EFL-ASSIST dependency

Change-Id: Ifbab6e0dd85ec1fbba11660e091526561d5ee37a

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 38a1a46..0888658 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -13,7 +13,6 @@ pkg_check_modules(live_edje REQUIRED
        widget_service
        elementary
        capi-system-system-settings
-       efl-assist
 )
 
 FOREACH (flag ${live_edje_CFLAGS})

diff --git a/packaging/libwidget_edje.spec b/packaging/libwidget_edje.spec
index 5fc1b4c..5f8595c 100644 (file)
--- a/packaging/libwidget_edje.spec
+++ b/packaging/libwidget_edje.spec
@@ -3,7 +3,7 @@ Summary: EDJE Script loader for the data provider master
 Version: 1.0.0
 Release: 1
 Group: Applications/Core Applications
-License: Flora License, Version 1.1
+License: Flora-1.1
 Source0: %{name}-%{version}.tar.gz
 Source1001: %{name}.manifest
 BuildRequires: cmake, gettext-tools, coreutils
@@ -17,7 +17,6 @@ BuildRequires: pkgconfig(ecore)
 BuildRequires: pkgconfig(elementary)
 BuildRequires: pkgconfig(widget_service)
 BuildRequires: pkgconfig(capi-system-system-settings)
-BuildRequires: pkgconfig(efl-assist)
 
 %description
 Plugin for the data provider master to load the edje scripts

diff --git a/src/script_port.c b/src/script_port.c
index b4ddae3..969cb1b 100644 (file)
--- a/src/script_port.c
+++ b/src/script_port.c
@@ -29,7 +29,9 @@
 #include <Ecore.h>
 #include <Ecore_Evas.h>
 #include <Eet.h>
+#if defined(ENABLE_EFL_ASSIST)
 #include <efl_assist.h>
+#endif
 
 #include <system_settings.h>
 
@@ -686,14 +688,13 @@ out:
 
 static inline void apply_shadow_effect(struct image_option *img_opt, Evas_Object *img)
 {
-       return;
-       /*
-       ea_effect_h *ea_effect;
-
        if (!img_opt->shadow.enabled) {
                return;
        }
 
+#if defined(ENABLE_EFL_ASSIST)
+       ea_effect_h *ea_effect;
+
        ea_effect = ea_image_effect_create();
        if (!ea_effect) {
                return;
@@ -704,7 +705,7 @@ static inline void apply_shadow_effect(struct image_option *img_opt, Evas_Object
        ea_object_image_effect_set(img, ea_effect);
 
        ea_image_effect_destroy(ea_effect);
-       */
+#endif
 }
 
 static Evas_Object *crop_image(Evas_Object *img, const char *path, int part_w, int part_h, int w, int h, struct image_option *img_opt)
@@ -2020,10 +2021,7 @@ static void font_changed_cb(keynode_t *node, void *user_data)
 {
        char *font_name;
 
-       /**
-        * @FIXME
-       evas_font_reinit();
-       */
+//     evas_font_reinit();
 
        if (s_info.font_name) {
                font_name = vconf_get_str("db/setting/accessibility/font_name");