[EGIT] [core/elementary] master 01/01: win32: Fix link of binaries which use functions in Evil

[Vincent Torri]

jpeg pushed a commit to branch master.

http://git.enlightenment.org/core/elementary.git/commit/?id=8ca80c645d647d2d9bbfc94e968aa386f5db344d

commit 8ca80c645d647d2d9bbfc94e968aa386f5db344d
Author: Vincent Torri 
Date:   Mon Jan 18 13:51:51 2016 +0900

win32: Fix link of binaries which use functions in Evil

Reviewers: cedric, jpeg

Differential Revision: https://phab.enlightenment.org/D3578
---
 configure.ac | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/configure.ac b/configure.ac
index 9defc10..37ca46c 100644
--- a/configure.ac
+++ b/configure.ac
@@ -217,10 +217,12 @@ requirement_elm_pc=""
 case "$host_os" in
mingw*)
   requirement_elm_pc="evil >= efl_version"
+  requirement_elm_pc_only="evil >= efl_version"
   ;;
 esac
 
 requirement_elm_pc_only="\
+${requirement_elm_pc_only} \
 efl >= efl_version \
 eina >= efl_version \
 eet >= efl_version \

-- 

[EGIT] [tools/edi] master 01/03: Supress libtool warning on windows

[Andy Williams]

ajwillia-ms pushed a commit to branch master.

http://git.enlightenment.org/tools/edi.git/commit/?id=b42318aaf580b4cc87cd36e3718a0c8469d92c18

commit b42318aaf580b4cc87cd36e3718a0c8469d92c18
Author: Andy Williams 
Date:   Sun Jan 17 17:48:07 2016 +

Supress libtool warning on windows

Thanks to Vincent Torri for the patch
---
 elm_code/src/bin/Makefile.am | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/elm_code/src/bin/Makefile.am b/elm_code/src/bin/Makefile.am
index 74d06a8..847a3c7 100644
--- a/elm_code/src/bin/Makefile.am
+++ b/elm_code/src/bin/Makefile.am
@@ -16,6 +16,3 @@ elm_code_test_main.c \
 elm_code_test_private.h
 
 elm_code_test_LDADD = @EFL_LIBS@ 
$(top_builddir)/elm_code/src/lib/libelm_code.la
-
-elm_code_test_LDFLAGS = @EFL_LTLIBRARY_FLAGS@
-

-- 

[EGIT] [tools/edi] master 03/03: [builder] use builtin sh support in Ecore_Exe

[Andy Williams]

ajwillia-ms pushed a commit to branch master.

http://git.enlightenment.org/tools/edi.git/commit/?id=18f1a87b092834b2aa1b0731543f67f3cf19e887

commit 18f1a87b092834b2aa1b0731543f67f3cf19e887
Author: Andy Williams 
Date:   Sun Jan 17 17:58:53 2016 +

[builder] use builtin sh support in Ecore_Exe

Thanks for the hint Vincent :)
---
 src/lib/edi_builder.c | 18 +++---
 1 file changed, 11 insertions(+), 7 deletions(-)

diff --git a/src/lib/edi_builder.c b/src/lib/edi_builder.c
index 3c90763..b5713de 100644
--- a/src/lib/edi_builder.c
+++ b/src/lib/edi_builder.c
@@ -23,34 +23,38 @@ _edi_builder_build_make(void)
 {
chdir(edi_project_get());
ecore_exe_pipe_run("make", ECORE_EXE_PIPE_READ_LINE_BUFFERED | 
ECORE_EXE_PIPE_READ |
-  ECORE_EXE_PIPE_ERROR_LINE_BUFFERED | 
ECORE_EXE_PIPE_ERROR, NULL);
+  ECORE_EXE_PIPE_ERROR_LINE_BUFFERED | 
ECORE_EXE_PIPE_ERROR |
+  ECORE_EXE_USE_SH, NULL);
 }
 
 EAPI void
 _edi_builder_build_configure(void)
 {
chdir(edi_project_get());
-   ecore_exe_pipe_run("/bin/sh -c \"./configure && make\"",
+   ecore_exe_pipe_run("./configure && make",
   ECORE_EXE_PIPE_READ_LINE_BUFFERED | 
ECORE_EXE_PIPE_READ |
-  ECORE_EXE_PIPE_ERROR_LINE_BUFFERED | 
ECORE_EXE_PIPE_ERROR, NULL);
+  ECORE_EXE_PIPE_ERROR_LINE_BUFFERED | 
ECORE_EXE_PIPE_ERROR |
+  ECORE_EXE_USE_SH, NULL);
 }
 
 EAPI void
 _edi_builder_build_cmake(void)
 {
chdir(edi_project_get());
-   ecore_exe_pipe_run("/bin/sh -c \"mkdir -p build && cd build && cmake .. && 
make && cd ..\"",
+   ecore_exe_pipe_run("mkdir -p build && cd build && cmake .. && make && cd 
..",
   ECORE_EXE_PIPE_READ_LINE_BUFFERED | 
ECORE_EXE_PIPE_READ |
-  ECORE_EXE_PIPE_ERROR_LINE_BUFFERED | 
ECORE_EXE_PIPE_ERROR, NULL);
+  ECORE_EXE_PIPE_ERROR_LINE_BUFFERED | 
ECORE_EXE_PIPE_ERROR |
+  ECORE_EXE_USE_SH, NULL);
 }
 
 EAPI void
 _edi_builder_build_autogen(void)
 {
chdir(edi_project_get());
-   ecore_exe_pipe_run("/bin/sh -c \"./autogen.sh && make \"",
+   ecore_exe_pipe_run("./autogen.sh && make",
   ECORE_EXE_PIPE_READ_LINE_BUFFERED | 
ECORE_EXE_PIPE_READ |
-  ECORE_EXE_PIPE_ERROR_LINE_BUFFERED | 
ECORE_EXE_PIPE_ERROR, NULL);
+  ECORE_EXE_PIPE_ERROR_LINE_BUFFERED | 
ECORE_EXE_PIPE_ERROR |
+  ECORE_EXE_USE_SH, NULL);
 }
 
 EAPI void

-- 

[EGIT] [tools/edi] master 02/03: Fix maybe-uninitialized warnings

[Andy Williams]

ajwillia-ms pushed a commit to branch master.

http://git.enlightenment.org/tools/edi.git/commit/?id=843e03088f0d2c5bb85d6da34244b97fba29

commit 843e03088f0d2c5bb85d6da34244b97fba29
Author: Andy Williams 
Date:   Sun Jan 17 17:51:13 2016 +

Fix maybe-uninitialized warnings
---
 elm_code/src/lib/elm_code_text.c | 8 +---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/elm_code/src/lib/elm_code_text.c b/elm_code/src/lib/elm_code_text.c
index 7e7e994..901b6ae 100644
--- a/elm_code/src/lib/elm_code_text.c
+++ b/elm_code/src/lib/elm_code_text.c
@@ -75,7 +75,7 @@ elm_code_text_strnpos(const char *content, unsigned int 
length, const char *sear
 EAPI int
 elm_code_line_text_strpos(Elm_Code_Line *line, const char *search, int offset)
 {
-   unsigned int length;
+   unsigned int length = 0;
const char *content;
 
content = elm_code_line_text_get(line, );
@@ -212,7 +212,8 @@ elm_code_line_text_remove(Elm_Code_Line *line, unsigned int 
position, int length
 
 EAPI void elm_code_line_text_leading_whitespace_strip(Elm_Code_Line *line)
 {
-   unsigned int length, leading;
+   unsigned int length = 0;
+   unsigned int leading;
const char *content;
 
content = elm_code_line_text_get(line, );
@@ -225,7 +226,8 @@ EAPI void 
elm_code_line_text_leading_whitespace_strip(Elm_Code_Line *line)
 
 EAPI void elm_code_line_text_trailing_whitespace_strip(Elm_Code_Line *line)
 {
-   unsigned int length, trailing;
+   unsigned int length = 0;
+   unsigned int trailing;
const char *content;
 
content = elm_code_line_text_get(line, );

-- 

[EGIT] [core/elementary] master 01/01: Gengrid: improve item_region_show code

[Dave Andreoli]

davemds pushed a commit to branch master.

http://git.enlightenment.org/core/elementary.git/commit/?id=fe3e4cc3eb71017ec3aaa6fa996f56b666fa9fbc

commit fe3e4cc3eb71017ec3aaa6fa996f56b666fa9fbc
Author: Dave Andreoli 
Date:   Sun Jan 17 15:11:29 2016 +0100

Gengrid: improve item_region_show code

There is no need to recalc row and col position of the item, they are 
already stored in the item struct.

The old implementation was calculating wrong values and also was storing 
this wrong values in it->x and it->y, resulting in wrong results for the 
elm_gengrid_item_pos_get() function.

so, at the end,  this is a @fix for the pos_get() function.

Also changed a bit the test to let the gengrid fill the window and thus 
testing behaviour on col/row changes.

I didn't find any regression in all the gengrid tests after this, let me 
know if it broke something for you.
---
 src/bin/test_gengrid.c |  1 +
 src/lib/elm_gengrid.c  | 39 +++
 2 files changed, 8 insertions(+), 32 deletions(-)

diff --git a/src/bin/test_gengrid.c b/src/bin/test_gengrid.c
index 6ba3622..bd74e5b 100644
--- a/src/bin/test_gengrid.c
+++ b/src/bin/test_gengrid.c
@@ -1306,6 +1306,7 @@ test_gengrid4(void *data EINA_UNUSED, Evas_Object *obj 
EINA_UNUSED, void *event_
elm_gengrid_item_class_free(gic);
elm_gengrid_item_show(ti[2579].item, sd->scrollto);
evas_object_size_hint_weight_set(grid, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
+   evas_object_size_hint_align_set(grid, EVAS_HINT_FILL, EVAS_HINT_FILL);
evas_object_size_hint_min_set(grid, 600, 400);
evas_object_show(grid);
sd->grid = grid;
diff --git a/src/lib/elm_gengrid.c b/src/lib/elm_gengrid.c
index 7661995..02b1294 100644
--- a/src/lib/elm_gengrid.c
+++ b/src/lib/elm_gengrid.c
@@ -328,14 +328,13 @@ static void
 _item_show_region(void *data)
 {
Elm_Gengrid_Data *sd = data;
-   Evas_Coord cvw, cvh, it_xpos = 0, it_ypos = 0, col = 0, row = 0, minx = 0, 
miny = 0;
+   Evas_Coord cvw, cvh, it_xpos = 0, it_ypos = 0, minx = 0, miny = 0;
Evas_Coord vw = 0, vh = 0;
Elm_Object_Item *eo_it = NULL;
evas_object_geometry_get(sd->pan_obj, NULL, NULL, , );
 
if ((cvw != 0) && (cvh != 0))
{
-  int x = 0, y = 0;
   if (sd->show_region)
 eo_it = sd->show_it;
   else if (sd->bring_in)
@@ -347,45 +346,21 @@ _item_show_region(void *data)
   eo_do(sd->pan_obj, elm_obj_pan_pos_min_get(, ));
   if (sd->horizontal && (sd->item_height > 0))
 {
-   row = cvh / sd->item_height;
-   if (row <= 0) row = 1;
-   x = (it->position - 1) / row;
-   if (elm_widget_mirrored_get(sd->obj))
- {
-col = sd->item_count / row;
-if (sd->item_count % row == 0)
-  col--;
-x = col - x;
- }
-
-   y = (it->position - 1) % row;
-   if (x >= 1)
- it_xpos = ((x - GG_IT(it)->prev_group) * sd->item_width)
+   if (it->x >= 1)
+ it_xpos = ((it->x - GG_IT(it)->prev_group) * sd->item_width)
 + (GG_IT(it)->prev_group * sd->group_item_width)
 + minx;
else it_xpos = minx;
-   miny = miny + ((cvh - (sd->item_height * row))
-* sd->align_y);
-   it_ypos = y * sd->item_height + miny;
-   it->x = x;
-   it->y = y;
+   it_ypos = it->y * sd->item_height + miny;
 }
   else if (sd->item_width > 0)
 {
-   col = cvw / sd->item_width;
-   if (col <= 0) col = 1;
-   y = (it->position - 1) / col;
-   x = (it->position - 1) % col;
-   it_xpos = x * sd->item_width + minx;
-   if (y >= 1)
- it_ypos = ((y - GG_IT(it)->prev_group) * sd->item_height)
+   it_xpos = it->x * sd->item_width + minx;
+   if (it->y >= 1)
+ it_ypos = ((it->y - GG_IT(it)->prev_group) * sd->item_height)
 + (GG_IT(it)->prev_group * sd->group_item_height)
 + miny;
else it_ypos = miny;
-   minx = minx + ((cvw - (sd->item_width * col))
-* sd->align_x);
-   it->x = x;
-   it->y = y;
 }
 
   switch (sd->scroll_to_type)

--