diff options
| author | Simon McVittie <simon.mcvittie@collabora.co.uk> | 2012-04-25 19:24:55 +0100 |
|---|---|---|
| committer | Simon McVittie <simon.mcvittie@collabora.co.uk> | 2012-04-25 19:24:55 +0100 |
| commit | e48de6be84f89636f11159b9e7ea56b6dc49d577 (patch) | |
| tree | b3ee3201e6a9200cc4acd843358acbba22dbcb09 | |
| parent | 8734e4a16ff220a7af0fd718ba50f92d23c496cf (diff) | |
| parent | b19e14330fd87228368acd82dc5160ec85cb8243 (diff) | |
| download | dbus-e48de6be84f89636f11159b9e7ea56b6dc49d577.tar.gz | |
Merge branch 'dbus-1.4'
Conflicts:
NEWS
dbus/dbus-internals.c
dbus/dbus-mainloop.c
dbus/dbus-sysdeps-unix.c
dbus/dbus-sysdeps-win.c
dbus/dbus-sysdeps.c
dbus/dbus-sysdeps.h
| -rw-r--r-- | NEWS | 8 | ||||
| -rw-r--r-- | dbus/dbus-sysdeps.h | 6 | ||||
| -rw-r--r-- | test/Makefile.am | 14 |
3 files changed, 17 insertions, 11 deletions
@@ -1,7 +1,13 @@ D-Bus 1.5.14 (UNRELEASED) == -... +Changes: + +• Be more careful about monotonic time vs. real time, fixing DBUS_COOKIE_SHA1 + spec-compliance (fd.o #48580, David Zeuthen) + +• Don't use install(1) within the source/build trees, fixing the build as + non-root when using OpenBSD install(1) (fd.o #48217, Antoine Jacoutot) D-Bus 1.5.12 (2012-03-27) == diff --git a/dbus/dbus-sysdeps.h b/dbus/dbus-sysdeps.h index c03e2f54..4052cda9 100644 --- a/dbus/dbus-sysdeps.h +++ b/dbus/dbus-sysdeps.h @@ -308,12 +308,12 @@ int _dbus_poll (DBusPollFD *fds, void _dbus_sleep_milliseconds (int milliseconds); -void _dbus_get_real_time (long *tv_sec, - long *tv_usec); - void _dbus_get_monotonic_time (long *tv_sec, long *tv_usec); +void _dbus_get_real_time (long *tv_sec, + long *tv_usec); + /** * directory interface */ diff --git a/test/Makefile.am b/test/Makefile.am index 88a0e8cd..0418e595 100644 --- a/test/Makefile.am +++ b/test/Makefile.am @@ -287,14 +287,14 @@ EXTRA_DIST += $(static_data) ## copy tests to builddir so that generated tests and static tests ## are all in one place. all-local: - $(AM_V_at)$(INSTALL) -d data/valid-config-files/session.d + $(AM_V_at)$(MKDIR_P) data/valid-config-files/session.d $(AM_V_at)set -e && \ if test $(srcdir) = . || test $(srcdir) -ef .; then \ echo '-- No need to copy test data as srcdir = builddir'; \ else \ for F in $(static_data); do \ - $(INSTALL) -d $${F%/*}; \ - $(INSTALL_DATA) $(srcdir)/$$F $$F; \ + $(MKDIR_P) $${F%/*}; \ + cp $(srcdir)/$$F $$F; \ done; \ fi @@ -315,9 +315,9 @@ noinst_DATA = $(imported_data) CLEANFILES = $(noinst_DATA) data/valid-config-files/session.conf: $(top_builddir)/bus/session.conf - $(AM_V_at)$(INSTALL) -d data/valid-config-files - $(AM_V_GEN)$(INSTALL_DATA) $< $@ + $(AM_V_at)$(MKDIR_P) data/valid-config-files + $(AM_V_GEN)cp $< $@ data/valid-config-files/system.conf: $(top_builddir)/bus/system.conf - $(AM_V_at)$(INSTALL) -d data/valid-config-files - $(AM_V_GEN)$(INSTALL_DATA) $< $@ + $(AM_V_at)$(MKDIR_P) data/valid-config-files + $(AM_V_GEN)cp $< $@ |