[EGIT] [core/efl] master 01/01: evlog - fix "remove setting stack var to 0" that broke evlogs

2017-02-01 Thread Carsten Haitzler 
raster pushed a commit to branch master.

http://git.enlightenment.org/core/efl.git/commit/?id=1b53925b4c2e210972eb24882a5ab5b04effa9af

commit 1b53925b4c2e210972eb24882a5ab5b04effa9af
Author: Carsten Haitzler (Rasterman) 
Date:   Thu Feb 2 10:13:24 2017 +0900

evlog - fix "remove setting stack var to 0" that broke evlogs

this fixes b38c610c7e60cbdcb45fd6d27450e39e3a9c9dd1 - recent commit by
me. bad me! spank!
---
 src/lib/eina/eina_evlog.c | 35 +--
 1 file changed, 17 insertions(+), 18 deletions(-)

diff --git a/src/lib/eina/eina_evlog.c b/src/lib/eina/eina_evlog.c
index 359badb..8c06857 100644
--- a/src/lib/eina/eina_evlog.c
+++ b/src/lib/eina/eina_evlog.c
@@ -128,35 +128,34 @@ EAPI void
 eina_evlog(const char *event, void *obj, double srctime, const char *detail)
 {
Eina_Evlog_Item *item;
-   int size;
char *strings;
double now;
+   int size;
unsigned short detail_offset, event_size;
 
if (!_evlog_go) return;
-
-   now= get_time();
-   event_size = strlen(event) + 1;
-   size   = sizeof(Eina_Evlog_Item) + event_size;
+   now = get_time();
+   event_size  = strlen(event) + 1;
+   size= sizeof(Eina_Evlog_Item) + event_size;
+   detail_offset   = 0;
if (detail)
  {
 detail_offset  = size;
 size  += strlen(detail) + 1;
  }
-   else detail_offset  = 0;
-   size = sizeof(double) * ((size + sizeof(double) - 1) / sizeof(double));
-
+   size= sizeof(double) * ((size + sizeof(double) - 1)
+   / sizeof(double));
eina_spinlock_take(&_evlog_lock);
-   strings  = push_buf(buf, size);
-   item = (Eina_Evlog_Item *)strings;
-   item->tim= now;
-   item->srctim = srctime;
-   item->thread = (unsigned long long)pthread_self();
-   item->obj= (unsigned long long)obj;
-   item->event_offset   = sizeof(Eina_Evlog_Item);
-   item->detail_offset  = detail_offset;
-   item->event_next = size;
-   strcpy(strings + size, event);
+   strings = push_buf(buf, size);
+   item= (Eina_Evlog_Item *)strings;
+   item->tim   = now;
+   item->srctim= srctime;
+   item->thread= (unsigned long long)pthread_self();
+   item->obj   = (unsigned long long)obj;
+   item->event_offset  = sizeof(Eina_Evlog_Item);
+   item->detail_offset = detail_offset;
+   item->event_next= size;
+   strcpy(strings + sizeof(Eina_Evlog_Item), event);
if (detail_offset > 0) strcpy(strings + detail_offset, detail);
eina_spinlock_release(&_evlog_lock);
 }

--

[EGIT] [tools/enventor] master 01/01: goto: fix scroll issue

2017-02-01 Thread YeongJong Lee 
jaehyun pushed a commit to branch master.

http://git.enlightenment.org/tools/enventor.git/commit/?id=324454b3cb0da9f9e4344202276b062b3dc45f4c

commit 324454b3cb0da9f9e4344202276b062b3dc45f4c
Author: YeongJong Lee 
Date:   Thu Feb 2 10:44:01 2017 +0900

goto: fix scroll issue

Summary:
Add scroller_region_show method.

fix https://phab.enlightenment.org/T4416

Test Plan:
1. Run enventor
2. Open goto window using shortcut key( + )
3. type line number
4. check the scroller scroll correctly

Reviewers: Jaehyun_Cho, Hermet

Reviewed By: Jaehyun_Cho

Differential Revision: https://phab.enlightenment.org/D4619
---
 src/lib/edc_editor.c | 4 
 1 file changed, 4 insertions(+)

diff --git a/src/lib/edc_editor.c b/src/lib/edc_editor.c
index 1d5ffa0..1a74373 100644
--- a/src/lib/edc_editor.c
+++ b/src/lib/edc_editor.c
@@ -1659,10 +1659,14 @@ edit_max_line_get(edit_data *ed)
 void
 edit_goto(edit_data *ed, int line)
 {
+   int cursor_y;
+
elm_entry_select_none(ed->en_edit);
Evas_Object *tb = elm_entry_textblock_get(ed->en_edit);
Evas_Textblock_Cursor *cur = evas_object_textblock_cursor_get(tb);
evas_textblock_cursor_line_set(cur, (line - 1));
+   elm_entry_cursor_geometry_get(ed->en_edit, NULL, _y, NULL, NULL);
+   elm_scroller_region_show(ed->scroller, 0, cursor_y, 0, 0);
elm_entry_calc_force(ed->en_edit);
elm_object_focus_set(ed->en_edit, EINA_TRUE);
 }

--

[EGIT] [core/efl] master 01/01: evas grid smart - fix divide by 0

2017-02-01 Thread Carsten Haitzler 
raster pushed a commit to branch master.

http://git.enlightenment.org/core/efl.git/commit/?id=3cb947d1a5202d4ca6f56d1d38b0d3a2cda05ce8

commit 3cb947d1a5202d4ca6f56d1d38b0d3a2cda05ce8
Author: Carsten Haitzler (Rasterman) 
Date:   Thu Feb 2 08:50:11 2017 +0900

evas grid smart - fix divide by 0

if object happens to be 0x0 then we can get a divide by 0... fix!

@fix
---
 src/lib/evas/canvas/evas_object_grid.c | 30 +++---
 1 file changed, 23 insertions(+), 7 deletions(-)

diff --git a/src/lib/evas/canvas/evas_object_grid.c 
b/src/lib/evas/canvas/evas_object_grid.c
index 12e5b47..9d44aa6 100644
--- a/src/lib/evas/canvas/evas_object_grid.c
+++ b/src/lib/evas/canvas/evas_object_grid.c
@@ -229,18 +229,34 @@ _evas_object_grid_smart_calculate(Evas_Object *o)
  {
 long long x1, y1, x2, y2;
 
-if (!mirror)
+if (vwl > 0)
   {
- x1 = xl + ((wl * (long long)opt->x) / vwl);
- x2 = xl + ((wl * (long long)(opt->x + opt->w)) / vwl);
+ if (!mirror)
+   {
+  x1 = xl + ((wl * (long long)opt->x) / vwl);
+  x2 = xl + ((wl * (long long)(opt->x + opt->w)) / vwl);
+   }
+ else
+   {
+  x1 = xl + ((wl * (vwl - (long long)(opt->x + opt->w))) / 
vwl);
+  x2 = xl + ((wl * (vwl - (long long)opt->x)) / vwl);
+   }
   }
 else
   {
- x1 = xl + ((wl * (vwl - (long long)(opt->x + opt->w))) / vwl);
- x2 = xl + ((wl * (vwl - (long long)opt->x)) / vwl);
+ x1 = xl;
+ x2 = xl;
+  }
+if (vhl > 0)
+  {
+ y1 = yl + ((hl * (long long)opt->y) / vhl);
+ y2 = yl + ((hl * (long long)(opt->y + opt->h)) / vhl);
+  }
+else
+  {
+ y1 = yl;
+ y2 = yl;
   }
-y1 = yl + ((hl * (long long)opt->y) / vhl);
-y2 = yl + ((hl * (long long)(opt->y + opt->h)) / vhl);
 evas_object_move(opt->obj, x1, y1);
 evas_object_resize(opt->obj, x2 - x1, y2 - y1);
  }

--

[EGIT] [core/efl] master 01/01: ecore_wl2: Make www events opt-in

2017-02-01 Thread Derek Foreman 
derekf pushed a commit to branch master.

http://git.enlightenment.org/core/efl.git/commit/?id=5097ba893bc6c643c5e705c4c3ae5ecf2a343ba5

commit 5097ba893bc6c643c5e705c4c3ae5ecf2a343ba5
Author: Derek Foreman 
Date:   Wed Feb 1 16:21:34 2017 -0600

ecore_wl2: Make www events opt-in

Now we must set EFL_WAYLAND_ENABLE_WWW to turn on www.  (Note:
this does NOT re-enable any visual effect, it merely controls
the event infrastructure that can be used to let a client
know when its window is mapped or moving)

This wasn't really disabled properly earlier, so disable it now
for a slight performance win when dragging windows (and a major
reduction in log chatter when debugging wayland)
---
 src/lib/ecore_wl2/ecore_wl2_display.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/lib/ecore_wl2/ecore_wl2_display.c 
b/src/lib/ecore_wl2/ecore_wl2_display.c
index c2fc38d..b469e4c 100644
--- a/src/lib/ecore_wl2/ecore_wl2_display.c
+++ b/src/lib/ecore_wl2/ecore_wl2_display.c
@@ -187,7 +187,7 @@ _cb_global_add(void *data, struct wl_registry *registry, 
unsigned int id, const
&_zxdg_shell_listener, NULL);
  }
else if ((eina_streq(interface, "www")) &&
-(!getenv("EFL_WAYLAND_DISABLE_WWW")))
+(getenv("EFL_WAYLAND_ENABLE_WWW")))
  {
 Ecore_Wl2_Window *window;
 

--

[E-devel] Get Icon File Path using EFL and Python?

2017-02-01 Thread Jeff Hoogland 
Is it possible to return the file path / an elm image object for a given
application name in the current icon set using the python libraries?
Currently I am importing GTK to accomplish this because I could not find
anything about it in the py-efl docs.

-- 
~Jeff Hoogland 
My Projects on GitHub 
--
Check out the vibrant tech community on one of the world's most
engaging tech sites, SlashDot.org! http://sdm.link/slashdot
___
enlightenment-devel mailing list
enlightenment-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-devel

[EGIT] [apps/extra] master 03/03: extra: lets be a bit more secure

2017-02-01 Thread Marcel Hollerbach 
bu5hm4n pushed a commit to branch master.

http://git.enlightenment.org/apps/extra.git/commit/?id=6cda8109030c506f464ed5dc41a4c88e23644ab1

commit 6cda8109030c506f464ed5dc41a4c88e23644ab1
Author: Marcel Hollerbach 
Date:   Tue Jan 31 21:06:59 2017 +0100

extra: lets be a bit more secure
---
 src/lib/extra.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/lib/extra.c b/src/lib/extra.c
index bd0b771..0dab25b 100644
--- a/src/lib/extra.c
+++ b/src/lib/extra.c
@@ -64,7 +64,7 @@ _fill_themes(Eina_Strbuf *buf)
 
 versionNumb = atoi(eina_strbuf_string_get(obj->version));
 
-theme = malloc(sizeof(*theme));
+theme = calloc(1, sizeof(*theme));
 theme->theme.id = sec_strdup(obj->id);
 theme->theme.name = sec_strdup(obj->name);
 theme->theme.author = sec_strdup(obj->author);

--

[EGIT] [apps/extra] master 02/03: extra: stop spreading error messages about progressbars

2017-02-01 Thread Marcel Hollerbach 
bu5hm4n pushed a commit to branch master.

http://git.enlightenment.org/apps/extra.git/commit/?id=2dfd1b47338d44fb1aa86a36008b8ff7886f289a

commit 2dfd1b47338d44fb1aa86a36008b8ff7886f289a
Author: Marcel Hollerbach 
Date:   Tue Jan 31 21:03:48 2017 +0100

extra: stop spreading error messages about progressbars

this is done by stopping emitting the progress callbacks.
---
 src/bin/extra_private.h|  2 +-
 src/bin/extra_util.c   | 16 +-
 src/lib/extra.c| 78 +++---
 src/lib/extra.h| 11 ---
 src/lib/extra_api_helper.c | 30 +-
 src/lib/extra_private.h|  7 -
 6 files changed, 105 insertions(+), 39 deletions(-)

diff --git a/src/bin/extra_private.h b/src/bin/extra_private.h
index 5869ca3..4e52522 100644
--- a/src/bin/extra_private.h
+++ b/src/bin/extra_private.h
@@ -19,7 +19,7 @@ void extra_ui_theme_ask_for_default(Extra_Theme 
*theme);
 Extra_Progress* extra_ui_progress_popup_show(const char *title, Extra_Done_Cb 
done, void *data);
 
 typedef char *(Extra_ui_preview_get)(void *obj);
-typedef char *(Extra_ui_preview_download)(Extra_Progress *progress, void *obj);
+typedef Extra_Request *(Extra_ui_preview_download)(Extra_Progress *progress, 
void *obj);
 
 typedef struct {
 Extra_ui_preview_get *preview_get;
diff --git a/src/bin/extra_util.c b/src/bin/extra_util.c
index 5c6a1d0..c6a90a6 100644
--- a/src/bin/extra_util.c
+++ b/src/bin/extra_util.c
@@ -136,6 +136,7 @@ typedef struct {
 Extra_Progress p;
 void *data;
 Extra_Ui_Small_Preview_Accessor acc;
+Extra_Request *req;
 } Small_Preview;
 
 static void
@@ -166,6 +167,18 @@ _small_preview_done_cb(void *data)
evas_object_hide(p->progress);
 }
 
+static void
+_small_preview_deleted(void *data, Evas *e EINA_UNUSED, Evas_Object *obj 
EINA_UNUSED, void *event_info EINA_UNUSED)
+{
+   Small_Preview *small;
+
+   small = data;
+
+   extra_request_mute(small->req);
+
+   free(small);
+}
+
 Evas_Object*
 extra_ui_small_preview_new(Extra_Ui_Small_Preview_Accessor acc, Evas_Object 
*par, void *data)
 {
@@ -178,6 +191,7 @@ extra_ui_small_preview_new(Extra_Ui_Small_Preview_Accessor 
acc, Evas_Object *par
small->acc = acc;
small->data = data;
table = elm_table_add(par);
+   evas_object_event_callback_add(table, EVAS_CALLBACK_DEL, 
_small_preview_deleted, small);
evas_object_size_hint_weight_set(table, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
evas_object_size_hint_align_set(table, EVAS_HINT_FILL, EVAS_HINT_FILL);
evas_object_show(table);
@@ -216,7 +230,7 @@ extra_ui_small_preview_new(Extra_Ui_Small_Preview_Accessor 
acc, Evas_Object *par
 small->p.data = small;
 small->p.done_cb = _small_preview_done_cb;
 small->p.progress_cb = _small_preview_progress_cb;
-acc.preview_download(>p, data);
+small->req = acc.preview_download(>p, data);
 evas_object_hide(small->image);
 evas_object_show(small->progress);
  }
diff --git a/src/lib/extra.c b/src/lib/extra.c
index 337a031..bd0b771 100644
--- a/src/lib/extra.c
+++ b/src/lib/extra.c
@@ -27,8 +27,8 @@ void _extra_theme_cache_load();
 
 typedef struct {
   Extra_Theme theme;
-  char preview_state; //indicates if some downloads are in progress
-  char main_state; //indicates if some downloads are in progress
+  Extra_Request *preview;
+  Extra_Request *main;
 } Extra_Theme_Private;
 
 typedef struct {
@@ -84,8 +84,8 @@ _fill_themes(Eina_Strbuf *buf)
 
 typedef struct {
   Extra_Background background;
-  char preview_state; //indicates if some downloads are in progress
-  char main_state; //indicates if some downloads are in progress
+  Extra_Request *preview;
+  Extra_Request *main;
 } Extra_Background_Private;
 
 typedef struct {
@@ -395,7 +395,7 @@ extra_theme_preview_get(Extra_Theme *theme)
Extra_Theme_Private *priv = ((Extra_Theme_Private*) theme);
 
//download is in progress do not return the path
-   if (priv->preview_state & EXTRA_STATE_DOWNLOAD_IN_PROGRESS) return NULL;
+   if (priv->preview) return NULL;
 
local = _extra_preview_local_generate("themes", theme->id, theme->version);
if (!ecore_file_exists(local))
@@ -407,19 +407,26 @@ extra_theme_preview_get(Extra_Theme *theme)
return local;
 }
 
-EAPI void
+EAPI Extra_Request*
 extra_theme_preview_download(Extra_Progress *progress, Extra_Theme *theme)
 {
char *remote, *dst;
Extra_Theme_Private *priv = ((Extra_Theme_Private*) theme);
 
+   if (priv->preview)
+ {
+priv->preview->progress = *progress;
+ }
+
remote = _extra_preview_remote_generate("themes", theme->id);
dst = _extra_preview_local_generate("themes", theme->id, theme->version);
 
-   extra_file_download(progress, remote, dst, >preview_state);
+   extra_file_download(progress, remote, dst, >preview);
 
free(remote);
free(dst);
+
+   return priv->preview;
 }
 
 EAPI char *
@@ -440,22 +447,30 @@

[EGIT] [apps/extra] master 01/03: extra: if a image cannot be set delete the file and redownload it

2017-02-01 Thread Marcel Hollerbach 
bu5hm4n pushed a commit to branch master.

http://git.enlightenment.org/apps/extra.git/commit/?id=c32bfdb14494643ed2cb09ff2b2087c7b8228173

commit c32bfdb14494643ed2cb09ff2b2087c7b8228173
Author: Marcel Hollerbach 
Date:   Tue Jan 31 20:18:05 2017 +0100

extra: if a image cannot be set delete the file and redownload it

this should fix cases where people dont see complete images because they
are corrupted. For example because the app was closed when then image
was not fully downloaded.
---
 src/bin/extra_util.c | 21 +
 1 file changed, 17 insertions(+), 4 deletions(-)

diff --git a/src/bin/extra_util.c b/src/bin/extra_util.c
index 7753b7c..5c6a1d0 100644
--- a/src/bin/extra_util.c
+++ b/src/bin/extra_util.c
@@ -155,7 +155,11 @@ _small_preview_done_cb(void *data)
preview = p->acc.preview_get(p->data);
if (preview)
  {
-elm_image_file_set(p->image , preview, NULL);
+if (!elm_image_file_set(p->image , preview, NULL))
+  {
+ //the download failed, do nothing here, we likly will run into 
the same problem. And we should not spam our download requests
+ ecore_file_remove(preview);
+  }
 evas_object_show(p->image);
 free(preview);
  }
@@ -195,10 +199,19 @@ 
extra_ui_small_preview_new(Extra_Ui_Small_Preview_Accessor acc, Evas_Object *par
preview = acc.preview_get(data);
if (preview)
  {
-elm_image_file_set(small->image, preview, NULL);
-free(preview);
+if (!elm_image_file_set(small->image, preview, NULL))
+  {
+ ecore_file_remove(preview);
+ free(preview);
+ preview = NULL;
+  }
+else
+  {
+ free(preview);
+  }
  }
-   else
+
+   if (!preview)
  {
 small->p.data = small;
 small->p.done_cb = _small_preview_done_cb;

--

[EGIT] [core/efl] master 02/02: edje: change seat signals

2017-02-01 Thread Bruno Dilly 
bdilly pushed a commit to branch master.

http://git.enlightenment.org/core/efl.git/commit/?id=b251e1a4ac5ddc73c085064431982f6baa909443

commit b251e1a4ac5ddc73c085064431982f6baa909443
Author: Bruno Dilly 
Date:   Wed Feb 1 17:14:39 2017 -0200

edje: change seat signals

Use seat names as prefix, not as suffix, following
a top-down approach and avoiding issues
with applications that may be receiving
doubled signals (legacy + suffixed).

So instead of "mouse,in,seat1" signal will be
"seat,seat1,mouse,in".
---
 src/examples/edje/dynamic_multiseat.edc  |  9 ++--
 src/examples/edje/multiseat.edc  | 64 ++--
 src/examples/edje/multiseat_custom_names.edc |  8 ++--
 src/examples/edje/multiseat_filter.edc   | 34 +--
 src/lib/edje/edje_program.c  |  4 +-
 5 files changed, 65 insertions(+), 54 deletions(-)

diff --git a/src/examples/edje/dynamic_multiseat.edc 
b/src/examples/edje/dynamic_multiseat.edc
index d512f03..eacdcb5 100644
--- a/src/examples/edje/dynamic_multiseat.edc
+++ b/src/examples/edje/dynamic_multiseat.edc
@@ -244,7 +244,8 @@ collections {
 
strncpy(seat_name, sig[strlen("seat,added,")],
strchr(sig[strlen("seat,added,")], ","));
-   snprintf(buf, 128, "seat,color,%s,r=%i,g=%i,b=%i", seat_name,
+   snprintf(buf, sizeof(buf),
+"seat,color,%s,r=%i,g=%i,b=%i", seat_name,
 r, g, b);
emit(buf, "theme");
 }
@@ -252,12 +253,12 @@ collections {
 
  program {
 name: "button,in";
-signal: "mouse,in,*";
+signal: "seat,*,mouse,in";
 source: "button_bg,*";
 script {
new idx, r, g, b;
 
-   idx = atoi(sig[strlen("mouse,in,seat")]) - 1;
+   idx = atoi(sig[strlen("seat,seat")]) - 1;
r = fetch_int(red, idx);
g = fetch_int(green, idx);
b = fetch_int(blue, idx);
@@ -268,7 +269,7 @@ collections {
 
  program {
 name: "button,out";
-signal: "mouse,out,*";
+signal: "seat,*,mouse,out";
 source: "button_bg,*";
 script {
set_color_class(src, 200, 200, 200, 255);
diff --git a/src/examples/edje/multiseat.edc b/src/examples/edje/multiseat.edc
index ce1779b..5738ec9 100644
--- a/src/examples/edje/multiseat.edc
+++ b/src/examples/edje/multiseat.edc
@@ -469,7 +469,7 @@ collections {
 
  program {
 name: "focus,t1,s1";
-signal: "mouse,clicked,1,seat1";
+signal: "seat,seat1,mouse,clicked,1";
 source: "example/text1";
 action: FOCUS_SET "seat1";
 target: "example/text1";
@@ -477,7 +477,7 @@ collections {
 
  program {
 name: "focus,color,t1,s1";
-signal: "focus,part,in,seat1";
+signal: "seat,seat1,focus,part,in";
 source: "example/text1";
 action: STATE_SET "focused,s1" 0.0;
 target: "bg_text1";
@@ -485,7 +485,7 @@ collections {
 
  program {
 name: "unfocus,color,t1,s1";
-signal: "focus,part,out,seat1";
+signal: "seat,seat1,focus,part,out";
 source: "example/text1";
 action: STATE_SET "default" 0.0;
 target: "bg_text1";
@@ -493,7 +493,7 @@ collections {
 
  program {
 name: "focus,t2,s1";
-signal: "mouse,clicked,1,seat1";
+signal: "seat,seat1,mouse,clicked,1";
 source: "example/text2";
 action: FOCUS_SET "seat1";
 target: "example/text2";
@@ -501,7 +501,7 @@ collections {
 
  program {
 name: "focus,color,t2,s1";
-signal: "focus,part,in,seat1";
+signal: "seat,seat1,focus,part,in";
 source: "example/text2";
 action: STATE_SET "focused,s1" 0.0;
 target: "bg_text2";
@@ -509,7 +509,7 @@ collections {
 
  program {
 name: "unfocus,color,t2,s1";
-signal: "focus,part,out,seat1";
+signal: "seat,seat1,focus,part,out";
 source: "example/text2";
 action: STATE_SET "default" 0.0;
 target: "bg_text2";
@@ -517,7 +517,7 @@ collections {
 
  program {
 name: "focus,t1,s2";
-signal: "mouse,clicked,1,seat2";
+signal: "seat,seat2,mouse,clicked,1";
 source: "example/text1";
 action: FOCUS_SET "seat2";
 target: "example/text1";
@@ -525,7 +525,7 @@ collections {
 
  program {
 name: "focus,color,t1,s2";
-signal: "focus,part,in,seat2";
+signal: "seat,seat2,focus,part,in";
 source: "example/text1";
 action: STATE_SET "focused,s2" 0.0;

[EGIT] [core/efl] master 01/02: edje: fix CID 1368019 - Null pointer dereferences

2017-02-01 Thread Bruno Dilly 
bdilly pushed a commit to branch master.

http://git.enlightenment.org/core/efl.git/commit/?id=9893c6d91afb3b2b71d869f4852fbd217d87b6aa

commit 9893c6d91afb3b2b71d869f4852fbd217d87b6aa
Author: Bruno Dilly 
Date:   Thu Jan 26 18:26:23 2017 -0200

edje: fix CID 1368019 - Null pointer dereferences

It only should check if it's allowed to focus a part
if a part was passed (if rp is null such check should
be skipped).
---
 src/lib/edje/edje_program.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/lib/edje/edje_program.c b/src/lib/edje/edje_program.c
index aac74b2..cc3ae96 100644
--- a/src/lib/edje/edje_program.c
+++ b/src/lib/edje/edje_program.c
@@ -662,7 +662,7 @@ _edje_part_focus_set(Edje *ed, const char *seat_name, 
Edje_Real_Part *rp)
 
if (focused_part != rp)
  {
-if ((rp->part->allowed_seats) &&
+if (rp && (rp->part->allowed_seats) &&
 (!_edje_part_allowed_seat_find(rp, sname)))
   goto not_allowed;
 

--

[EGIT] [core/efl] master 01/01: efl_net_dialer_http: check for finished handles after unpause.

2017-02-01 Thread Gustavo Sverzut Barbieri 
barbieri pushed a commit to branch master.

http://git.enlightenment.org/core/efl.git/commit/?id=0293c360ebae28f2bad993982dc24e87ac296781

commit 0293c360ebae28f2bad993982dc24e87ac296781
Author: Gustavo Sverzut Barbieri 
Date:   Wed Feb 1 16:23:11 2017 -0200

efl_net_dialer_http: check for finished handles after unpause.

After we call curl_multi_socket_action() we must call
_efl_net_dialer_http_curlm_check() in order to call
curl_multi_info_read() and be notified of handles that were
finished. Otherwise the handle is gone and we'll be waiting for an
action that will never happen.

Fixes T5079
---
 src/lib/ecore_con/efl_net_dialer_http.c | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/lib/ecore_con/efl_net_dialer_http.c 
b/src/lib/ecore_con/efl_net_dialer_http.c
index b5fe3e4..2454c72 100644
--- a/src/lib/ecore_con/efl_net_dialer_http.c
+++ b/src/lib/ecore_con/efl_net_dialer_http.c
@@ -1549,6 +1549,8 @@ _efl_net_dialer_http_pause_reset(Eo *o, 
Efl_Net_Dialer_Http_Data *pd)
 return err;
  }
 
+   _efl_net_dialer_http_curlm_check(pd->cm);
+
return 0;
 }
 

--

[EGIT] [core/efl] master 01/01: build: Fix screw up with wayland header auto generation

2017-02-01 Thread Derek Foreman 
derekf pushed a commit to branch master.

http://git.enlightenment.org/core/efl.git/commit/?id=2215dd89012d8075fdf028e8d95dfd3990b99a93

commit 2215dd89012d8075fdf028e8d95dfd3990b99a93
Author: Derek Foreman 
Date:   Wed Feb 1 11:29:40 2017 -0600

build: Fix screw up with wayland header auto generation
---
 src/Makefile_Ecore_IMF.am |  4 +++-
 src/Makefile_Ecore_Wl2.am | 22 --
 src/Makefile_Evas.am  |  7 ++-
 3 files changed, 21 insertions(+), 12 deletions(-)

diff --git a/src/Makefile_Ecore_IMF.am b/src/Makefile_Ecore_IMF.am
index 5a07d60..8b9c9e9 100644
--- a/src/Makefile_Ecore_IMF.am
+++ b/src/Makefile_Ecore_IMF.am
@@ -133,7 +133,9 @@ $(install_ecoreimfwaylandpkgLTLIBRARIES): 
install-libLTLIBRARIES
 modules_ecore_imf_wayland_module_la_SOURCES = \
 modules/ecore_imf/wayland/wayland_module.c \
 modules/ecore_imf/wayland/wayland_imcontext.c \
-modules/ecore_imf/wayland/wayland_imcontext.h \
+modules/ecore_imf/wayland/wayland_imcontext.h
+
+nodist_modules_ecore_imf_wayland_module_la_SOURCES = \
 modules/ecore_imf/wayland/text-input-unstable-v1-client-protocol.h \
 modules/ecore_imf/wayland/text-input-unstable-v1-protocol.c
 
diff --git a/src/Makefile_Ecore_Wl2.am b/src/Makefile_Ecore_Wl2.am
index 7e0789f..bf05033 100644
--- a/src/Makefile_Ecore_Wl2.am
+++ b/src/Makefile_Ecore_Wl2.am
@@ -8,6 +8,17 @@ installed_ecorewl2mainheadersdir = 
$(includedir)/ecore-wl2-@VMAJ@
 dist_installed_ecorewl2mainheaders_DATA = lib/ecore_wl2/Ecore_Wl2.h
 
 lib_ecore_wl2_libecore_wl2_la_SOURCES = \
+lib/ecore_wl2/ecore_wl2_seat.c \
+lib/ecore_wl2/ecore_wl2_subsurf.c \
+lib/ecore_wl2/ecore_wl2_dnd.c \
+lib/ecore_wl2/ecore_wl2_window.c \
+lib/ecore_wl2/ecore_wl2_input.c \
+lib/ecore_wl2/ecore_wl2_output.c \
+lib/ecore_wl2/ecore_wl2_display.c \
+lib/ecore_wl2/ecore_wl2.c \
+lib/ecore_wl2/ecore_wl2_private.h
+
+nodist_lib_ecore_wl2_libecore_wl2_la_SOURCES = \
 lib/ecore_wl2/teamwork-protocol.c \
 lib/ecore_wl2/teamwork-client-protocol.h \
 lib/ecore_wl2/session-recovery-client-protocol.h \
@@ -19,16 +30,7 @@ lib/ecore_wl2/www-protocol.c \
 lib/ecore_wl2/linux-dmabuf-unstable-v1-protocol.c \
 lib/ecore_wl2/linux-dmabuf-unstable-v1-client-protocol.h \
 lib/ecore_wl2/xdg-shell-unstable-v6-client-protocol.h \
-lib/ecore_wl2/xdg-shell-unstable-v6-protocol.c \
-lib/ecore_wl2/ecore_wl2_seat.c \
-lib/ecore_wl2/ecore_wl2_subsurf.c \
-lib/ecore_wl2/ecore_wl2_dnd.c \
-lib/ecore_wl2/ecore_wl2_window.c \
-lib/ecore_wl2/ecore_wl2_input.c \
-lib/ecore_wl2/ecore_wl2_output.c \
-lib/ecore_wl2/ecore_wl2_display.c \
-lib/ecore_wl2/ecore_wl2.c \
-lib/ecore_wl2/ecore_wl2_private.h
+lib/ecore_wl2/xdg-shell-unstable-v6-protocol.c
 
 lib_ecore_wl2_libecore_wl2_la_CPPFLAGS = -I$(top_builddir)/src/lib/efl 
@ECORE_WL2_CFLAGS@
 lib_ecore_wl2_libecore_wl2_la_LIBADD = @ECORE_WL2_LIBS@
diff --git a/src/Makefile_Evas.am b/src/Makefile_Evas.am
index 2f58d5f..b2f4885 100644
--- a/src/Makefile_Evas.am
+++ b/src/Makefile_Evas.am
@@ -1235,7 +1235,6 @@ modules/evas/engines/wayland_shm/evas_engine.c \
 modules/evas/engines/wayland_shm/evas_engine.h \
 modules/evas/engines/wayland_shm/evas_shm.c \
 modules/evas/engines/wayland_shm/evas_dmabuf.c \
-lib/ecore_wl2/linux-dmabuf-unstable-v1-protocol.c \
 modules/evas/engines/wayland_shm/evas_outbuf.c \
 static_libs/libdrm/drm_fourcc.h \
 static_libs/libdrm/drm.h \
@@ -1245,7 +1244,12 @@ static_libs/libdrm/exynos_drmif.h \
 static_libs/libdrm/i915_drm.h \
 static_libs/libdrm/intel_bufmgr.h \
 static_libs/libdrm/LICENSE
+
+NODIST_WAYLAND_SHM_SOURCES = \
+lib/ecore_wl2/linux-dmabuf-unstable-v1-protocol.c
+
 if EVAS_STATIC_BUILD_WAYLAND_SHM
+nodist_lib_evas_libevas_la_SOURCES = $(NODIST_WAYLAND_SHM_SOURCES)
 lib_evas_libevas_la_SOURCES += $(WAYLAND_SHM_SOURCES)
 lib_evas_libevas_la_CPPFLAGS += @evas_engine_wayland_shm_cflags@ \
 -I$(top_srcdir)/src/static_libs/libdrm
@@ -1259,6 +1263,7 @@ enginewaylandshmpkg_LTLIBRARIES = 
modules/evas/engines/wayland_shm/module.la
 install_enginewaylandshmpkgLTLIBRARIES = install-enginewaylandshmpkgLTLIBRARIES
 $(install_enginewaylandshmpkgLTLIBRARIES): install-libLTLIBRARIES
 
+nodist_modules_evas_engines_wayland_shm_module_la_SOURCES = 
$(NODIST_WAYLAND_SHM_SOURCES)
 modules_evas_engines_wayland_shm_module_la_SOURCES = $(WAYLAND_SHM_SOURCES)
 modules_evas_engines_wayland_shm_module_la_CPPFLAGS = 
-I$(top_builddir)/src/lib/efl \
 -I$(top_srcdir)/src/lib/evas/include \

--

Re: [E-devel] [EGIT] [core/efl] master 01/01: cmake: remove dependency on libjpeg in eet as it is handled in common

2017-02-01 Thread Gustavo Sverzut Barbieri 
On Wed, Feb 1, 2017 at 12:42 PM, Stefan Schmidt  wrote:
> Hello.
>
> On 01/02/17 15:31, Gustavo Sverzut Barbieri wrote:
>> On Wed, Feb 1, 2017 at 11:47 AM, Stefan Schmidt  
>> wrote:
>>> Hello.
>>>
>>> On 01/02/17 14:39, Gustavo Sverzut Barbieri wrote:
 On Wed, Feb 1, 2017 at 11:24 AM, Stefan Schmidt
  wrote:
> stefan pushed a commit to branch master.
>
> http://git.enlightenment.org/core/efl.git/commit/?id=592f356fe5cc64ac6e790d2014edfd11dcfc17a5
>
> commit 592f356fe5cc64ac6e790d2014edfd11dcfc17a5
> Author: Stefan Schmidt 
> Date:   Wed Feb 1 14:22:11 2017 +0100
>
> cmake: remove dependency on libjpeg in eet as it is handled in common
> ---
>  src/lib/eet/CMakeLists.txt | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/src/lib/eet/CMakeLists.txt b/src/lib/eet/CMakeLists.txt
> index 813f293..76b71a4 100644
> --- a/src/lib/eet/CMakeLists.txt
> +++ b/src/lib/eet/CMakeLists.txt
> @@ -2,7 +2,7 @@ set(DESCRIPTION "Library for speedy data storage, 
> retrieval, and compression")
>
>  set(PKG_CONFIG_REQUIRES_PRIVATE
>zlib>=1.2.3
> -  libjpeg
> +  #libjpeg is hard to find. there is a cmake module that does find it. 
> and thats checked in common.cmake
>  )

 You got this wrong, this is not just to check, it's to use. Now you'll
 have cmake build of eet with undefined symbols.

 This is also used to generate .pc files, see my other email.
>>>
>>> Fair enough. I actually try to understand the cmake stuff at all right
>>> now and trying it out. Pretty likely my fixes are off here.
>>>
>>> And indeed I run into missing symbols now (emile not eet in this case)
>>
>> ok, fixed in master, now we process LIBRARIES and look for "find-XXX",
>> in that case replace with XXX_LIBRARIES and also add include
>> directories.
>
> Thanks. After your change I can now fully build what we have covered
> with cmake.
>
>> Now I'm wondering if we remove special PKG_CONFIG_REQUIRES variable
>> and use LIBRARIES with some "pkgconfig-XXX"... what do you think?
>
> Not sure really if I have an opinion on that just now. I will need to
> read through all the cmake stuff first. Its the first project I would
> use it with (well besides having build some, but really nothing besides
> calling cmake). It will take me some time to grok this. :)

you can/should ping me or Marcel.

Our idea is to create a standard, a path to be followed by all others
so we make it as automatic as possible.

Traditional usage of CMake is like automake, you use the basics and
specify it all: create a target, set properties... which in our case
can be avoided by using functions/macros to benefit from our file
structure and all libraries trying to follow a pattern of names,
version, installation and so on.

This is where I believe automake is much worse, because we can add m4
macros for autoconf (like many we have in m4/*), but we can't add to
automake, then we replicate a huge configuration for each target and
sometimes we end with inconsistent behavior due copy not being
updated as should.

A second benefit of cmake is to have control of build results, we can
mimic ${prefix}/XXX layout inside build/, this allows eina_prefix to
work and we can remove the cumbersome EFL_RUN_IN_TREE hacks.

-- 
Gustavo Sverzut Barbieri
--
Mobile: +55 (16) 99354-9890

--
Check out the vibrant tech community on one of the world's most
engaging tech sites, SlashDot.org! http://sdm.link/slashdot
___
enlightenment-devel mailing list
enlightenment-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-devel

[EGIT] [tools/eflete] master 02/03: example: add example for test inherit_only attribute

2017-02-01 Thread Vyacheslav Reutskiy 
rimmed pushed a commit to branch master.

http://git.enlightenment.org/tools/eflete.git/commit/?id=9e33ac6134306af49e9dac6ce9a94781519d1d2c

commit 9e33ac6134306af49e9dac6ce9a94781519d1d2c
Author: Vyacheslav Reutskiy 
Date:   Wed Feb 1 14:08:29 2017 +0200

example: add example for test inherit_only attribute

Change-Id: I080283581d93fc2c3bedb89e39fadfde6e406b26
---
 example/example.edc | 5 +
 1 file changed, 5 insertions(+)

diff --git a/example/example.edc b/example/example.edc
index ae2d227..db39f84 100644
--- a/example/example.edc
+++ b/example/example.edc
@@ -638,6 +638,11 @@ group { "test/parts/IMAGE/set";
   }
}
 
+   /* test for inherit_only attribute */
+   group { "inherit_only";
+  inherit_only: 1;
+   }
+
/* group naming */
group { "test/group_names/group"; }
group { "test/group_names/group/"; }

--

[EGIT] [tools/eflete] master 01/03: example: add example with usage fonts

2017-02-01 Thread Vyacheslav Reutskiy 
rimmed pushed a commit to branch master.

http://git.enlightenment.org/tools/eflete.git/commit/?id=cd6ac5f3016fa01a3531044a60f67b1500c217b9

commit cd6ac5f3016fa01a3531044a60f67b1500c217b9
Author: Vyacheslav Reutskiy 
Date:   Fri Jan 27 14:18:05 2017 +0200

example: add example with usage fonts

Change-Id: Ifcf4b435e76dfa6db3637dca8d5e5a17be9493aa
---
 example/compile_and_import_edj.sh |  2 +-
 example/example.edc   | 43 +++
 example/import_edc.sh |  2 +-
 3 files changed, 45 insertions(+), 2 deletions(-)

diff --git a/example/compile_and_import_edj.sh 
b/example/compile_and_import_edj.sh
index 67735ee..61c8b73 100755
--- a/example/compile_and_import_edj.sh
+++ b/example/compile_and_import_edj.sh
@@ -1,4 +1,4 @@
 rm example.edj
 set -e
-edje_cc -id images -sd sounds example.edc
+edje_cc -id images -sd sounds -fd ../data/fonts example.edc
 eflete example.edj
diff --git a/example/example.edc b/example/example.edc
index 4e0d221..ae2d227 100644
--- a/example/example.edc
+++ b/example/example.edc
@@ -15,6 +15,13 @@ styles {
}
 }
 
+fonts {
+   font: "PTS55F.ttf" "PT";
+   font: "PTS75F.ttf" "PT-Bold";
+   font: "PTS56F.ttf" "PT-Italic";
+   font: "PTS76F.ttf" "PT-BoldItalic";
+}
+
 images {
image: "dragons.svg" RAW;
image: "dragons_unused.svg" RAW;
@@ -595,6 +602,42 @@ group { "test/parts/IMAGE/set";
   }
}
 
+   group { name: "test/font";
+  parts {
+ part { name: "normal";
+type: TEXT;
+description {
+   rel2.relative: 1.0 0.25;
+   text { size: 36; font: "PT"; text: "normal"; };
+}
+ }
+ part { name: "bold";
+type: TEXT;
+description {
+   rel1.relative: 0.0 0.25;
+   rel2.relative: 1.0 0.5;
+   text { size: 36; font: "PT-Bold"; text: "bold"; };
+}
+ }
+ part { name: "italian";
+type: TEXT;
+description {
+   rel1.relative: 0.0 0.5;
+   rel2.relative: 1.0 0.75;
+   text { size: 36; font: "PT-Italic"; text: "italic"; };
+}
+ }
+ part { name: "bolditalian";
+type: TEXT;
+description {
+   rel1.relative: 0.0 0.75;
+   rel2.relative: 1.0 1.0;
+   text { size: 36; font: "PT-BoldItalic"; text: "bold italic"; };
+}
+ }
+  }
+   }
+
/* group naming */
group { "test/group_names/group"; }
group { "test/group_names/group/"; }
diff --git a/example/import_edc.sh b/example/import_edc.sh
index 5dc249a..4da952d 100755
--- a/example/import_edc.sh
+++ b/example/import_edc.sh
@@ -1 +1 @@
-eflete --id images --sd sounds example.edc
+eflete --id images --sd sounds --fd ../data/fonts example.edc

--

[EGIT] [tools/eflete] master 03/03: theme: fix extra elipsis for property item

2017-02-01 Thread Vyacheslav Reutskiy 
rimmed pushed a commit to branch master.

http://git.enlightenment.org/tools/eflete.git/commit/?id=8adb9b7a0b32503c540f2fdcec3095c548ceb1f3

commit 8adb9b7a0b32503c540f2fdcec3095c548ceb1f3
Author: Vyacheslav Reutskiy 
Date:   Wed Feb 1 15:58:40 2017 +0200

theme: fix extra elipsis for property item

Change-Id: Ib0d77d46b08dfdea226fb8ba25e38ebfb3338802
---
 data/themes/tizen/widgets/genlist_property.edc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/data/themes/tizen/widgets/genlist_property.edc 
b/data/themes/tizen/widgets/genlist_property.edc
index 2c7b088..314f09a 100644
--- a/data/themes/tizen/widgets/genlist_property.edc
+++ b/data/themes/tizen/widgets/genlist_property.edc
@@ -283,10 +283,10 @@ group { name: "elm/genlist/item/1swallow/property";
 color2: 0 0 0 0;
 color3: 0 0 0 0;
 text {
-   text: "x:";
font: FN;
size: 13;
align: 1.0 0.5;
+   elipsis: -1;
 }
 rel1 {
to_x: "swallow.action1";

--

Re: [E-devel] [EGIT] [core/efl] master 01/01: cmake: remove dependency on libjpeg in eet as it is handled in common

2017-02-01 Thread Stefan Schmidt 
Hello.

On 01/02/17 15:31, Gustavo Sverzut Barbieri wrote:
> On Wed, Feb 1, 2017 at 11:47 AM, Stefan Schmidt  
> wrote:
>> Hello.
>>
>> On 01/02/17 14:39, Gustavo Sverzut Barbieri wrote:
>>> On Wed, Feb 1, 2017 at 11:24 AM, Stefan Schmidt
>>>  wrote:
 stefan pushed a commit to branch master.

 http://git.enlightenment.org/core/efl.git/commit/?id=592f356fe5cc64ac6e790d2014edfd11dcfc17a5

 commit 592f356fe5cc64ac6e790d2014edfd11dcfc17a5
 Author: Stefan Schmidt 
 Date:   Wed Feb 1 14:22:11 2017 +0100

 cmake: remove dependency on libjpeg in eet as it is handled in common
 ---
  src/lib/eet/CMakeLists.txt | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)

 diff --git a/src/lib/eet/CMakeLists.txt b/src/lib/eet/CMakeLists.txt
 index 813f293..76b71a4 100644
 --- a/src/lib/eet/CMakeLists.txt
 +++ b/src/lib/eet/CMakeLists.txt
 @@ -2,7 +2,7 @@ set(DESCRIPTION "Library for speedy data storage, 
 retrieval, and compression")

  set(PKG_CONFIG_REQUIRES_PRIVATE
zlib>=1.2.3
 -  libjpeg
 +  #libjpeg is hard to find. there is a cmake module that does find it. 
 and thats checked in common.cmake
  )
>>>
>>> You got this wrong, this is not just to check, it's to use. Now you'll
>>> have cmake build of eet with undefined symbols.
>>>
>>> This is also used to generate .pc files, see my other email.
>>
>> Fair enough. I actually try to understand the cmake stuff at all right
>> now and trying it out. Pretty likely my fixes are off here.
>>
>> And indeed I run into missing symbols now (emile not eet in this case)
>
> ok, fixed in master, now we process LIBRARIES and look for "find-XXX",
> in that case replace with XXX_LIBRARIES and also add include
> directories.

Thanks. After your change I can now fully build what we have covered 
with cmake.

> Now I'm wondering if we remove special PKG_CONFIG_REQUIRES variable
> and use LIBRARIES with some "pkgconfig-XXX"... what do you think?

Not sure really if I have an opinion on that just now. I will need to 
read through all the cmake stuff first. Its the first project I would 
use it with (well besides having build some, but really nothing besides 
calling cmake). It will take me some time to grok this. :)

regards
Stefan Schmidt

--
Check out the vibrant tech community on one of the world's most
engaging tech sites, SlashDot.org! http://sdm.link/slashdot
___
enlightenment-devel mailing list
enlightenment-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-devel

Re: [E-devel] Schedule discussion for 1.19

2017-02-01 Thread Stefan Schmidt 
Hello.

On 12/12/16 11:34, Stefan Schmidt wrote:
> Hello.
>
> Next try. People started to ask me about 1.19 again more recently so
> here is my new schedule proposal for 1.19.
>
> 2016-08-11 Merge window for 1.19 opens
> 2017-02-07 Merge window is over.
>   * Only bug fixes from this point
>   * Alpha release tarball
>   * One month stabilization phase starts
> 2017-02-13 Beta1 release tarball
>   * Only critical fixes from this point
> 2017-02-20 Beta2 release tarball
> 2017-02-27 Beta3 release tarball
> 2017-03-06 EFL 1.19 is out (First Monday in March)
>
> Comments?

I heard two people in favor and no complains. If you want to postpone 
this state this NOW or I will proceed as the above schedule.

regards
Stefan Schmidt

--
Check out the vibrant tech community on one of the world's most
engaging tech sites, SlashDot.org! http://sdm.link/slashdot
___
enlightenment-devel mailing list
enlightenment-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-devel

Re: [E-devel] [EGIT] [core/efl] master 01/01: cmake: remove dependency on libjpeg in eet as it is handled in common

2017-02-01 Thread Gustavo Sverzut Barbieri 
On Wed, Feb 1, 2017 at 11:47 AM, Stefan Schmidt  wrote:
> Hello.
>
> On 01/02/17 14:39, Gustavo Sverzut Barbieri wrote:
>> On Wed, Feb 1, 2017 at 11:24 AM, Stefan Schmidt
>>  wrote:
>>> stefan pushed a commit to branch master.
>>>
>>> http://git.enlightenment.org/core/efl.git/commit/?id=592f356fe5cc64ac6e790d2014edfd11dcfc17a5
>>>
>>> commit 592f356fe5cc64ac6e790d2014edfd11dcfc17a5
>>> Author: Stefan Schmidt 
>>> Date:   Wed Feb 1 14:22:11 2017 +0100
>>>
>>> cmake: remove dependency on libjpeg in eet as it is handled in common
>>> ---
>>>  src/lib/eet/CMakeLists.txt | 2 +-
>>>  1 file changed, 1 insertion(+), 1 deletion(-)
>>>
>>> diff --git a/src/lib/eet/CMakeLists.txt b/src/lib/eet/CMakeLists.txt
>>> index 813f293..76b71a4 100644
>>> --- a/src/lib/eet/CMakeLists.txt
>>> +++ b/src/lib/eet/CMakeLists.txt
>>> @@ -2,7 +2,7 @@ set(DESCRIPTION "Library for speedy data storage, 
>>> retrieval, and compression")
>>>
>>>  set(PKG_CONFIG_REQUIRES_PRIVATE
>>>zlib>=1.2.3
>>> -  libjpeg
>>> +  #libjpeg is hard to find. there is a cmake module that does find it. and 
>>> thats checked in common.cmake
>>>  )
>>
>> You got this wrong, this is not just to check, it's to use. Now you'll
>> have cmake build of eet with undefined symbols.
>>
>> This is also used to generate .pc files, see my other email.
>
> Fair enough. I actually try to understand the cmake stuff at all right
> now and trying it out. Pretty likely my fixes are off here.
>
> And indeed I run into missing symbols now (emile not eet in this case)

ok, fixed in master, now we process LIBRARIES and look for "find-XXX",
in that case replace with XXX_LIBRARIES and also add include
directories.

Now I'm wondering if we remove special PKG_CONFIG_REQUIRES variable
and use LIBRARIES with some "pkgconfig-XXX"... what do you think?

--
Check out the vibrant tech community on one of the world's most
engaging tech sites, SlashDot.org! http://sdm.link/slashdot
___
enlightenment-devel mailing list
enlightenment-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-devel

[EGIT] [core/efl] master 01/02: cmake: handle support libraries in .pc

2017-02-01 Thread Gustavo Sverzut Barbieri 
barbieri pushed a commit to branch master.

http://git.enlightenment.org/core/efl.git/commit/?id=b6ded792400c098dbd0c17d39a3a8fee67bedf08

commit b6ded792400c098dbd0c17d39a3a8fee67bedf08
Author: Gustavo Sverzut Barbieri 
Date:   Wed Feb 1 12:25:08 2017 -0200

cmake: handle support libraries in .pc

support libraries (src/static_libs), such as rg_etc, must not be
handled as a regular target, after all these are usually not shared
library and if they are, they have no .pc associated, then we use "-l"
as for system libraries, but using the installation path.
---
 cmake/helpers/EflMacros.cmake | 19 ++-
 1 file changed, 14 insertions(+), 5 deletions(-)

diff --git a/cmake/helpers/EflMacros.cmake b/cmake/helpers/EflMacros.cmake
index 3c0d7d3..c48270e 100644
--- a/cmake/helpers/EflMacros.cmake
+++ b/cmake/helpers/EflMacros.cmake
@@ -596,9 +596,17 @@ 
eolian_flags=-I\${pc_sysrootdir}\${eoincludedir}/${EFL_LIB_CURRENT}-${PROJECT_VE
 
   foreach(_e ${LIBRARIES})
 if(TARGET ${_e})
-  get_target_property(_sub_pc_name ${_e} PKG_CONFIG_NAME)
-  get_target_property(_sub_version ${_e} VERSION)
-  set(_pkg_config_requires_private "${_pkg_config_requires_private} 
${_sub_pc_name}>=${_sub_version}")
+  if(NOT _e MATCHES "^support-")
+get_target_property(_sub_pc_name ${_e} PKG_CONFIG_NAME)
+get_target_property(_sub_version ${_e} VERSION)
+set(_pkg_config_requires_private "${_pkg_config_requires_private} 
${_sub_pc_name}>=${_sub_version}")
+  else()
+get_target_property(_type ${_e} TYPE)
+if(_type STREQUAL SHARED_LIBRARY)
+  get_target_property(_oname ${_e} OUTPUT_NAME)
+  set(_libraries "${_libraries} 
-l${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_LIBDIR}/efl/support/v-${PROJECT_VERSION_MAJOR}.${PROJECT_VERSION_MINOR}/${CMAKE_SHARED_LIBRARY_PREFIX}${_oname}${CMAKE_SHARED_LIBRARY_SUFFIX}")
+endif()
+  endif()
 else()
   set(_libraries "${_libraries} -l${_e}")
 endif()
@@ -892,9 +900,10 @@ function(EFL_SUPPORT_LIB _target)
 target_compile_definitions(support-${_target} PRIVATE ${DEFINITIONS})
   endif()
 
-  if(OUTPUT_NAME)
-set_target_properties(support-${_target} PROPERTIES OUTPUT_NAME 
${OUTPUT_NAME})
+  if(NOT OUTPUT_NAME)
+set(OUTPUT_NAME "support-${_target}")
   endif()
+  set_target_properties(support-${_target} PROPERTIES OUTPUT_NAME 
${OUTPUT_NAME})
 
   if(VERSION AND SOVERSION)
 set_target_properties(support-${_target} PROPERTIES

--

[EGIT] [core/efl] master 02/02: cmake: handle 'FindXXX.cmake' standard with 'find-XXX' libraries.

2017-02-01 Thread Gustavo Sverzut Barbieri 
barbieri pushed a commit to branch master.

http://git.enlightenment.org/core/efl.git/commit/?id=364c5c4cd8508121e98e640fead39abf724d93a1

commit 364c5c4cd8508121e98e640fead39abf724d93a1
Author: Gustavo Sverzut Barbieri 
Date:   Wed Feb 1 12:25:43 2017 -0200

cmake: handle 'FindXXX.cmake' standard with 'find-XXX' libraries.

One can use virtual 'find-XXX' entries in LIBRARIES or
PUBLIC_LIBRARIES to use XXX_LIBRARIES and XXX_INCLUDE_DIR.
---
 cmake/helpers/EflMacros.cmake | 84 +++
 src/lib/eet/CMakeLists.txt|  2 +-
 src/lib/emile/CMakeLists.txt  |  3 +-
 3 files changed, 86 insertions(+), 3 deletions(-)

diff --git a/cmake/helpers/EflMacros.cmake b/cmake/helpers/EflMacros.cmake
index c48270e..98ac3f7 100644
--- a/cmake/helpers/EflMacros.cmake
+++ b/cmake/helpers/EflMacros.cmake
@@ -870,6 +870,30 @@ function(EFL_SUPPORT_LIB _target)
 set(_compile_flags "${_compile_flags} ${_c}")
   endforeach()
 
+  set(_libraries)
+  foreach(_l ${LIBRARIES})
+if(${_l} MATCHES "^find-")
+  string(REGEX REPLACE "^find-" "" _v "${_l}")
+  list(APPEND _libraries ${${_v}_LIBRARIES})
+  list(APPEND SYSTEM_INCLUDE_DIRECTORIES ${${_v}_INCLUDE_DIR})
+else()
+  list(APPEND _libraries ${_l})
+endif()
+  endforeach()
+  set(LIBRARIES ${_libraries})
+
+  set(_public_libraries)
+  foreach(_l ${PUBLIC_LIBRARIES})
+if(${_l} MATCHES "^find-")
+  string(REGEX REPLACE "^find-" "" _v "${_l}")
+  list(APPEND _public_libraries ${${_v}_LIBRARIES})
+  list(APPEND SYSTEM_INCLUDE_DIRECTORIES ${${_v}_INCLUDE_DIR})
+else()
+  list(APPEND _public_libraries ${_l})
+endif()
+  endforeach()
+  set(PUBLIC_LIBRARIES ${_public_libraries})
+
   add_library(support-${_target} ${LIBRARY_TYPE} ${_sources} ${_headers})
   set_target_properties(support-${_target} PROPERTIES
 OBJECT_DEPENDS "${_obj_deps}"
@@ -1080,6 +1104,30 @@ function(EFL_LIB _target)
 set(_compile_flags "${_compile_flags} ${_c}")
   endforeach()
 
+  set(_libraries)
+  foreach(_l ${LIBRARIES})
+if(${_l} MATCHES "^find-")
+  string(REGEX REPLACE "^find-" "" _v "${_l}")
+  list(APPEND _libraries ${${_v}_LIBRARIES})
+  list(APPEND SYSTEM_INCLUDE_DIRECTORIES ${${_v}_INCLUDE_DIR})
+else()
+  list(APPEND _libraries ${_l})
+endif()
+  endforeach()
+  set(LIBRARIES ${_libraries})
+
+  set(_public_libraries)
+  foreach(_l ${PUBLIC_LIBRARIES})
+if(${_l} MATCHES "^find-")
+  string(REGEX REPLACE "^find-" "" _v "${_l}")
+  list(APPEND _public_libraries ${${_v}_LIBRARIES})
+  list(APPEND SYSTEM_INCLUDE_DIRECTORIES ${${_v}_INCLUDE_DIR})
+else()
+  list(APPEND _public_libraries ${_l})
+endif()
+  endforeach()
+  set(PUBLIC_LIBRARIES ${_public_libraries})
+
   add_library(${_target} ${LIBRARY_TYPE} ${_sources} ${_headers})
   set_target_properties(${_target} PROPERTIES
 FRAMEWORK TRUE
@@ -1253,6 +1301,18 @@ function(EFL_BIN _binname)
 
   EFL_PKG_CONFIG_EVAL(${_bintarget} "${PKG_CONFIG_REQUIRES_PRIVATE}" "")
 
+  set(_libraries)
+  foreach(_l ${LIBRARIES})
+if(${_l} MATCHES "^find-")
+  string(REGEX REPLACE "^find-" "" _v "${_l}")
+  list(APPEND _libraries ${${_v}_LIBRARIES})
+  list(APPEND SYSTEM_INCLUDE_DIRECTORIES ${${_v}_INCLUDE_DIR})
+else()
+  list(APPEND _libraries ${_l})
+endif()
+  endforeach()
+  set(LIBRARIES ${_libraries})
+
   add_executable(${_bintarget} ${_sources})
 
   if(_obj_deps)
@@ -1383,6 +1443,18 @@ function(EFL_TEST _testname)
 
   EFL_PKG_CONFIG_EVAL(${_testtarget} "${PKG_CONFIG_REQUIRES_PRIVATE}" "")
 
+  set(_libraries)
+  foreach(_l ${LIBRARIES})
+if(${_l} MATCHES "^find-")
+  string(REGEX REPLACE "^find-" "" _v "${_l}")
+  list(APPEND _libraries ${${_v}_LIBRARIES})
+  list(APPEND SYSTEM_INCLUDE_DIRECTORIES ${${_v}_INCLUDE_DIR})
+else()
+  list(APPEND _libraries ${_l})
+endif()
+  endforeach()
+  set(LIBRARIES ${_libraries})
+
   add_executable(${_testtarget} EXCLUDE_FROM_ALL ${_sources})
 
   if(_obj_deps)
@@ -1530,6 +1602,18 @@ function(EFL_MODULE _modname)
 
   EFL_PKG_CONFIG_EVAL(${_modtarget} "${PKG_CONFIG_REQUIRES_PRIVATE}" "")
 
+  set(_libraries)
+  foreach(_l ${LIBRARIES})
+if(${_l} MATCHES "^find-")
+  string(REGEX REPLACE "^find-" "" _v "${_l}")
+  list(APPEND _libraries ${${_v}_LIBRARIES})
+  list(APPEND SYSTEM_INCLUDE_DIRECTORIES ${${_v}_INCLUDE_DIR})
+else()
+  list(APPEND _libraries ${_l})
+endif()
+  endforeach()
+  set(LIBRARIES ${_libraries})
+
   add_library(${_modtarget} ${_modtype} ${_sources})
   set_target_properties(${_modtarget} PROPERTIES
 OBJECT_DEPENDS "${_obj_deps}"
diff --git a/src/lib/eet/CMakeLists.txt b/src/lib/eet/CMakeLists.txt
index 76b71a4..fb2c02d 100644
--- a/src/lib/eet/CMakeLists.txt
+++ b/src/lib/eet/CMakeLists.txt
@@ -2,7 +2,6 @@ set(DESCRIPTION "Library for speedy data storage, retrieval, 
and compression")
 
 set(PKG_CONFIG_REQUIRES_PRIVATE

[E-devel] Py-EFL App Crashing with Edje_Object does not have a mapping Error

2017-02-01 Thread Jeff Hoogland 
So on some of my systems one of my efl applications is crashing with this
error message:

Traceback (most recent call last):
  File "/usr/bin/swami", line 176, in 
app = MainWin(launchArg)
  File "/usr/bin/swami", line 46, in __init__
self.icon_object_set(icon.object_get())
  File "efl/elementary/image.pxi", line 453, in
efl.elementary.__init__.Image.object_get (efl/elementary/__init__.c:159042)
  File "efl/eo/efl.eo.pyx", line 137, in efl.eo.object_from_instance
(efl/eo/efl.eo.c:1954)
ValueError: Eo object at 0x40026027 of type Edje_Object does not
have a mapping!

The exact same source with the exact same EFL version works fine on some
other systems. Any ideas what might be wrong / how to correct?

Source code: https://github.com/JeffHoogland/swami

-- 
~Jeff Hoogland 
My Projects on GitHub 
--
Check out the vibrant tech community on one of the world's most
engaging tech sites, SlashDot.org! http://sdm.link/slashdot
___
enlightenment-devel mailing list
enlightenment-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-devel

Re: [E-devel] [EGIT] [core/efl] master 01/01: cmake: remove dependency on libjpeg in eet as it is handled in common

2017-02-01 Thread Stefan Schmidt 
Hello.

On 01/02/17 14:39, Gustavo Sverzut Barbieri wrote:
> On Wed, Feb 1, 2017 at 11:24 AM, Stefan Schmidt
>  wrote:
>> stefan pushed a commit to branch master.
>>
>> http://git.enlightenment.org/core/efl.git/commit/?id=592f356fe5cc64ac6e790d2014edfd11dcfc17a5
>>
>> commit 592f356fe5cc64ac6e790d2014edfd11dcfc17a5
>> Author: Stefan Schmidt 
>> Date:   Wed Feb 1 14:22:11 2017 +0100
>>
>> cmake: remove dependency on libjpeg in eet as it is handled in common
>> ---
>>  src/lib/eet/CMakeLists.txt | 2 +-
>>  1 file changed, 1 insertion(+), 1 deletion(-)
>>
>> diff --git a/src/lib/eet/CMakeLists.txt b/src/lib/eet/CMakeLists.txt
>> index 813f293..76b71a4 100644
>> --- a/src/lib/eet/CMakeLists.txt
>> +++ b/src/lib/eet/CMakeLists.txt
>> @@ -2,7 +2,7 @@ set(DESCRIPTION "Library for speedy data storage, retrieval, 
>> and compression")
>>
>>  set(PKG_CONFIG_REQUIRES_PRIVATE
>>zlib>=1.2.3
>> -  libjpeg
>> +  #libjpeg is hard to find. there is a cmake module that does find it. and 
>> thats checked in common.cmake
>>  )
>
> You got this wrong, this is not just to check, it's to use. Now you'll
> have cmake build of eet with undefined symbols.
>
> This is also used to generate .pc files, see my other email.

Fair enough. I actually try to understand the cmake stuff at all right 
now and trying it out. Pretty likely my fixes are off here.

And indeed I run into missing symbols now (emile not eet in this case)

Scanning dependencies of target ecore_con-bin
[ 79%] Building C object 
CMakeFiles/ecore_con-bin.dir/src/bin/ecore_con/efl_net_proxy_helper.c.o
[ 79%] Linking C executable 
lib64/ecore_con/utils/v-1.18/efl_net_proxy_helper
/home/stefan/EFL/efl/build/lib64/libemile.so.1: undefined reference to 
`jpeg_resync_to_restart'
/home/stefan/EFL/efl/build/lib64/libeet.so.1: undefined reference to 
`jpeg_std_error'
/home/stefan/EFL/efl/build/lib64/libemile.so.1: undefined reference to 
`jpeg_CreateDecompress'
/home/stefan/EFL/efl/build/lib64/libeet.so.1: undefined reference to 
`jpeg_start_compress'
/home/stefan/EFL/efl/build/lib64/libeet.so.1: undefined reference to 
`jpeg_set_quality'
/home/stefan/EFL/efl/build/lib64/libemile.so.1: undefined reference to 
`jpeg_read_header'
/home/stefan/EFL/efl/build/lib64/libemile.so.1: undefined reference to 
`jpeg_destroy_decompress'
/home/stefan/EFL/efl/build/lib64/libemile.so.1: undefined reference to 
`jpeg_calc_output_dimensions'
/home/stefan/EFL/efl/build/lib64/libeet.so.1: undefined reference to 
`jpeg_finish_compress'
/home/stefan/EFL/efl/build/lib64/libeet.so.1: undefined reference to 
`jpeg_destroy_compress'
/home/stefan/EFL/efl/build/lib64/libemile.so.1: undefined reference to 
`jpeg_finish_decompress'
/home/stefan/EFL/efl/build/lib64/libeet.so.1: undefined reference to 
`jpeg_set_defaults'
/home/stefan/EFL/efl/build/lib64/libemile.so.1: undefined reference to 
`jpeg_start_decompress'
/home/stefan/EFL/efl/build/lib64/libeet.so.1: undefined reference to 
`jpeg_write_scanlines'
/home/stefan/EFL/efl/build/lib64/libeet.so.1: undefined reference to 
`jpeg_CreateCompress'
/home/stefan/EFL/efl/build/lib64/libemile.so.1: undefined reference to 
`jpeg_read_scanlines'
collect2: error: ld returned 1 exit status
CMakeFiles/ecore_con-bin.dir/build.make:96: recipe for target 
'lib64/ecore_con/utils/v-1.18/efl_net_proxy_helper' failed
make[2]: *** [lib64/ecore_con/utils/v-1.18/efl_net_proxy_helper] Error 1
CMakeFiles/Makefile2:1276: recipe for target 
'CMakeFiles/ecore_con-bin.dir/all' failed
make[1]: *** [CMakeFiles/ecore_con-bin.dir/all] Error 2
Makefile:138: recipe for target 'all' failed
make: *** [all] Error 2

Given that we seem to need the FindLibjpeg macro we might need to go the 
full route to make sure our build system understand things correctly.

regards
Stefan Schmidt

--
Check out the vibrant tech community on one of the world's most
engaging tech sites, SlashDot.org! http://sdm.link/slashdot
___
enlightenment-devel mailing list
enlightenment-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-devel

Re: [E-devel] cmake attempt

2017-02-01 Thread Stefan Schmidt 
Hello.

On 01/02/17 14:42, Gustavo Sverzut Barbieri wrote:
> On Wed, Feb 1, 2017 at 11:31 AM, Stefan Schmidt  
> wrote:
>> Hello.
>>
>> On 01/02/17 12:20, marcel-hollerb...@t-online.de wrote:
>>> Hello,
>>>
>>> There was a problem with libjpeg detection, this should be fixed now,
>>> can you test again?
>>
>> I had to remove another direct libjpeg dep in eet but after that cmake
>> runs through.
>>
>> In the following make run it breaks though when the just build
>> eolian_gen attempts to handle the eo files.
>>
>> [ 17%] Built target eolian-bin
>> Scanning dependencies of target efl-eo
>> [ 17%] EOLIAN src/lib/efl/interfaces/efl_animator.eo
>> ERR<20685>:eina_list /home/stefan/EFL/efl/src/lib/eina/eina_list.c:508
>> eina_list_init() ERROR: Mempool for list cannot be allocated in list init.
>
> try to cleanup your tree (source & build), this shouldn't happen as
> the mempools are now statically linked (as in autotools), this error
> shouldn't happen anymore.

Indeed. Marcel pointed the eina_config.h problem out to me. After 
cleaning up the src tree this problem went away.

Setting me back to linking problems with libjpeg. Will reply to your 
other mail about it.

regards
Stefan Schmidt

--
Check out the vibrant tech community on one of the world's most
engaging tech sites, SlashDot.org! http://sdm.link/slashdot
___
enlightenment-devel mailing list
enlightenment-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-devel

Re: [E-devel] cmake attempt

2017-02-01 Thread Gustavo Sverzut Barbieri 
On Wed, Feb 1, 2017 at 11:31 AM, Stefan Schmidt  wrote:
> Hello.
>
> On 01/02/17 12:20, marcel-hollerb...@t-online.de wrote:
>> Hello,
>>
>> There was a problem with libjpeg detection, this should be fixed now,
>> can you test again?
>
> I had to remove another direct libjpeg dep in eet but after that cmake
> runs through.
>
> In the following make run it breaks though when the just build
> eolian_gen attempts to handle the eo files.
>
> [ 17%] Built target eolian-bin
> Scanning dependencies of target efl-eo
> [ 17%] EOLIAN src/lib/efl/interfaces/efl_animator.eo
> ERR<20685>:eina_list /home/stefan/EFL/efl/src/lib/eina/eina_list.c:508
> eina_list_init() ERROR: Mempool for list cannot be allocated in list init.

try to cleanup your tree (source & build), this shouldn't happen as
the mempools are now statically linked (as in autotools), this error
shouldn't happen anymore.



-- 
Gustavo Sverzut Barbieri
--
Mobile: +55 (16) 99354-9890

--
Check out the vibrant tech community on one of the world's most
engaging tech sites, SlashDot.org! http://sdm.link/slashdot
___
enlightenment-devel mailing list
enlightenment-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-devel

Re: [E-devel] [EGIT] [core/efl] master 01/01: cmake: remove dependency on libjpeg in eet as it is handled in common

2017-02-01 Thread Gustavo Sverzut Barbieri 
On Wed, Feb 1, 2017 at 11:24 AM, Stefan Schmidt
 wrote:
> stefan pushed a commit to branch master.
>
> http://git.enlightenment.org/core/efl.git/commit/?id=592f356fe5cc64ac6e790d2014edfd11dcfc17a5
>
> commit 592f356fe5cc64ac6e790d2014edfd11dcfc17a5
> Author: Stefan Schmidt 
> Date:   Wed Feb 1 14:22:11 2017 +0100
>
> cmake: remove dependency on libjpeg in eet as it is handled in common
> ---
>  src/lib/eet/CMakeLists.txt | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/src/lib/eet/CMakeLists.txt b/src/lib/eet/CMakeLists.txt
> index 813f293..76b71a4 100644
> --- a/src/lib/eet/CMakeLists.txt
> +++ b/src/lib/eet/CMakeLists.txt
> @@ -2,7 +2,7 @@ set(DESCRIPTION "Library for speedy data storage, retrieval, 
> and compression")
>
>  set(PKG_CONFIG_REQUIRES_PRIVATE
>zlib>=1.2.3
> -  libjpeg
> +  #libjpeg is hard to find. there is a cmake module that does find it. and 
> thats checked in common.cmake
>  )

You got this wrong, this is not just to check, it's to use. Now you'll
have cmake build of eet with undefined symbols.

This is also used to generate .pc files, see my other email.

-- 
Gustavo Sverzut Barbieri
--
Mobile: +55 (16) 99354-9890

--
Check out the vibrant tech community on one of the world's most
engaging tech sites, SlashDot.org! http://sdm.link/slashdot
___
enlightenment-devel mailing list
enlightenment-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-devel

Re: [E-devel] cmake attempt

2017-02-01 Thread Stefan Schmidt 
Hello.

On 01/02/17 12:51, Felipe Magno de Almeida wrote:
> On Feb 1, 2017 9:03 AM, "Stefan Schmidt"  wrote:
>
> Hello.
>
> On 24/01/17 03:47, Carsten Haitzler (The Rasterman) wrote:
>> On Tue, 24 Jan 2017 00:07:19 -0200 Gustavo Sverzut Barbieri
>>  said:
>>
>>> On Mon, Jan 23, 2017 at 10:59 PM, Carsten Haitzler 
>>> wrote:
 On Tue, 24 Jan 2017 10:39:46 +1030 Simon Lees  said:

>
>
> On 01/24/2017 10:16 AM, Carsten Haitzler (The Rasterman) wrote:
>> On Mon, 23 Jan 2017 16:50:04 -0200 Gustavo Sverzut Barbieri
>>  said:
>>
>>> Hi all,
>>>
>>> Just merged the branch Marcel and I were working (actually we
> couldn't
>>> share a branch since we cannot push to other developer's branch and
> we
>>> cannot create a shared one).
>>>
>>> We'll work in tree, so we avoid conflicts as we do renames and change
>>> the #defines.
>>>
>>> See TODO-cmake.txt on how you should help.
>>
>> hey just a sec... do we have to do this NOW?  for now we've been
>> discussing "is it possible" and "how can it be done" and "here's a
>> test". we haven't discussed when we should do this and a final "how" i
>> guess... so before leaping into it... let's make sure everyone is ont
> he
>> same page...
>>
>> you're working entirely in a branch atm or in master? i am reading my
>> morning email and haven't looked at git commits yet...
>>
>
> Well now is a good time given that people are actually doing it which
> means I guess they have time maybe in 3 months they wont, also no one
> has been jumping up and down for a release but I guess we are meant to
> be hitting a stabilization period before a release sometime soon. Its
> probably as good a time as any though.
>>>
>>> we tried to use a branch, but neither of us could create the shared
>>> branch and syncing 2 rebase branches is painful. Thus we moved to
>>> master, which shouldn't break for autotools folks -- just more noise
>>> (however hopefully people will see some action and will jump to help).
>>
>> well seeing the commits is good. i just kind of think we may be jumping
> in a
>> bit fast... :)
>>
 well this is a massive change... "stage 0" isn't  (fixing up
> defines/ifdefs
 and tree consistency)... but the rest is a massive bucket of stuff... :/
>>>
>>> we're still seeing lots of changes in cmake/ folder because as we add
>>> libraries and match more what autotools did, we see issues that must
>>> be fixed.
>>>
>>> Hopefully this should settle soon.
>>
>> ok. i just wasn't expecting a leap into master so fast... at least some
> kind of
>> "let's have a plan" thing... :) but on the other side... the fact people
> are
>> energized enough to work on it is great. so i'm loathe to shut that down.
> i'm
>> more thinking "do we make this part of 1.19 release or just do this as a
>> background task until after 1.19"... :)
>
> I would strongly say we can keep working on it but not making it
> official for 1.19. It will take some more time to actually cover what we
> have right now (or what we want it to cover) and afterwards some more
> time to work out all the bugs and quirks to cater hour diverse user base.
>
>
> Gustavo doesn't seem to be targeting 1.19 when we talked in IRC. I'd really
> like that the cmake release would come with the merge of EFL libraries,
> since that should be easier in cmake IIRC.

fair enough. I just wanted to be clear on that topic.

Having it in tree as it is actively being worked on to demonstrate it is 
an alternative is fine. It will need some time to prove itself and 
convince the developers.

regards
Stefan Schmidt

--
Check out the vibrant tech community on one of the world's most
engaging tech sites, SlashDot.org! http://sdm.link/slashdot
___
enlightenment-devel mailing list
enlightenment-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-devel

Re: [E-devel] cmake attempt

2017-02-01 Thread Stefan Schmidt 
Hello.

On 01/02/17 12:20, marcel-hollerb...@t-online.de wrote:
> Hello,
>
> There was a problem with libjpeg detection, this should be fixed now,
> can you test again?

I had to remove another direct libjpeg dep in eet but after that cmake 
runs through.

In the following make run it breaks though when the just build 
eolian_gen attempts to handle the eo files.

[ 17%] Built target eolian-bin
Scanning dependencies of target efl-eo
[ 17%] EOLIAN src/lib/efl/interfaces/efl_animator.eo
ERR<20685>:eina_list /home/stefan/EFL/efl/src/lib/eina/eina_list.c:508 
eina_list_init() ERROR: Mempool for list cannot be allocated in list init.
ERR<20685>:eina /home/stefan/EFL/efl/src/lib/eina/eina_main.c:294 
eina_init() Could not initialize eina module 'list'.
ERR<20685>:eina_list /home/stefan/EFL/efl/src/lib/eina/eina_list.c:508 
eina_list_init() ERROR: Mempool for list cannot be allocated in list init.
ERR<20685>:eina /home/stefan/EFL/efl/src/lib/eina/eina_main.c:294 
eina_init() Could not initialize eina module 'list'.
CRI<20685>:eina_log /home/stefan/EFL/efl/src/lib/eina/eina_prefix.c:482 
eina_prefix_new() unknown log domain -1, original message level was: DBG
CRI<20685>:eina_log /home/stefan/EFL/efl/src/lib/eina/eina_prefix.c:484 
eina_prefix_new() unknown log domain -1, original message level was: DBG
CRI<20685>:eina_log /home/stefan/EFL/efl/src/lib/eina/eina_prefix.c:559 
eina_prefix_new() unknown log domain -1, original message level was: DBG
CRI<20685>:eina_log /home/stefan/EFL/efl/src/lib/eina/eina_prefix.c:401 
_get_env_var() unknown log domain -1, original message level was: DBG
CRI<20685>:eina_log /home/stefan/EFL/efl/src/lib/eina/eina_prefix.c:401 
_get_env_var() unknown log domain -1, original message level was: DBG
CRI<20685>:eina_log /home/stefan/EFL/efl/src/lib/eina/eina_prefix.c:401 
_get_env_var() unknown log domain -1, original message level was: DBG
CRI<20685>:eina_log /home/stefan/EFL/efl/src/lib/eina/eina_prefix.c:401 
_get_env_var() unknown log domain -1, original message level was: DBG
CRI<20685>:eina_log /home/stefan/EFL/efl/src/lib/eina/eina_prefix.c:582 
eina_prefix_new() unknown log domain -1, original message level was: INF
CRI<20685>:eina_log /home/stefan/EFL/efl/src/lib/eina/eina_prefix.c:635 
eina_prefix_new() unknown log domain -1, original message level was: DBG
CRI<20685>:eina_log /home/stefan/EFL/efl/src/lib/eina/eina_prefix.c:654 
eina_prefix_new() unknown log domain -1, original message level was: DBG
CRI<20685>:eina_log /home/stefan/EFL/efl/src/lib/eina/eina_prefix.c:659 
eina_prefix_new() unknown log domain -1, original message level was: DBG
CRI<20685>:eina_log /home/stefan/EFL/efl/src/lib/eina/eina_prefix.c:666 
eina_prefix_new() unknown log domain -1, original message level was: DBG
CRI<20685>:eina_log /home/stefan/EFL/efl/src/lib/eina/eina_prefix.c:673 
eina_prefix_new() unknown log domain -1, original message level was: DBG
CRI<20685>:eina_log /home/stefan/EFL/efl/src/lib/eina/eina_prefix.c:679 
eina_prefix_new() unknown log domain -1, original message level was: DBG
ERR<20685>:eina_list /home/stefan/EFL/efl/src/lib/eina/eina_list.c:508 
eina_list_init() ERROR: Mempool for list cannot be allocated in list init.
ERR<20685>:eina /home/stefan/EFL/efl/src/lib/eina/eina_main.c:294 
eina_init() Could not initialize eina module 'list'.
ERR<20685>:eina_list /home/stefan/EFL/efl/src/lib/eina/eina_list.c:508 
eina_list_init() ERROR: Mempool for list cannot be allocated in list init.
ERR<20685>:eina /home/stefan/EFL/efl/src/lib/eina/eina_main.c:294 
eina_init() Could not initialize eina module 'list'.
CMakeFiles/efl-eo.dir/build.make:219: recipe for target 
'src/lib/efl/interfaces/efl_animator.eo.c' failed
make[2]: *** [src/lib/efl/interfaces/efl_animator.eo.c] Segmentation 
fault (core dumped)
CMakeFiles/Makefile2:1874: recipe for target 'CMakeFiles/efl-eo.dir/all' 
failed
make[1]: *** [CMakeFiles/efl-eo.dir/all] Error 2
Makefile:138: recipe for target 'all' failed
make: *** [all] Error 2

Ideas?

regards
Stefan Schmidt

--
Check out the vibrant tech community on one of the world's most
engaging tech sites, SlashDot.org! http://sdm.link/slashdot
___
enlightenment-devel mailing list
enlightenment-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-devel

[EGIT] [core/efl] master 01/01: cmake: remove dependency on libjpeg in eet as it is handled in common

2017-02-01 Thread Stefan Schmidt 
stefan pushed a commit to branch master.

http://git.enlightenment.org/core/efl.git/commit/?id=592f356fe5cc64ac6e790d2014edfd11dcfc17a5

commit 592f356fe5cc64ac6e790d2014edfd11dcfc17a5
Author: Stefan Schmidt 
Date:   Wed Feb 1 14:22:11 2017 +0100

cmake: remove dependency on libjpeg in eet as it is handled in common
---
 src/lib/eet/CMakeLists.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/lib/eet/CMakeLists.txt b/src/lib/eet/CMakeLists.txt
index 813f293..76b71a4 100644
--- a/src/lib/eet/CMakeLists.txt
+++ b/src/lib/eet/CMakeLists.txt
@@ -2,7 +2,7 @@ set(DESCRIPTION "Library for speedy data storage, retrieval, 
and compression")
 
 set(PKG_CONFIG_REQUIRES_PRIVATE
   zlib>=1.2.3
-  libjpeg
+  #libjpeg is hard to find. there is a cmake module that does find it. and 
thats checked in common.cmake
 )
 
 set(PUBLIC_LIBRARIES

--

[EGIT] [core/efl] master 02/02: Revert "edje_edit: fix segmentation fault(Array index is out of bound)"

2017-02-01 Thread Vyacheslav Reutskiy 
rimmed pushed a commit to branch master.

http://git.enlightenment.org/core/efl.git/commit/?id=208c529e7a12c308a4859b2fd346e2de5dc52637

commit 208c529e7a12c308a4859b2fd346e2de5dc52637
Author: Vyacheslav Reutskiy 
Date:   Wed Feb 1 15:08:13 2017 +0200

Revert "edje_edit: fix segmentation fault(Array index is out of bound)"

This patch need to revert because it just a temporary solution for load
'inherit_only' groups. Problem with these groups is solved in patch
c3733a213ba2de3acc2496a381e8e3f591f2c10a

This reverts commit 88f5ac22c1dcd2ddaf4fda4f170fb5c0ad9b3afd.
---
 src/lib/edje/edje_edit.c | 2 --
 1 file changed, 2 deletions(-)

diff --git a/src/lib/edje/edje_edit.c b/src/lib/edje/edje_edit.c
index c573553..ee7c119 100644
--- a/src/lib/edje/edje_edit.c
+++ b/src/lib/edje/edje_edit.c
@@ -11976,8 +11976,6 @@ _edje_program_afters_get(Evas_Object *obj, Edje_Program 
*epr)
  {
 Edje_Program *p = NULL;
 
-if (a->id < 0) continue;
-
 p = ed->collection->patterns.table_programs[a->id % 
ed->collection->patterns.table_programs_size];
 if (p && p->name)
   {

--

[EGIT] [core/efl] master 01/02: edje_cc: remove 'inherit_only' groups from result edj file

2017-02-01 Thread Vyacheslav Reutskiy 
rimmed pushed a commit to branch master.

http://git.enlightenment.org/core/efl.git/commit/?id=c3733a213ba2de3acc2496a381e8e3f591f2c10a

commit c3733a213ba2de3acc2496a381e8e3f591f2c10a
Author: Vyacheslav Reutskiy 
Date:   Wed Feb 1 15:02:46 2017 +0200

edje_cc: remove 'inherit_only' groups from result edj file

The 'inherit_only' groups are helpers and no sense to save it to edj
file.

@fix
---
 src/bin/edje/edje_cc_out.c | 7 ++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/src/bin/edje/edje_cc_out.c b/src/bin/edje/edje_cc_out.c
index 984f165..7c483b5 100644
--- a/src/bin/edje/edje_cc_out.c
+++ b/src/bin/edje/edje_cc_out.c
@@ -3655,7 +3655,12 @@ data_process_lookups(void)
   }
 find = eina_hash_find(edje_file->collection, pc->part);
 if (find && find->id == pc->id)
-  continue ;
+  {
+ if ( ((Edje_Part_Collection_Parser*)pc)->inherit_only)
+   eina_hash_del_by_data(edje_file->collection, find);
+ else
+   continue ;
+  }
 
 EINA_LIST_FOREACH(aliases, l3, alias)
   if (alias->id == pc->id)

--

[E-devel] split src/lib/efl into basic and eo-interfaces

2017-02-01 Thread Gustavo Sverzut Barbieri 
Hi all,

src/lib/efl is causing some cyclic dependency stuff as it's used with
2 distinct purposes:

  - basic and common types, Eo independent, as well as definitions
(ie: Efl_Config.h), which ends being included in all libraries (see
all *.pc -I${includedir}/efl-1, including eina, eo...). This produces
no actual library/code.

  - Eo interfaces/classes, such as canvas, gfx, I/O... which are use
eo, of course. These produce a libefl.so

My proposal is to solve this anomaly and move the Eo interfaces out of
"src/lib/efl" into "src/lib/efl-interface" which would produce
"libefl-interfaces.so".

This would have a secondary benefit of freeing "libefl.so" to be used
by the "single library" when we merge them.


-- 
Gustavo Sverzut Barbieri
--
Mobile: +55 (16) 99354-9890

--
Check out the vibrant tech community on one of the world's most
engaging tech sites, SlashDot.org! http://sdm.link/slashdot
___
enlightenment-devel mailing list
enlightenment-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-devel

Re: [E-devel] [EGIT] [core/efl] master 01/02: cmake: use the jpeg module of cmake to find the library

2017-02-01 Thread Gustavo Sverzut Barbieri 
On Wed, Feb 1, 2017 at 9:20 AM, Marcel Hollerbach
 wrote:
>
> bu5hm4n pushed a commit to branch master.
>
> http://git.enlightenment.org/core/efl.git/commit/?id=8dc1166eaa15c3e288e1126e281d318ab96c4c89
>
> commit 8dc1166eaa15c3e288e1126e281d318ab96c4c89
> Author: Marcel Hollerbach 
> Date:   Wed Feb 1 12:18:33 2017 +0100
>
> cmake: use the jpeg module of cmake to find the library
>
> finding libjpeg can be a bit more complex, there are systems that are
> not delivering a .pc for it. So we should just use the cmake module to
> find it.
> ---
>  cmake/config/common.cmake| 5 -
>  src/lib/emile/CMakeLists.txt | 3 ++-
>  2 files changed, 6 insertions(+), 2 deletions(-)
>
> diff --git a/cmake/config/common.cmake b/cmake/config/common.cmake
> index d95d0ec..96b105c 100644
> --- a/cmake/config/common.cmake
> +++ b/cmake/config/common.cmake
> @@ -2,6 +2,7 @@ include(CheckSymbolExists)
>  include(CheckIncludeFile)
>  include(CheckTypeSize)
>  include(FindPkgConfig)
> +include(FindJPEG)
>  include(CTest)
>  find_package(Threads REQUIRED)
>
> @@ -10,7 +11,9 @@ pkg_check_modules(LIBSYSTEMD libsystemd)
>  pkg_check_modules(VALGRIND valgrind)
>  pkg_check_modules(OPENSSL openssl>=1.0)
>  pkg_check_modules(GNUTLS gnutls>=2.12.16)
> -pkg_check_modules(LIBJPEG libjpeg REQUIRED)
> +if (NOT JPEG_FOUND)
> +  error("a jpeg library is needed.")
> +endif()

I believe you can use some 'REQUIRED' keyword in FindXXX macros, no?


>  set(SUGGEST_VALGRIND OFF)
>  if("${BUILD_PROFILE}" STREQUAL "dev")
> diff --git a/src/lib/emile/CMakeLists.txt b/src/lib/emile/CMakeLists.txt
> index d6c3155..899013c 100644
> --- a/src/lib/emile/CMakeLists.txt
> +++ b/src/lib/emile/CMakeLists.txt
> @@ -2,7 +2,8 @@ set(DESCRIPTION "Library for simplified serialization, 
> compression and ciphering
>
>  set(PKG_CONFIG_REQUIRES_PRIVATE
>zlib>=1.2.3
> -  libjpeg
> +  #libjpeg is hard to find. there is a cmake module that does find it. and 
> thats checked in common.cmake
> +  #libjpeg
>  )
>
>  set(LIBRARIES

well, I avoided using FindJPEG because of extra complexities... but if
people will need that, then we need here to set(LIBRARIES
${JPEG_LIBRARIES}) and also ${JPEG_INCLUDE_DIRS}  in
SYSTEM_INCLUDE_DIRS...

As this will happen possibly many times (lots of Find.cmake), we
may consider just using some extra processing in LIBRARIES, like

set(_libs "")
foreach(l in ${LIBRARIES})
if(DEFINED ${l}_FOUND AND ${l}_FOUND AND ${l}_LIBRARIES)
list(APPEND _libs ${${l}_LIBRARIES})
list(APPEND _sys_inc_dirs ${${l}_INCLUDE_DIR})
else()
list(APPEND _libs ${l})
endif()
endif()

Then we'd use:

set(LIBRARIES eina m support-rg_etc JPEG)

then it would filter out JPEG, replacing it with JPEG_LIBRARIES and
JPEG_INCLUDE_DIR whether appropriate.



-- 
Gustavo Sverzut Barbieri
--
Mobile: +55 (16) 99354-9890

--
Check out the vibrant tech community on one of the world's most
engaging tech sites, SlashDot.org! http://sdm.link/slashdot
___
enlightenment-devel mailing list
enlightenment-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-devel

Re: [E-devel] Weekend project: distro-builder

2017-02-01 Thread Simon Lees 


On 02/01/2017 09:24 PM, ani...@astier.eu wrote:
> On Wed, Feb 01, 2017 at 02:48:27PM +1030, Simon Lees wrote:
>>
>> On openSUSE atleast you can just install then uninstall efl-devel this
>> will pull in all the deps automatically as the packages are kept up to
>> date.  Alternately the current list is available here,
>> https://build.opensuse.org/package/view_file/X11:Enlightenment:Factory/efl/efl.spec?expand=1
>>
>>
>> Cheers
>> -- 
>>
>> Simon Lees (Simotek)http://simotek.net
> 
> 
> Thanks Simon, great job on the packaging. It's true that in your case
> "zypper si -d efl-devel" would be sufficient for the published version,
> but what about git? What if a dev/CI wants to test that the current
> git master or branch it still builds on openSUSE, but doesn't run
> openSUSE? My goal was also to automate this properly.
> 
The openSUSE build service commandline interface "osc" is available on
several distro's so that + a spec file can be used to build for openSUSE
+ Fedora (maybe even debian and arch if we try hard enough) on one of
several distros.

There is a X11:Enlightenment:Nightly repo that needs some work (I might
do some tomorrow), the seemingly likely adoption of cmake makes it
likely that i'll fix it the easy way. Anyway that repo will have regular
git builds again hopefully soon.

> Of course, since dependencies aren't really modified everyday, it's a
> bit of a niche usecase. That's why I was asking for feedback before
> going further :-)
> 
> Regards,
> 
> Anisse
> 
> --
> Check out the vibrant tech community on one of the world's most
> engaging tech sites, SlashDot.org! http://sdm.link/slashdot
> ___
> enlightenment-devel mailing list
> enlightenment-devel@lists.sourceforge.net
> https://lists.sourceforge.net/lists/listinfo/enlightenment-devel
> 

-- 

Simon Lees (Simotek)http://simotek.net

Emergency Update Team   keybase.io/simotek
SUSE Linux   Adelaide Australia, UTC+10:30
GPG Fingerprint: 5B87 DB9D 88DC F606 E489 CEC5 0922 C246 02F0 014B



signature.asc
Description: OpenPGP digital signature
--
Check out the vibrant tech community on one of the world's most
engaging tech sites, SlashDot.org! http://sdm.link/slashdot___
enlightenment-devel mailing list
enlightenment-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-devel

Re: [E-devel] cmake attempt

2017-02-01 Thread Felipe Magno de Almeida 
On Feb 1, 2017 9:03 AM, "Stefan Schmidt"  wrote:

Hello.

On 24/01/17 03:47, Carsten Haitzler (The Rasterman) wrote:
> On Tue, 24 Jan 2017 00:07:19 -0200 Gustavo Sverzut Barbieri
>  said:
>
>> On Mon, Jan 23, 2017 at 10:59 PM, Carsten Haitzler 
>> wrote:
>>> On Tue, 24 Jan 2017 10:39:46 +1030 Simon Lees  said:
>>>


 On 01/24/2017 10:16 AM, Carsten Haitzler (The Rasterman) wrote:
> On Mon, 23 Jan 2017 16:50:04 -0200 Gustavo Sverzut Barbieri
>  said:
>
>> Hi all,
>>
>> Just merged the branch Marcel and I were working (actually we
couldn't
>> share a branch since we cannot push to other developer's branch and
we
>> cannot create a shared one).
>>
>> We'll work in tree, so we avoid conflicts as we do renames and change
>> the #defines.
>>
>> See TODO-cmake.txt on how you should help.
>
> hey just a sec... do we have to do this NOW?  for now we've been
> discussing "is it possible" and "how can it be done" and "here's a
> test". we haven't discussed when we should do this and a final "how" i
> guess... so before leaping into it... let's make sure everyone is ont
he
> same page...
>
> you're working entirely in a branch atm or in master? i am reading my
> morning email and haven't looked at git commits yet...
>

 Well now is a good time given that people are actually doing it which
 means I guess they have time maybe in 3 months they wont, also no one
 has been jumping up and down for a release but I guess we are meant to
 be hitting a stabilization period before a release sometime soon. Its
 probably as good a time as any though.
>>
>> we tried to use a branch, but neither of us could create the shared
>> branch and syncing 2 rebase branches is painful. Thus we moved to
>> master, which shouldn't break for autotools folks -- just more noise
>> (however hopefully people will see some action and will jump to help).
>
> well seeing the commits is good. i just kind of think we may be jumping
in a
> bit fast... :)
>
>>> well this is a massive change... "stage 0" isn't  (fixing up
defines/ifdefs
>>> and tree consistency)... but the rest is a massive bucket of stuff... :/
>>
>> we're still seeing lots of changes in cmake/ folder because as we add
>> libraries and match more what autotools did, we see issues that must
>> be fixed.
>>
>> Hopefully this should settle soon.
>
> ok. i just wasn't expecting a leap into master so fast... at least some
kind of
> "let's have a plan" thing... :) but on the other side... the fact people
are
> energized enough to work on it is great. so i'm loathe to shut that down.
i'm
> more thinking "do we make this part of 1.19 release or just do this as a
> background task until after 1.19"... :)

I would strongly say we can keep working on it but not making it
official for 1.19. It will take some more time to actually cover what we
have right now (or what we want it to cover) and afterwards some more
time to work out all the bugs and quirks to cater hour diverse user base.


Gustavo doesn't seem to be targeting 1.19 when we talked in IRC. I'd really
like that the cmake release would come with the merge of EFL libraries,
since that should be easier in cmake IIRC.

regards
Stefan Schmidt


--
Check out the vibrant tech community on one of the world's most
engaging tech sites, SlashDot.org! http://sdm.link/slashdot
___
enlightenment-devel mailing list
enlightenment-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-devel
--
Check out the vibrant tech community on one of the world's most
engaging tech sites, SlashDot.org! http://sdm.link/slashdot
___
enlightenment-devel mailing list
enlightenment-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-devel

[EGIT] [core/efl] master 02/02: cmake: emile is depending on efl

2017-02-01 Thread Marcel Hollerbach 
bu5hm4n pushed a commit to branch master.

http://git.enlightenment.org/core/efl.git/commit/?id=d4673c0740bf667b9c89cb6e32f1600019c7a4e1

commit d4673c0740bf667b9c89cb6e32f1600019c7a4e1
Author: Marcel Hollerbach 
Date:   Wed Feb 1 12:19:24 2017 +0100

cmake: emile is depending on efl

there is some .eot.h file included from the efl interfaces, so we need a
dependency here
---
 src/lib/emile/CMakeLists.txt | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/lib/emile/CMakeLists.txt b/src/lib/emile/CMakeLists.txt
index 899013c..544a50d 100644
--- a/src/lib/emile/CMakeLists.txt
+++ b/src/lib/emile/CMakeLists.txt
@@ -8,6 +8,7 @@ set(PKG_CONFIG_REQUIRES_PRIVATE
 
 set(LIBRARIES
   eina
+  efl
   m
   support-rg_etc
 )

--

Re: [E-devel] cmake attempt

2017-02-01 Thread marcel-hollerbach 
Hello,

There was a problem with libjpeg detection, this should be fixed now,
can you test again?

Greetings
   Marcel Hollerbach

On Wed, Feb 01, 2017 at 11:56:10AM +0100, Stefan Schmidt wrote:
> Hello.
> 
> On 20/01/17 00:17, Gustavo Sverzut Barbieri wrote:
> > Hi all,
> >
> > Marcel Hollerbach did a nice work and started a branch 
> > devs/bu5hm4n/cmake-port
> >
> > After some review, I shared my experience with CMake and did a
> > complement trying to simplify it: devs/barbieri/cmake
> > (https://git.enlightenment.org/core/efl.git/log/?h=devs/barbieri/cmake)
> >
> > As you can see, complexities are hidden from the user using some
> > macros/functions defined in cmake/helper/EflMacros.cmake
> >
> > At the toplevel directory you simply say: EFL_LIB(eina)
> >
> > Then the macro will include whenever appropriate
> > src/{lib,bin,modules,tests}/eina and do the right action. You can see
> > from sub-CMakeLists.txt how simple they become, basically define some
> > variables (which makes it simpler for us to change to a new build
> > system next time).
> >
> > There are some restrictions in that, which I'd like to keep and
> > instead of work-around in the build system, change the code to reflect
> > that:
> >
> >  - one library per directory, offenders are efreet_mime/efreet_thrash
> > and possibly others;
> >
> >  - modules should install
> > ${libdir}/${libname}/modules/${scope}/${modname}/v-${VMAJ}.${VMIN}/module.so,
> > currently some libs miss "/modules", like ecore/system
> >
> > If you want to try it out, be aware that binaries are still not
> > handled and eina_suite still doesn't work. And I'm forcing out-of-tree
> > builds, so we fix that for once and for all:
> >
> >mkdir -p build && cmake -H. -Bbuild && cd build && make
> 
> I'm two weeks on vacation and you folks use that time to switch the 
> build system? Teaching me a lesson not going on vacation? :P
> 
> More seriously. Before I can really comment on it I wanted to use it for 
> a while. My first attempt today failed though.
> 
> stefan@workmachine efl (master) $ mkdir -p build && cmake -H. -Bbuild && 
> cd build && make
> -- The C compiler identification is GNU 5.3.1
> -- The CXX compiler identification is GNU 5.3.1
> -- Check for working C compiler: /usr/lib64/ccache/cc
> -- Check for working C compiler: /usr/lib64/ccache/cc -- works
> -- Detecting C compiler ABI info
> -- Detecting C compiler ABI info - done
> -- Detecting C compile features
> -- Detecting C compile features - done
> -- Check for working CXX compiler: /usr/lib64/ccache/c++
> -- Check for working CXX compiler: /usr/lib64/ccache/c++ -- works
> -- Detecting CXX compiler ABI info
> -- Detecting CXX compiler ABI info - done
> -- Detecting CXX compile features
> -- Detecting CXX compile features - done
> VERSION 1.18.99.52337
> -- Found PkgConfig: /usr/bin/pkg-config (found version "0.28")
> -- Looking for pthread.h
> -- Looking for pthread.h - found
> -- Looking for pthread_create
> -- Looking for pthread_create - not found
> -- Looking for pthread_create in pthreads
> -- Looking for pthread_create in pthreads - not found
> -- Looking for pthread_create in pthread
> -- Looking for pthread_create in pthread - found
> -- Found Threads: TRUE
> -- Checking for module 'check'
> --   Found check, version 0.10.0
> -- Checking for module 'libsystemd'
> --   Found libsystemd, version 222
> -- Checking for module 'valgrind'
> --   Found valgrind, version 3.11.0
> -- Checking for module 'openssl>=1.0'
> --   Found openssl, version 1.0.2j
> -- Checking for module 'gnutls>=2.12.16'
> --   Found gnutls, version 3.4.15
> -- Checking for module 'libjpeg'
> --   Package 'libjpeg' not found
> CMake Error at /usr/share/cmake/Modules/FindPkgConfig.cmake:360 (message):
>A required package was not found
> Call Stack (most recent call first):
>/usr/share/cmake/Modules/FindPkgConfig.cmake:522 
> (_pkg_check_modules_internal)
>cmake/config/common.cmake:13 (pkg_check_modules)
>CMakeLists.txt:33 (include)
> 
> 
> -- Configuring incomplete, errors occurred!
> See also "/home/stefan/EFL/efl/build/CMakeFiles/CMakeOutput.log".
> See also "/home/stefan/EFL/efl/build/CMakeFiles/CMakeError.log".
> 
> That is on the same machine where I do all my work and the autotools 
> build works fine. No idea why it does not find libjpeg. cmake version is 
> 3.4.3. To old? any other hints on this?
> 
> regards
> Stefan Schmidt
> 
> --
> Check out the vibrant tech community on one of the world's most
> engaging tech sites, SlashDot.org! http://sdm.link/slashdot
> ___
> enlightenment-devel mailing list
> enlightenment-devel@lists.sourceforge.net
> https://lists.sourceforge.net/lists/listinfo/enlightenment-devel

--
Check out the vibrant tech community on one of the world's most
engaging tech sites, SlashDot.org!

[EGIT] [core/efl] master 01/02: cmake: use the jpeg module of cmake to find the library

2017-02-01 Thread Marcel Hollerbach 
bu5hm4n pushed a commit to branch master.

http://git.enlightenment.org/core/efl.git/commit/?id=8dc1166eaa15c3e288e1126e281d318ab96c4c89

commit 8dc1166eaa15c3e288e1126e281d318ab96c4c89
Author: Marcel Hollerbach 
Date:   Wed Feb 1 12:18:33 2017 +0100

cmake: use the jpeg module of cmake to find the library

finding libjpeg can be a bit more complex, there are systems that are
not delivering a .pc for it. So we should just use the cmake module to
find it.
---
 cmake/config/common.cmake| 5 -
 src/lib/emile/CMakeLists.txt | 3 ++-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/cmake/config/common.cmake b/cmake/config/common.cmake
index d95d0ec..96b105c 100644
--- a/cmake/config/common.cmake
+++ b/cmake/config/common.cmake
@@ -2,6 +2,7 @@ include(CheckSymbolExists)
 include(CheckIncludeFile)
 include(CheckTypeSize)
 include(FindPkgConfig)
+include(FindJPEG)
 include(CTest)
 find_package(Threads REQUIRED)
 
@@ -10,7 +11,9 @@ pkg_check_modules(LIBSYSTEMD libsystemd)
 pkg_check_modules(VALGRIND valgrind)
 pkg_check_modules(OPENSSL openssl>=1.0)
 pkg_check_modules(GNUTLS gnutls>=2.12.16)
-pkg_check_modules(LIBJPEG libjpeg REQUIRED)
+if (NOT JPEG_FOUND)
+  error("a jpeg library is needed.")
+endif()
 
 set(SUGGEST_VALGRIND OFF)
 if("${BUILD_PROFILE}" STREQUAL "dev")
diff --git a/src/lib/emile/CMakeLists.txt b/src/lib/emile/CMakeLists.txt
index d6c3155..899013c 100644
--- a/src/lib/emile/CMakeLists.txt
+++ b/src/lib/emile/CMakeLists.txt
@@ -2,7 +2,8 @@ set(DESCRIPTION "Library for simplified serialization, 
compression and ciphering
 
 set(PKG_CONFIG_REQUIRES_PRIVATE
   zlib>=1.2.3
-  libjpeg
+  #libjpeg is hard to find. there is a cmake module that does find it. and 
thats checked in common.cmake
+  #libjpeg
 )
 
 set(LIBRARIES

--

Re: [E-devel] cmake attempt

2017-02-01 Thread Stefan Schmidt 
Hello.

On 24/01/17 03:47, Carsten Haitzler (The Rasterman) wrote:
> On Tue, 24 Jan 2017 00:07:19 -0200 Gustavo Sverzut Barbieri
>  said:
>
>> On Mon, Jan 23, 2017 at 10:59 PM, Carsten Haitzler 
>> wrote:
>>> On Tue, 24 Jan 2017 10:39:46 +1030 Simon Lees  said:
>>>


 On 01/24/2017 10:16 AM, Carsten Haitzler (The Rasterman) wrote:
> On Mon, 23 Jan 2017 16:50:04 -0200 Gustavo Sverzut Barbieri
>  said:
>
>> Hi all,
>>
>> Just merged the branch Marcel and I were working (actually we couldn't
>> share a branch since we cannot push to other developer's branch and we
>> cannot create a shared one).
>>
>> We'll work in tree, so we avoid conflicts as we do renames and change
>> the #defines.
>>
>> See TODO-cmake.txt on how you should help.
>
> hey just a sec... do we have to do this NOW?  for now we've been
> discussing "is it possible" and "how can it be done" and "here's a
> test". we haven't discussed when we should do this and a final "how" i
> guess... so before leaping into it... let's make sure everyone is ont he
> same page...
>
> you're working entirely in a branch atm or in master? i am reading my
> morning email and haven't looked at git commits yet...
>

 Well now is a good time given that people are actually doing it which
 means I guess they have time maybe in 3 months they wont, also no one
 has been jumping up and down for a release but I guess we are meant to
 be hitting a stabilization period before a release sometime soon. Its
 probably as good a time as any though.
>>
>> we tried to use a branch, but neither of us could create the shared
>> branch and syncing 2 rebase branches is painful. Thus we moved to
>> master, which shouldn't break for autotools folks -- just more noise
>> (however hopefully people will see some action and will jump to help).
>
> well seeing the commits is good. i just kind of think we may be jumping in a
> bit fast... :)
>
>>> well this is a massive change... "stage 0" isn't  (fixing up defines/ifdefs
>>> and tree consistency)... but the rest is a massive bucket of stuff... :/
>>
>> we're still seeing lots of changes in cmake/ folder because as we add
>> libraries and match more what autotools did, we see issues that must
>> be fixed.
>>
>> Hopefully this should settle soon.
>
> ok. i just wasn't expecting a leap into master so fast... at least some kind 
> of
> "let's have a plan" thing... :) but on the other side... the fact people are
> energized enough to work on it is great. so i'm loathe to shut that down. i'm
> more thinking "do we make this part of 1.19 release or just do this as a
> background task until after 1.19"... :)

I would strongly say we can keep working on it but not making it 
official for 1.19. It will take some more time to actually cover what we 
have right now (or what we want it to cover) and afterwards some more 
time to work out all the bugs and quirks to cater hour diverse user base.

regards
Stefan Schmidt

--
Check out the vibrant tech community on one of the world's most
engaging tech sites, SlashDot.org! http://sdm.link/slashdot
___
enlightenment-devel mailing list
enlightenment-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-devel

Re: [E-devel] cmake attempt

2017-02-01 Thread Stefan Schmidt 
Hello.

On 20/01/17 00:17, Gustavo Sverzut Barbieri wrote:
> Hi all,
>
> Marcel Hollerbach did a nice work and started a branch devs/bu5hm4n/cmake-port
>
> After some review, I shared my experience with CMake and did a
> complement trying to simplify it: devs/barbieri/cmake
> (https://git.enlightenment.org/core/efl.git/log/?h=devs/barbieri/cmake)
>
> As you can see, complexities are hidden from the user using some
> macros/functions defined in cmake/helper/EflMacros.cmake
>
> At the toplevel directory you simply say: EFL_LIB(eina)
>
> Then the macro will include whenever appropriate
> src/{lib,bin,modules,tests}/eina and do the right action. You can see
> from sub-CMakeLists.txt how simple they become, basically define some
> variables (which makes it simpler for us to change to a new build
> system next time).
>
> There are some restrictions in that, which I'd like to keep and
> instead of work-around in the build system, change the code to reflect
> that:
>
>  - one library per directory, offenders are efreet_mime/efreet_thrash
> and possibly others;
>
>  - modules should install
> ${libdir}/${libname}/modules/${scope}/${modname}/v-${VMAJ}.${VMIN}/module.so,
> currently some libs miss "/modules", like ecore/system
>
> If you want to try it out, be aware that binaries are still not
> handled and eina_suite still doesn't work. And I'm forcing out-of-tree
> builds, so we fix that for once and for all:
>
>mkdir -p build && cmake -H. -Bbuild && cd build && make

I'm two weeks on vacation and you folks use that time to switch the 
build system? Teaching me a lesson not going on vacation? :P

More seriously. Before I can really comment on it I wanted to use it for 
a while. My first attempt today failed though.

stefan@workmachine efl (master) $ mkdir -p build && cmake -H. -Bbuild && 
cd build && make
-- The C compiler identification is GNU 5.3.1
-- The CXX compiler identification is GNU 5.3.1
-- Check for working C compiler: /usr/lib64/ccache/cc
-- Check for working C compiler: /usr/lib64/ccache/cc -- works
-- Detecting C compiler ABI info
-- Detecting C compiler ABI info - done
-- Detecting C compile features
-- Detecting C compile features - done
-- Check for working CXX compiler: /usr/lib64/ccache/c++
-- Check for working CXX compiler: /usr/lib64/ccache/c++ -- works
-- Detecting CXX compiler ABI info
-- Detecting CXX compiler ABI info - done
-- Detecting CXX compile features
-- Detecting CXX compile features - done
VERSION 1.18.99.52337
-- Found PkgConfig: /usr/bin/pkg-config (found version "0.28")
-- Looking for pthread.h
-- Looking for pthread.h - found
-- Looking for pthread_create
-- Looking for pthread_create - not found
-- Looking for pthread_create in pthreads
-- Looking for pthread_create in pthreads - not found
-- Looking for pthread_create in pthread
-- Looking for pthread_create in pthread - found
-- Found Threads: TRUE
-- Checking for module 'check'
--   Found check, version 0.10.0
-- Checking for module 'libsystemd'
--   Found libsystemd, version 222
-- Checking for module 'valgrind'
--   Found valgrind, version 3.11.0
-- Checking for module 'openssl>=1.0'
--   Found openssl, version 1.0.2j
-- Checking for module 'gnutls>=2.12.16'
--   Found gnutls, version 3.4.15
-- Checking for module 'libjpeg'
--   Package 'libjpeg' not found
CMake Error at /usr/share/cmake/Modules/FindPkgConfig.cmake:360 (message):
   A required package was not found
Call Stack (most recent call first):
   /usr/share/cmake/Modules/FindPkgConfig.cmake:522 
(_pkg_check_modules_internal)
   cmake/config/common.cmake:13 (pkg_check_modules)
   CMakeLists.txt:33 (include)


-- Configuring incomplete, errors occurred!
See also "/home/stefan/EFL/efl/build/CMakeFiles/CMakeOutput.log".
See also "/home/stefan/EFL/efl/build/CMakeFiles/CMakeError.log".

That is on the same machine where I do all my work and the autotools 
build works fine. No idea why it does not find libjpeg. cmake version is 
3.4.3. To old? any other hints on this?

regards
Stefan Schmidt

--
Check out the vibrant tech community on one of the world's most
engaging tech sites, SlashDot.org! http://sdm.link/slashdot
___
enlightenment-devel mailing list
enlightenment-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-devel

Re: [E-devel] Weekend project: distro-builder

2017-02-01 Thread anisse 
On Wed, Feb 01, 2017 at 02:48:27PM +1030, Simon Lees wrote:
> 
> On openSUSE atleast you can just install then uninstall efl-devel this
> will pull in all the deps automatically as the packages are kept up to
> date.  Alternately the current list is available here,
> https://build.opensuse.org/package/view_file/X11:Enlightenment:Factory/efl/efl.spec?expand=1
> 
> 
> Cheers
> -- 
> 
> Simon Lees (Simotek)http://simotek.net


Thanks Simon, great job on the packaging. It's true that in your case
"zypper si -d efl-devel" would be sufficient for the published version,
but what about git? What if a dev/CI wants to test that the current
git master or branch it still builds on openSUSE, but doesn't run
openSUSE? My goal was also to automate this properly.

Of course, since dependencies aren't really modified everyday, it's a
bit of a niche usecase. That's why I was asking for feedback before
going further :-)

Regards,

Anisse

--
Check out the vibrant tech community on one of the world's most
engaging tech sites, SlashDot.org! http://sdm.link/slashdot
___
enlightenment-devel mailing list
enlightenment-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-devel

Re: [E-devel] cmake attempt

2017-02-01 Thread Stefan Schmidt 
Hello.

On 25/01/17 11:26, Simon Lees wrote:
>
>
> On 01/25/2017 08:40 PM, Andrii Kroitor wrote:
>> Hello
>>
>> I'm very excited to see steps towards CMake :)
>> Is there any reason to limit minimum version to 3.7? Current unbuntu
>> release has cmake version 3.5.1 included.
>> Looks like with 3.5 cmake step passes ok, but build fails on eo files
>> generation. I'm wondering if it is because of some missing cmake
>> features or simply because work is in progress.
>>
>
> It would be good to target something that most distro's have, from
> memory there arn't many new features after 3.1 so maybe thats a version
> worth targeting.

I downgraded the minimum version now to 3.4. If Marcel and Gustavo can 
confirm that there is nothing from  > 3.1 that is needed dropping it to 
this would be even better.

regards
Stefan Schmidt

--
Check out the vibrant tech community on one of the world's most
engaging tech sites, SlashDot.org! http://sdm.link/slashdot
___
enlightenment-devel mailing list
enlightenment-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-devel

[EGIT] [core/efl] master 02/02: cmake: fix efl version number

2017-02-01 Thread Stefan Schmidt 
stefan pushed a commit to branch master.

http://git.enlightenment.org/core/efl.git/commit/?id=07f3557fb8cba03589bb2350dc14184f058c7ea4

commit 07f3557fb8cba03589bb2350dc14184f058c7ea4
Author: Stefan Schmidt 
Date:   Wed Feb 1 11:42:03 2017 +0100

cmake: fix efl version number

We are in the merge window for 1.19 so our number is actually 1.18.99
---
 CMakeLists.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index b59d4d6..ff29bed 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -5,7 +5,7 @@ set(CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/cmake/helpers")
 include(GNUInstallDirs)
 include(EflMacros)
 
-EFL_PROJECT(1.19.99)
+EFL_PROJECT(1.18.99)
 
 if(${CMAKE_SOURCE_DIR} STREQUAL ${CMAKE_BINARY_DIR})
   message(FATAL_ERROR "In-source builds not allowed. Use: mkdir -p build && 
cmake -H. -Bbuild")

--

[EGIT] [core/efl] master 01/02: cmake: downgrade minimum cmake version to 3.4

2017-02-01 Thread Stefan Schmidt 
stefan pushed a commit to branch master.

http://git.enlightenment.org/core/efl.git/commit/?id=fbb865bccbb2059de0188aa405ce24c24afc845a

commit fbb865bccbb2059de0188aa405ce24c24afc845a
Author: Stefan Schmidt 
Date:   Wed Feb 1 11:40:25 2017 +0100

cmake: downgrade minimum cmake version to 3.4

There seems really no reason to have such a new version as 3.7 as minimum
here. MAybe even go down to 3.1 as suggested on the mailing list.
---
 CMakeLists.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 6a24368..b59d4d6 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 3.7)
+cmake_minimum_required(VERSION 3.4)
 
 set(CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/cmake/helpers")
 

--

[EGIT] [core/efl] master 01/01: elm_code: add copy/paste/cut undo

2017-02-01 Thread YeongJong Lee 
ajwillia-ms pushed a commit to branch master.

http://git.enlightenment.org/core/efl.git/commit/?id=251469e2fecdecd338262ed93919cea4100bdd11

commit 251469e2fecdecd338262ed93919cea4100bdd11
Author: YeongJong Lee 
Date:   Wed Feb 1 09:08:14 2017 +

elm_code: add copy/paste/cut undo

Summary: The patch for supporting copy,paste and cut undo

Test Plan:
1. elementary_test - Code Editor
2. Check that undo work correctly when copy,paste and cut

Reviewers: ajwillia.ms

Reviewed By: ajwillia.ms

Subscribers: cedric, jpeg

Differential Revision: https://phab.enlightenment.org/D4636
---
 src/lib/elementary/elm_code_widget.c   |  6 ++---
 src/lib/elementary/elm_code_widget_private.h   |  2 ++
 src/lib/elementary/elm_code_widget_selection.c | 32 +++---
 3 files changed, 33 insertions(+), 7 deletions(-)

diff --git a/src/lib/elementary/elm_code_widget.c 
b/src/lib/elementary/elm_code_widget.c
index 6d17db2..199d19a 100644
--- a/src/lib/elementary/elm_code_widget.c
+++ b/src/lib/elementary/elm_code_widget.c
@@ -1221,9 +1221,7 @@ _elm_code_widget_change_create(unsigned int start_col, 
unsigned int start_line,
info->end_col = end_col;
info->end_line = end_line;
 
-   info->content = malloc((length + 1) * sizeof(char));
-   strncpy(info->content, text, length);
-   info->content[length] = '\0';
+   info->content = strndup(text, length);
info->length = length;
 
return info;
@@ -1251,7 +1249,7 @@ _elm_code_widget_change_selection_add(Evas_Object *widget)
 
change = _elm_code_widget_change_create(selection->start_col,
selection->start_line,
-   selection->end_col,
+   selection->end_col + 1,
selection->end_line,
selection_text,
strlen(selection_text),
diff --git a/src/lib/elementary/elm_code_widget_private.h 
b/src/lib/elementary/elm_code_widget_private.h
index 42ed274..9364eff 100644
--- a/src/lib/elementary/elm_code_widget_private.h
+++ b/src/lib/elementary/elm_code_widget_private.h
@@ -68,4 +68,6 @@ EAPI Elm_Code_Widget_Selection_Data 
*elm_code_widget_selection_normalized_get(Ev
 
 void _elm_code_widget_undo_change_add(Evas_Object *widget, 
Elm_Code_Widget_Change_Info *info);
 
+void _elm_code_widget_change_selection_add(Evas_Object *widget);
+
 #endif
diff --git a/src/lib/elementary/elm_code_widget_selection.c 
b/src/lib/elementary/elm_code_widget_selection.c
index 6f4357f..1c4ecde 100644
--- a/src/lib/elementary/elm_code_widget_selection.c
+++ b/src/lib/elementary/elm_code_widget_selection.c
@@ -356,14 +356,17 @@ elm_code_widget_selection_cut(Evas_Object *widget)
 {
char *text;
 
+   if (elm_code_widget_selection_is_empty(widget))
+ return;
+
text = elm_code_widget_selection_text_get(widget);
elm_cnp_selection_set(widget, ELM_SEL_TYPE_CLIPBOARD, ELM_SEL_FORMAT_TEXT, 
text, strlen(text));
elm_cnp_selection_loss_callback_set(widget, ELM_SEL_TYPE_CLIPBOARD, 
_selection_loss_cb, widget);
free(text);
 
+   _elm_code_widget_change_selection_add(widget);
elm_code_widget_selection_delete(widget);
 
-   // TODO construct and pass a change object for cut and paste
efl_event_callback_legacy_call(widget, 
ELM_OBJ_CODE_WIDGET_EVENT_CHANGED_USER, NULL);
 }
 
@@ -372,6 +375,9 @@ elm_code_widget_selection_copy(Evas_Object *widget)
 {
char *text;
 
+   if (elm_code_widget_selection_is_empty(widget))
+ return;
+
text = elm_code_widget_selection_text_get(widget);
elm_cnp_selection_set(widget, ELM_SEL_TYPE_CLIPBOARD, ELM_SEL_FORMAT_TEXT, 
text, strlen(text));
elm_cnp_selection_loss_callback_set(widget, ELM_SEL_TYPE_CLIPBOARD, 
_selection_loss_cb, widget);
@@ -429,8 +435,10 @@ static Eina_Bool
 _selection_paste_cb(void *data, Evas_Object *obj EINA_UNUSED, 
Elm_Selection_Data *ev)
 {
Elm_Code *code;
+   Elm_Code_Line *line;
Elm_Code_Widget *widget;
-   unsigned int row, col;
+   Elm_Code_Widget_Change_Info *change;
+   unsigned int row, col, end_row, end_col, position;
 
widget = (Elm_Code_Widget *)data;
 
@@ -447,7 +455,24 @@ _selection_paste_cb(void *data, Evas_Object *obj 
EINA_UNUSED, Elm_Selection_Data
else
  _selection_paste_multi(widget, code, col, row, ev->data, ev->len - 1);
 
-   // TODO construct and pass a change object for cut and paste
+   elm_obj_code_widget_cursor_position_get(widget, _row, _col);
+
+   line = elm_code_file_line_get(code->file, end_row);
+   position = elm_code_widget_line_text_position_for_column_get(widget, line, 
end_col);
+
+   change = calloc(1, sizeof(Elm_Code_Widget_Change_Info));
+   change->insert = EINA_TRUE;
+   change->start_col = col;
+   change->start_line = row;
+   change->end_col = position;
+   change->end_line = end_row;
+

[EGIT] [core/efl] master 01/01: DnD/Container: fix drag during animation

2017-02-01 Thread Daniel Zaoui 
jackdanielz pushed a commit to branch master.

http://git.enlightenment.org/core/efl.git/commit/?id=0f915ab4973285c1423c9dc49365bb52686db976

commit 0f915ab4973285c1423c9dc49365bb52686db976
Author: Daniel Zaoui 
Date:   Fri Jan 27 12:08:55 2017 +0200

DnD/Container: fix drag during animation

If the user icons are set but animation time is set to 0, the icons are
not deleted, resulting in ghosts images in the application.
Additionally, behavior was badly handled when animation time or timeout
before drag were set to 0.

@fix
---
 src/lib/elementary/elm_cnp.c | 59 +++-
 1 file changed, 36 insertions(+), 23 deletions(-)

diff --git a/src/lib/elementary/elm_cnp.c b/src/lib/elementary/elm_cnp.c
index 7db5dc0..5a32ad5 100644
--- a/src/lib/elementary/elm_cnp.c
+++ b/src/lib/elementary/elm_cnp.c
@@ -5365,44 +5365,50 @@ _cont_obj_drag_start(void *data)
return ECORE_CALLBACK_CANCEL;
 }
 
-void
+static void
 _anim_st_free(Item_Container_Drag_Info *st)
 {  /* Stops and free mem of ongoing animation */
if (st)
  {
 ELM_SAFE_FREE(st->ea, ecore_animator_del);
 Anim_Icon *sti;
+Eo *icon;
 
 EINA_LIST_FREE(st->icons, sti)
   {
  evas_object_del(sti->o);
  free(sti);
   }
-
 st->icons = NULL;
+
+EINA_LIST_FREE(st->user_info.icons, icon)
+  {
+ evas_object_del(icon);
+  }
+st->user_info.icons = NULL;
  }
 }
 
 static inline Eina_List *
-_anim_icons_make(Eina_List *icons)
-{  /* Make local copies of all icons, add them to list */
-   Eina_List *list = NULL, *itr;
+_anim_icons_make(Item_Container_Drag_Info *st)
+{ /* Transfer user icons to animation icons list */
+   Eina_List *list = NULL;
Evas_Object *o;
 
-   EINA_LIST_FOREACH(icons, itr, o)
+   EINA_LIST_FREE(st->user_info.icons, o)
  {  /* Now add icons to animation window */
-Anim_Icon *st = calloc(1, sizeof(*st));
+Anim_Icon *ast = calloc(1, sizeof(*ast));
 
-if (!st)
+if (!ast)
   {
  ERR("Failed to allocate memory for icon!");
  continue;
   }
 
-evas_object_geometry_get(o, >start_x, >start_y, >start_w, 
>start_h);
+evas_object_geometry_get(o, >start_x, >start_y, 
>start_w, >start_h);
 evas_object_show(o);
-st->o = o;
-list = eina_list_append(list, st);
+ast->o = o;
+list = eina_list_append(list, ast);
  }
 
return list;
@@ -5455,7 +5461,7 @@ _drag_anim_start(void *data)
 
st->tm = NULL;
/* Now we need to build an (Anim_Icon *) list */
-   st->icons = _anim_icons_make(st->user_info.icons);
+   st->icons = _anim_icons_make(st);
if (st->user_info.createicon)
  {
 Evas_Object *temp_win = elm_win_add(NULL, "Temp", ELM_WIN_DND);
@@ -5495,18 +5501,20 @@ _cont_obj_anim_start(void *data)
  it,   /* Drag started on this item */
  >user_info))
   {
- if (st->user_info.icons)
-   _drag_anim_start(st);
+ if (EINA_DBL_EQ(st->anim_tm, 0.0))
+_cont_obj_drag_start(st);  /* Start dragging, no anim */
  else
{
-  if (!EINA_DBL_EQ(st->anim_tm, 0.0))
+  if (st->user_info.icons)
+{
+   _drag_anim_start(st);
+}
+  else
 {
// even if we don't manage the icons animation, we have
// to wait until it is finished before beginning drag.
st->tm = ecore_timer_add(st->anim_tm, 
_cont_obj_drag_start, st);
 }
-  else
-_cont_obj_drag_start(st);  /* Start dragging, no anim */
}
   }
  }
@@ -5523,18 +5531,23 @@ _cont_obj_mouse_down(void *data, Evas *e, Evas_Object 
*obj EINA_UNUSED, void *ev
  return;  /* We only process left-click at the moment */
 
Item_Container_Drag_Info *st = data;
-   evas_object_event_callback_add(st->obj, EVAS_CALLBACK_MOUSE_MOVE,
- _cont_obj_mouse_move, st);
+   st->e = e;
+   st->x_down = ev->canvas.x;
+   st->y_down = ev->canvas.y;
 
evas_object_event_callback_add(st->obj, EVAS_CALLBACK_MOUSE_UP,
  _cont_obj_mouse_up, st);
 
ecore_timer_del(st->tm);
 
-   st->e = e;
-   st->x_down = ev->canvas.x;
-   st->y_down = ev->canvas.y;
-   st->tm = ecore_timer_add(st->tm_to_drag, _cont_obj_anim_start, st);
+   if (st->tm_to_drag)
+ {
+st->tm = ecore_timer_add(st->tm_to_drag, _cont_obj_anim_start, st);
+evas_object_event_callback_add(st->obj, EVAS_CALLBACK_MOUSE_MOVE,
+  _cont_obj_mouse_move, st);
+ }
+   else
+  _cont_obj_anim_start(st);
 }
 
 static Eina_Bool elm_drag_item_container_del_internal(Evas_Object