From: Adrian Szyndela <adrian.s@samsung.com>
Date: Fri, 17 Jan 2020 14:27:02 +0000 (+0100)
Subject: Merge 2.56.0 into tizen
X-Git-Tag: submit/tizen/20200131.142009^2~24
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=97184d57b054cb05f47f2521d849a639d9e303ca;p=platform%2Fupstream%2Fglib.git

Merge 2.56.0 into tizen

Change-Id: I69955823f066e16d5884c7bfd0de51e2d165484e
---

97184d57b054cb05f47f2521d849a639d9e303ca
diff --cc gio/Makefile.am
index baacccf,67b7fa9..bb66368
--- a/gio/Makefile.am
+++ b/gio/Makefile.am
@@@ -637,11 -624,7 +632,11 @@@ libgio_2_0_la_CFLAGS += $(LIBMOUNT_CFLA
  libgio_2_0_la_LIBADD += $(LIBMOUNT_LIBS)
  endif
  
 +if LIBDBUSPOLICY
 +libgio_2_0_la_CPPFLAGS += $(LIBDBUSPOLICY1_CFLAGS)
 +endif
 +
- libgio_2_0_la_DEPENDENCIES = $(gio_win32_res) $(gio_def) $(platform_deps)
+ EXTRA_libgio_2_0_la_DEPENDENCIES = $(gio_win32_res) $(gio_def) $(platform_deps)
  
  gio-win32-res.o: gio.rc
  	$(WINDRES) gio.rc $@
diff --cc gio/gdbusconnection.c
index 81f8ece,6f7e5fe..d7f8d99
mode 100755,100644..100755
--- a/gio/gdbusconnection.c
+++ b/gio/gdbusconnection.c