Merge 2.55.0 into tizen

Change-Id: I4672fc63f448f6538a4bd8926ffc85fa47d97648

diff --cc NEWS
Simple merge

diff --cc configure.ac
Simple merge

diff --cc docs/reference/glib/glib-sections.txt
Simple merge

diff --cc gio/Makefile.am
index 37f2712,0cfda50..3663375
--- 1/gio/Makefile.am
--- 2/gio/Makefile.am
+++ b/gio/Makefile.am
@@@ -827,13 -821,11 +835,13 @@@ gio_querymodules_LDADD   = libgio-2.0.l
        $(top_builddir)/gmodule/libgmodule-2.0.la       \
        $(top_builddir)/glib/libglib-2.0.la             \
        $(NULL)
 +gio_querymodules_LDFLAGS       = -pie
  
- gconstructor_as_data.h: $(top_srcdir)/glib/gconstructor.h data-to-c.pl
-       $(AM_V_GEN) $(srcdir)/data-to-c.pl $(top_srcdir)/glib/gconstructor.h gconstructor_code > $@.tmp && mv $@.tmp $@
+ gconstructor_as_data.h: $(top_srcdir)/glib/gconstructor.h data-to-c.py
+       $(AM_V_GEN) $(srcdir)/data-to-c.py $(top_srcdir)/glib/gconstructor.h gconstructor_code $@
  
  glib_compile_schemas_LDADD = $(top_builddir)/glib/libglib-2.0.la
 +glib_compile_schemas_LDFLAGS = -pie
  glib_compile_schemas_SOURCES = \
        gconstructor_as_data.h \
        gvdb/gvdb-format.h              \

diff --cc gio/gdbusaddress.c
Simple merge

diff --cc gio/gdbusauth.c
Simple merge

diff --cc gio/gdbusconnection.c
index 8963af5,421e9ea..26bc164
mode 100755,100644..100755
--- 1/gio/gdbusconnection.c
--- 2/gio/gdbusconnection.c
+++ b/gio/gdbusconnection.c
@@@ -3371,35 -2572,16 +3371,35 @@@ authenticated
    G_LOCK (message_bus_lock);
    if (alive_connections == NULL)
      alive_connections = g_hash_table_new (g_direct_hash, g_direct_equal);
-   g_hash_table_insert (alive_connections, connection, connection);
+   g_hash_table_add (alive_connections, connection);
    G_UNLOCK (message_bus_lock);
  
 -  connection->worker = _g_dbus_worker_new (connection->stream,
 -                                           connection->capabilities,
 -                                           ((connection->flags & G_DBUS_CONNECTION_FLAGS_DELAY_MESSAGE_PROCESSING) != 0),
 -                                           on_worker_message_received,
 -                                           on_worker_message_about_to_be_sent,
 -                                           on_worker_closed,
 -                                           connection);
 +  initially_frozen = (connection->flags & G_DBUS_CONNECTION_FLAGS_DELAY_MESSAGE_PROCESSING) != 0;
 +
 +  if (0)
 +    {
 +    }
 +#ifdef G_OS_UNIX
 +  else if (connection->kdbus_worker)
 +    {
 +      _g_kdbus_worker_associate (connection->kdbus_worker,
 +                                 connection->capabilities,
 +                                 on_worker_message_received,
 +                                 on_worker_message_about_to_be_sent,
 +                                 on_worker_closed,
 +                                 connection);
 +    }
 +#endif
 +  else
 +    {
 +      connection->worker = _g_dbus_worker_new (connection->stream,
 +                                               connection->capabilities,
 +                                               initially_frozen,
 +                                               on_worker_message_received,
 +                                               on_worker_message_about_to_be_sent,
 +                                               on_worker_closed,
 +                                               connection);
 +    }
  
    /* if a bus connection, call org.freedesktop.DBus.Hello - this is how we're getting a name */
    if (connection->flags & G_DBUS_CONNECTION_FLAGS_MESSAGE_BUS_CONNECTION)

diff --cc gio/gdbusmessage.c
Simple merge

diff --cc gio/gdbusnamewatching.h
Simple merge

diff --cc gio/gdbusobjectmanagerclient.c
Simple merge

diff --cc gio/gfile.c
Simple merge

diff --cc gio/gioenums.h
Simple merge

diff --cc gio/tests/Makefile.am
Simple merge

diff --cc glib/Makefile.am
Simple merge

diff --cc glib/gbytes.c
Simple merge

diff --cc glib/gfileutils.c
Simple merge

diff --cc glib/glib-private.c
index a98201d,d2aea9f..6028bce
--- 1/glib/glib-private.c
--- 2/glib/glib-private.c
+++ b/glib/glib-private.c
@@@ -47,11 -47,14 +47,18 @@@ glib__private__ (void
      g_dir_open_with_errno,
      g_dir_new_from_dirp,
  
-     glib_init
 +    g_variant_to_vectors,
 +    g_variant_from_vectors,
 +    g_variant_vectors_deinit,
 +
+     glib_init,
+ 
+ #ifdef G_OS_WIN32
+     g_win32_stat_utf8,
+     g_win32_lstat_utf8,
+     g_win32_readlink_utf8,
+     g_win32_fstat,
+ #endif
    };
  
    return &table;

diff --cc glib/glib-private.h
index 50fe237,31acd93..c93b7a2
--- 1/glib/glib-private.h
--- 2/glib/glib-private.h
+++ b/glib/glib-private.h
@@@ -20,7 -20,7 +20,8 @@@
  
  #include <glib.h>
  #include "gwakeup.h"
 +#include "gvariant-vectors.h"
+ #include "gstdioprivate.h"
  
  #if defined(__GNUC__)
  # define _g_alignof(type) (__alignof__ (type))

diff --cc glib/glib-unix.c
Simple merge

diff --cc glib/gmessages.h
index 14cd1b9,1815186..e7f50d4
--- 1/glib/gmessages.h
--- 2/glib/gmessages.h
+++ b/glib/gmessages.h
@@@ -557,9 -568,10 +568,11 @@@ GPrintFunc      g_set_printerr_handle
   * the result is usually that a critical message is logged and @val is
   * returned from the current function.
   *
 - * If `G_DISABLE_CHECKS` is defined then the check is not performed.  You
 - * should therefore not depend on any side effects of @expr.
 + * If G_DISABLE_CHECKS is defined then the check is not performed.  You
 + * should therefore not depend on any side effects of @expr.  See
 + * g_return_if_fail_se() for a version that guarantees side effects.
+  *
+  * See g_return_if_fail() for guidance on how to debug failure of this check.
   */
  #define g_return_val_if_fail(expr,val) G_STMT_START{ (void)0; }G_STMT_END
  

diff --cc glib/gslice.c
Simple merge

diff --cc glib/gtestutils.c
Simple merge

diff --cc glib/gtestutils.h
Simple merge

diff --cc glib/gvariant-parser.c
Simple merge

diff --cc glib/gvariant.c
Simple merge

diff --cc glib/tests/bytes.c
Simple merge

diff --cc gobject/Makefile.am
Simple merge

diff --cc m4macros/glibtests.m4
Simple merge