release: Update NEWS and bump version for 1.25.1 release

Summary: This also fixes the saving of elementary_config file

Test Plan: execution of elementary_config

Reviewers: jptiz, raster

Reviewed By: raster

Subscribers: johnny1337, cedric, #reviewers, #committers

Tags: #efl

Differential Revision: https://phab.enlightenment.org/D12165

NEWS

@@ -1,7 +1,15 @@
 ==========
-EFL 1.25.0
+EFL 1.25.1
 ==========
 
+Changes since 1.25.0:
+---------------------
+
+Fixes:
+
+   * evas: sw font draw - protect against null pointer access
+   * efreet - windows - still call stat but skip lstat/readlink
+
 Changes since 1.24.0:
 ---------------------
 
@@ -58,7 +66,7 @@ Fixes:
    * edje - calc - handle swallow disappearing mid-calc due to callabcks
    * ecore drm - increase timeout for flips from 0.05 to 2.0 sec
    * docs: Correct the mismatched group name in Evas.
-   * elm - toiolbar - use correct theme icon for more item
+   * elm - toolbar - use correct theme icon for more items
 
 Changes since 1.23.0:
 ---------------------

meson.build

@@ -1,5 +1,5 @@
 project('efl', ['c','cpp'],
-  version: '1.25.0',
+  version: '1.25.1',
   default_options : ['buildtype=release', 'cpp_std=c++11'],
   meson_version : '>=0.50'
 )

src/bin/edje/edje_external_inspector.c

@@ -614,9 +614,7 @@ main(int argc, char **argv)
 
    ecore_app_no_system_modules();
 
-   ecore_init();
    eina_init();
-   edje_init();
 
    _log_dom = eina_log_domain_register
        ("edje_external_inspector", EINA_COLOR_YELLOW);
@@ -628,6 +626,8 @@ main(int argc, char **argv)
         goto error_log;
      }
 
+   edje_init();
+
    arg_index = ecore_getopt_parse(&optdesc, values, argc, argv);
    if (arg_index < 0)
      {
@@ -670,10 +670,9 @@ main(int argc, char **argv)
    free(module_patterns_str);
 
 error_getopt:
+   edje_shutdown();
    eina_log_domain_unregister(_log_dom);
 error_log:
-   edje_shutdown();
-   ecore_shutdown();
    eina_shutdown();
 
    return ret;

src/lib/ecore_file/ecore_file.c

@@ -514,11 +514,11 @@ ecore_file_mv(const char *src, const char *dst)
                }
           }
 #ifdef _WIN32
-          if (errno == EEXIST)
-            {
-               struct _stat s;
-               _stat(dst, &s);
-               if (_S_IFREG & s.st_mode)
+        if (errno == ENOENT)
+          {
+             struct _stat s;
+             _stat(dst, &s);
+             if (_S_IFREG & s.st_mode)
                {
                   ecore_file_unlink(dst);
                   if (rename(src, dst))
@@ -526,7 +526,7 @@ ecore_file_mv(const char *src, const char *dst)
                        return EINA_TRUE;
                     }
                }
-            }
+          }
 #endif
         goto FAIL;
      }

src/lib/efreet/efreet_cache.c

@@ -627,22 +627,24 @@ EAPI Eina_Bool
 efreet_file_cache_fill(const char *file, Efreet_Cache_Check *check)
 {
    struct stat st;
-   ssize_t size = 0;
-   char link[PATH_MAX];
 
    memset(check, 0, sizeof(Efreet_Cache_Check));
-#ifndef _WIN32
+#ifdef _WIN32
+   if (stat(file, &st) != 0) return EINA_FALSE;
+#else
+   ssize_t size = 0;
+
    if (lstat(file, &st) != 0) return EINA_FALSE;
    if (S_ISLNK(st.st_mode))
      {
+        char link[PATH_MAX];
+
         size = readlink(file, link, sizeof(link));
         if ((size > 0) && ((size_t)size >= sizeof(link))) return EINA_FALSE;
         if (stat(file, &st) != 0) return EINA_FALSE;
      }
    if (size > 0) sha1((unsigned char *)link, size, check->link_sha1);
-   else
 #endif
-     memset(check->link_sha1, 0, sizeof(check->link_sha1));
    check->uid    = st.st_uid;
    check->gid    = st.st_gid;
    check->size   = st.st_size;

src/lib/ethumb/ethumb.c

@@ -256,8 +256,6 @@ ethumb_init(void)
    _plugins_ext = eina_hash_string_small_new(NULL);
    EINA_SAFETY_ON_NULL_GOTO(_plugins_ext, error_plugins_ext);
 
-   evas_init();
-   ecore_init();
    ecore_evas_init();
    edje_init();
 
@@ -285,6 +283,8 @@ ethumb_init(void)
    return ++initcount;
 
  error_plugins_ext:
+   edje_shutdown();
+   ecore_evas_shutdown();
    eina_prefix_free(_pfx);
    _pfx = NULL;
 
@@ -312,10 +312,8 @@ ethumb_shutdown(void)
         eina_stringshare_del(_home_thumb_dir);
         eina_stringshare_del(_thumb_category_normal);
         eina_stringshare_del(_thumb_category_large);
-        evas_shutdown();
-        ecore_shutdown();
-        ecore_evas_shutdown();
         edje_shutdown();
+        ecore_evas_shutdown();
         eina_prefix_free(_pfx);
         _pfx = NULL;
         eina_log_domain_unregister(_log_dom);

src/lib/evas/common/evas_font_draw.c

@@ -457,6 +457,8 @@ evas_common_font_glyph_draw(RGBA_Font_Glyph *fg,
    DATA32 coltab[16], col;
    DATA16 mtab[16], v;
 
+   if (!dst) return;
+
    // FIXME: Use dw, dh for scaling glyphs...
    (void) dw;
    (void) dh;

src/modules/ecore_evas/engines/win32/ecore_evas_win32.c

@@ -1219,7 +1219,7 @@ _delivery(void *data, const Eina_Value value EINA_UNUSED, const Eina_Future *dea
      }
    if (mime_type)
      {
-        edata->clipboard.delivery(ee, 0, ECORE_EVAS_SELECTION_BUFFER_COPY_AND_PASTE_BUFFER, mime_type, &slice);
+        edata->clipboard.delivery(ee, 1, ECORE_EVAS_SELECTION_BUFFER_COPY_AND_PASTE_BUFFER, mime_type, &slice);
         EINA_SAFETY_ON_FALSE_GOTO(ecore_win32_clipboard_set((Ecore_Win32_Window *)ee->prop.window, slice.mem, slice.len, mime_type), end);
      }
    else
@@ -1234,18 +1234,21 @@ end:
 static Eina_Bool
 _ecore_evas_win32_selection_claim(Ecore_Evas *ee, unsigned int seat, Ecore_Evas_Selection_Buffer selection, Eina_Array *available_types, Ecore_Evas_Selection_Internal_Delivery delivery, Ecore_Evas_Selection_Internal_Cancel cancel)
 {
+   Ecore_Evas_Engine_Data_Win32 *edata = ee->engine.data;
+
    if (selection != ECORE_EVAS_SELECTION_BUFFER_COPY_AND_PASTE_BUFFER)
      return EINA_FALSE;
 
    if (!delivery && !cancel)
      {
+        edata->clipboard.delivery = NULL;
+        edata->clipboard.cancel = NULL;
+        eina_array_clean(edata->clipboard.available_types);
         ecore_win32_clipboard_clear((Ecore_Win32_Window *)ee->prop.window);
         return EINA_TRUE;
      }
    else
      {
-        Ecore_Evas_Engine_Data_Win32 *edata = ee->engine.data;
-
         if (edata->clipboard.cancel)
           {
              edata->clipboard.cancel(ee, seat, selection);

src/modules/ecore_imf/scim/meson.build

@@ -9,7 +9,7 @@ if not scim_dep.found()
   scim_dep = dependency('scim-1.0')
 endif
 
-mod_deps = [ecore, ecore_imf, ecore_x, ecore_x_deps, ecore_evas, scim_dep, dependency('glib-2.0')]
+mod_deps = [ecore, ecore_imf, ecore_x, ecore_x_ext_deps, ecore_evas, scim_dep, dependency('glib-2.0')]
 
 shared_module(mod_name,
     mod_src,

src/modules/ecore_imf/xim/meson.build

@@ -2,7 +2,7 @@ mod_src = files([
   'ecore_imf_xim.c',
 ])
 
-mod_deps = [ecore, ecore_imf, ecore_input, ecore_x, ecore_x_deps, ecore_evas]
+mod_deps = [ecore, ecore_imf, ecore_input, ecore_x, ecore_x_ext_deps, ecore_evas]
 
 shared_module(mod_name,
     mod_src,

src/modules/evas/engines/software_x11/meson.build

@@ -26,7 +26,7 @@ config_h.set('BUILD_ENGINE_SOFTWARE_XLIB', '1')
 
 #ecore_x_deps carries all the extensions etc. so we dont have to search them twice
 #it looks weird but is right, gl_deps is needed for evas_x_egl.c
-engine_deps += [x11, ecore_x, ecore_x_deps, gl_deps]
+engine_deps += [x11, ecore_x, ecore_x_ext_deps, gl_deps]
 
 shared_module(mod_full_name, engine_src,
   include_directories : config_dir + [engine_include_dir],