Merge 2.56.0 into tizen
authorAdrian Szyndela <adrian.s@samsung.com>
Fri, 17 Jan 2020 14:27:02 +0000 (15:27 +0100)
committerAdrian Szyndela <adrian.s@samsung.com>
Tue, 28 Jan 2020 12:22:42 +0000 (13:22 +0100)
Change-Id: I69955823f066e16d5884c7bfd0de51e2d165484e

1  2 
NEWS
configure.ac
gio/Makefile.am
gio/gdbusconnection.c
gio/gdbusproxy.c
gio/gfile.c

diff --cc NEWS
Simple merge
diff --cc configure.ac
Simple merge
diff --cc gio/Makefile.am
@@@ -637,11 -624,7 +632,11 @@@ libgio_2_0_la_CFLAGS += $(LIBMOUNT_CFLA
  libgio_2_0_la_LIBADD += $(LIBMOUNT_LIBS)
  endif
  
- libgio_2_0_la_DEPENDENCIES = $(gio_win32_res) $(gio_def) $(platform_deps)
 +if LIBDBUSPOLICY
 +libgio_2_0_la_CPPFLAGS += $(LIBDBUSPOLICY1_CFLAGS)
 +endif
 +
+ EXTRA_libgio_2_0_la_DEPENDENCIES = $(gio_win32_res) $(gio_def) $(platform_deps)
  
  gio-win32-res.o: gio.rc
        $(WINDRES) gio.rc $@
Simple merge
diff --cc gio/gfile.c
Simple merge