From 4e583e558003d43d376af201cf8d9158b4c2975f Mon Sep 17 00:00:00 2001 From: Felipe Magno de Almeida Date: Tue, 21 Jul 2020 16:47:54 -0300 Subject: [PATCH 1/2] edje: Fix pending_threads calculation and avoid an infinite loop `pending_threads` was being incremented in every iteration making `edje` wait for inexistent threads. Now it is only incremented before the thread use. Original: 3997580d3a78768c9bea3a7ec75b7e036fb887a9 --- src/bin/edje/edje_cc_out.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/bin/edje/edje_cc_out.c b/src/bin/edje/edje_cc_out.c index 09122e25a5..b9312e57fd 100644 --- a/src/bin/edje/edje_cc_out.c +++ b/src/bin/edje/edje_cc_out.c @@ -1845,7 +1845,6 @@ data_write_mo(Eet_File *ef, int *mo_num) mw->ef = ef; mw->mo_entry = &edje_file->mo_dir->mo_entries[i]; *mo_num += 1; - pending_threads++; po_entry = strdup(mw->mo_entry->mo_src); sub_str = strstr(mw->mo_entry->mo_src, ".po"); @@ -1881,6 +1880,7 @@ data_write_mo(Eet_File *ef, int *mo_num) } else { + pending_threads++; if (threads) ecore_thread_run(data_thread_mo, data_thread_mo_end, NULL, mw); else From 371e96bfca7b09b366405664a7281547148dff71 Mon Sep 17 00:00:00 2001 From: Felipe Magno de Almeida Date: Thu, 13 Aug 2020 11:56:22 -0300 Subject: [PATCH 2/2] edje/elm: Enable examples Original: ab4db7f5f43546546f6a70afd683194656cab408 Depends on: #338 --- meson.build | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/meson.build b/meson.build index 67ae20db3e..bd0c90ab89 100644 --- a/meson.build +++ b/meson.build @@ -479,11 +479,11 @@ subprojects = [ ['efreet' ,[] , false, false, true, false, false, false, true, ['eina', 'efl', 'eo'], []], ['ecore_imf_evas' ,[] , false, true, false, false, false, false, true, ['eina', 'efl', 'eo'], []], ['ephysics' ,['physics'] , false, true, false, false, false, false, true, ['eina', 'efl', 'eo'], []], -['edje' ,[] , false, true, true, false, true, false, true, ['evas', 'eo', 'efl', lua_pc_name], []], +['edje' ,[] , false, true, true, false, true, true, true, ['evas', 'eo', 'efl', lua_pc_name], []], ['emotion' ,['emotion'] , true, true, false, false, true, true, true, ['eina', 'efl', 'eo'], []], ['ethumb' ,['ethumb'] , true, true, true, false, false, false, true, ['eina', 'efl', 'eo'], []], ['ethumb_client' ,['ethumb'] , false, true, true, false, false, true, true, ['eina', 'efl', 'eo', 'ethumb'], []], -['elementary' ,[] , true, true, true, true, true, false, true, ['eina', 'efl', 'eo', 'eet', 'evas', 'ecore', 'ecore-evas', 'ecore-file', 'ecore-input', 'edje', 'ecore-imf', 'ecore-con', 'efreet', 'efreet-mime', 'efreet-trash', 'eio'], ['atspi']], +['elementary' ,[] , true, true, true, true, true, true, true, ['eina', 'efl', 'eo', 'eet', 'evas', 'ecore', 'ecore-evas', 'ecore-file', 'ecore-input', 'edje', 'ecore-imf', 'ecore-con', 'efreet', 'efreet-mime', 'efreet-trash', 'eio'], ['atspi']], ['efl_canvas_wl' ,['wl'] , false, true, true, false, false, false, true, ['eina', 'efl', 'eo', 'evas', 'ecore'], []], ['elua' ,['elua'] , false, true, true, false, true, false, false, ['eina', lua_pc_name], []], ['ecore_wayland' ,['wl-deprecated'] , false, true, false, false, false, false, false, ['eina'], []],