Commit graph

6213 commits

Author SHA1 Message Date
Alex Richardson
3f5bdf0c2d cmake: Detect backtrace() support on platforms such as FreeBSD
On FreeBSD use of backtrace requires linking libexecinfo. The current
check_symbol_exists() will fail due to that missing library. Fortunately,
CMake ships with a FindBacktrace module (at least since 3.0) that can
be used to correctly handle platforms such as FreeBSD (and OpenBSD
according to the FindBacktrace source).
2022-03-24 13:41:19 +00:00
Ralf Habacker
1312fd5f81 Merge branch 'fix-freebsd-environ' into 'master'
Revert "Fix gcc compile error: redundant redeclaration of ‘environ’ [-Werror=redundant-decls]"

See merge request dbus/dbus!277
2022-03-24 13:40:44 +00:00
Alex Richardson
d4dbde9fc5 Revert "Fix gcc compile error: redundant redeclaration of ‘environ’ [-Werror=redundant-decls]"
Breaks the build on FreeBSD which doens't have an environ declaration.
The CMake check_symbol_exists call sets `HAVE_DECL_ENVIRON` to an empty
variable (which means if(DEFINED) suceeds). This normalization should not
be necessary as it will be handled correctly by `#cmakedefine01`. If not,
all the other HAVE_* defines would also be wrong.

This reverts commit e8b34b419e.
2022-03-19 14:50:31 +00:00
Ralf Habacker
25c0aff7e8 Merge branch 'issue-templates' into 'master'
Add bug and feature template for issue tracker

See merge request dbus/dbus!270
2022-03-18 07:47:10 +00:00
Ralf Habacker
46e8904e2b Add feature template 2022-03-18 08:36:35 +01:00
Ralf Habacker
ae0bc8462f Add bug template 2022-03-18 08:36:35 +01:00
Simon McVittie
4d6a568cce Merge branch 'memcmp' into 'master'
sysdeps: Implement _DBUS_DOUBLES_BITWISE_EQUAL with memcmp

See merge request dbus/dbus!274
2022-03-16 15:58:11 +00:00
Simon McVittie
e1273eb115 sysdeps: Implement _DBUS_DOUBLES_BITWISE_EQUAL with memcmp
memcmp is the Standard C way to compare arbitrary regions of memory
bit-by-bit, so let's use it, instead of reinventing it in a way that
violates Standard C aliasing rules.

Signed-off-by: Simon McVittie <smcv@collabora.com>
2022-03-16 14:54:55 +00:00
Ralf Habacker
251bb0be7f tools/ci-build.sh: Define and use variable builddir
Reviewed-by: Simon McVittie <smcv@collabora.com>
2022-03-16 14:19:32 +00:00
Ralf Habacker
721b5429c3 .gitignore: Add sub directory ci-build*
Reviewed-by: Simon McVittie <smcv@collabora.com>
2022-03-16 14:18:18 +00:00
Simon McVittie
65fc23b4f7 Merge branch 'ci-job-names' into 'master'
CI: Adjust job names

See merge request dbus/dbus!262
2022-03-16 14:03:22 +00:00
Ralf Habacker
c692921781 CI: Adjust job names
Job names now provide more information about platform, build environment,
system and configuration, which makes it easier to read.

The names for the build environments has been shorted to commonly known
names e.g. 'mingw64' for 'x86_64-w64-mingw32'.

Signed-off-by: Ralf Habacker <ralf.habacker@freenet.de>
2022-03-09 07:38:24 +00:00
Ralf Habacker
0249d1f5a5 Merge branch 'fix-issue-381' into 'master'
cmake: Fix race condition on creating docbook based files

Closes #381

See merge request dbus/dbus!268
2022-03-08 15:07:13 +00:00
Ralf Habacker
f74fdf06ad cmake: Fix race condition on creating docbook based files
With the previous implementation, race conditions could arise because a
generated intermediate file was used by multiple targets.

To fix the mentioned problem, the macro 'generate_docbook_file' has been
integrated into a in a new macro 'add_docbook' to simplify the dependency
chain and make it easier to use.

When using an xml template with the 'TEMPLATE' parameter, a separate
intermediate xml file is used for each generated output file to avoid
overwriting each other, which was the main cause of the described problem.

Due to the adaptation of the calling conventions it was necessary to
introduce the parameter 'MAN_CATEGORY'.

Fixes #381

Signed-off-by: Ralf Habacker <ralf.habacker@freenet.de>
2022-03-04 09:18:01 +00:00
Ralf Habacker
5c14cfbf0e Merge branch 'fix-issue-375-1' into 'master'
cmake: fix setting DBUS_*_CONFIG_FILE on non win32 platform

See merge request dbus/dbus!267
2022-03-04 07:26:15 +00:00
Ralf Habacker
6c21072a1e cmake: Set DBUS_*_CONFIG_FILE to be in datadir on Unix
The files were installed to the datadir (usually /usr/share) since
commit 70950325, but the macros used to implement dbus-daemon --system
and dbus-daemon --session still looked for them in the sysconfdir
(usually /etc).

Fixes: 70950325 "Adjust cmake build to match autoconf installation locations"
2022-03-04 08:14:44 +01:00
Ralf Habacker
a0040b9cef Merge branch 'fix-issue-375' into 'master'
cmake: setup variable WORDS_BIGENDIAN correctly

Closes #375

See merge request dbus/dbus!266
2022-03-03 11:45:09 +00:00
Ralf Habacker
d74fee2727 cmake: setup variable WORDS_BIGENDIAN correctly
Since version 3.0 cmake provides the macro test_big_endian for
that purpose.

fixes #375

Signed-off-by: Ralf Habacker <ralf.habacker@freenet.de>
2022-03-02 14:35:54 +01:00
Ralf Habacker
9b426c7916 Add api doc to _dbus_platform_c|rmutex_new()
The documentation has been added to the header to avoid duplication as
these functions are implemented platform specific.

Cherry-picked from merge request dbus/dbus!243

Reviewed-by: @smcv

Signed-off-by: Ralf Habacker <ralf.habacker@freenet.de>
2022-03-02 09:03:40 +01:00
Simon McVittie
20f623c79b Update NEWS
Signed-off-by: Simon McVittie <smcv@collabora.com>
2022-03-01 18:44:30 +00:00
Simon McVittie
e3cb728ee6 Merge branch 'configure_with-x_option' into 'master'
build: Fix logic for --with-x configure option

See merge request dbus/dbus!263
2022-03-01 18:28:06 +00:00
Lars Wendler
c71f013a64
Convert "if" calls to AS_IF macro for the block that handles X11 2022-03-01 19:02:22 +01:00
Lars Wendler
bf3cb42c6d
Add have_x11=no if --without-x was given to make later checks happy 2022-03-01 19:02:15 +01:00
Lars Wendler
17c88a8944
Emit an error when --with-x was given but no X11 libs were found 2022-03-01 19:01:17 +01:00
Lars Wendler
51e468d828
Move DBUS_X_* definitions into PKG_CHECK_MODULES block 2022-03-01 19:01:07 +01:00
Lars Wendler
99cc28e0eb
build: Treat --with-x[=yes] the same as --with-x=auto
Previously, --with-x would disable the check for X11 libraries, which
was not intended.
2022-03-01 18:59:00 +01:00
Simon McVittie
b6880eb675 Merge branch 'bus-inotify-error-handling' into 'master'
bus: Fix error handling for inotify_init()

See merge request dbus/dbus!235
2022-02-28 23:00:58 +00:00
Simon McVittie
25e22b2540 bus: Show the errno if inotify cannot be initialized
Signed-off-by: Simon McVittie <smcv@collabora.com>
2022-02-28 22:50:26 +00:00
Simon McVittie
7e61e0b53b bus: Correct check for inotify_init() failure
fd 0 is a valid fd - although if we are using stdin as our inotify fd,
something is weird somewhere.

Signed-off-by: Simon McVittie <smcv@collabora.com>
2022-02-28 22:50:26 +00:00
Simon McVittie
f0df311466 Revert "spec: Go back to v0.38"
This reverts commit 428f60e8b2.

Signed-off-by: Simon McVittie <smcv@collabora.com>
2022-02-28 18:20:17 +00:00
Simon McVittie
d0cdd94a3e Post-release version bump for 1.15.x
Signed-off-by: Simon McVittie <smcv@collabora.com>
2022-02-28 18:20:08 +00:00
Simon McVittie
6fd1509ba3 Prepare v1.14.0
Resolves: https://gitlab.freedesktop.org/dbus/dbus/-/issues/350
Signed-off-by: Simon McVittie <smcv@collabora.com>
2022-02-28 11:43:32 +00:00
Simon McVittie
428f60e8b2 spec: Go back to v0.38
Nothing changed in v0.39 yet, and it would be confusing to have the
version uploaded alongside dbus 1.14.0 say "not yet finalized".

Signed-off-by: Simon McVittie <smcv@collabora.com>
2022-02-28 11:23:39 +00:00
Simon McVittie
fce6a676d9 Revert "Disable MSVC CI by default for now"
This reverts commit 254b17977e.

Signed-off-by: Simon McVittie <smcv@collabora.com>
2022-02-28 11:22:35 +00:00
Simon McVittie
90a2d9d948 Update AUTHORS
Signed-off-by: Simon McVittie <smcv@collabora.com>
2022-02-28 11:15:32 +00:00
Ralf Habacker
c8ca3ecebc Merge branch 'doc_dbus-api-design_link_fixes' into 'master'
doc/dbus-api-design: fix broken links

See merge request dbus/dbus!257
2022-02-28 08:16:17 +00:00
Michael Nosthoff
bed735b493 doc/dbus-api-design: fix broken links
* use version independent qtdbus url
* developer.gnome.org links moved to developer-old.gnome.org
* bustle now on freedesktop gitlab
2022-02-28 08:01:34 +00:00
Ralf Habacker
fc92ceada7 Merge branch 'mingw-w64-printf' into 'master'
build: Opt out from using mingw-w64's replacement printf(), etc.

Closes #380

See merge request dbus/dbus!261
2022-02-28 07:47:19 +00:00
Simon McVittie
b03cb9f9cd CI: Make most gcc warnings fatal for CMake builds
This makes sure we notice problems early.

Signed-off-by: Simon McVittie <smcv@collabora.com>
2022-02-27 17:09:33 +00:00
Simon McVittie
81e6a5e662 CI: Use current Debian stable release for mingw-w64 builds
Now that we have resolved the failure to build with newer mingw-w64,
we don't need to hold these back to Debian 10 'buster' and can upgrade
to the current stable release, Debian 11 'bullseye'.

Signed-off-by: Simon McVittie <smcv@collabora.com>
2022-02-27 17:05:58 +00:00
Simon McVittie
daf362ee61 build: Opt out from using mingw-w64's replacement printf(), etc.
The Windows code in dbus is careful to use Windows-specific equivalents
of the Standard C features that are not implemented by msvcrt.dll, so
we don't need to substitute a Standard C printf implementation.

This avoids compiler warnings/errors when gcc expects us to be using
Microsoft printf syntax (`ms_printf` attribute), but newer versions of
mingw-w64 expect us to be using GNU or Standard C printf syntax
(`gnu_printf` attribute) as a result of `__USE_MINGW_ANSI_STDIO` being
enabled by default if not otherwise specified.

Resolves: https://gitlab.freedesktop.org/dbus/dbus/-/issues/380
Signed-off-by: Simon McVittie <smcv@collabora.com>
2022-02-27 17:05:56 +00:00
Simon McVittie
71f74ee530 Merge branch 'ci' into 'master'
CI: Update Debian releases

See merge request dbus/dbus!260
2022-02-25 14:55:49 +00:00
Simon McVittie
61cfa140cb CI: Use https to download MSYS packages
Signed-off-by: Simon McVittie <smcv@collabora.com>
2022-02-25 14:08:58 +00:00
Simon McVittie
97c2f9e306 CI: Install ci-certificates
We need this to be able to download MSYS packages now.

Signed-off-by: Simon McVittie <smcv@collabora.com>
2022-02-25 14:08:58 +00:00
Simon McVittie
cfbc3a429e CI: Build on Debian 11 'bullseye' instead of Debian 10 'buster'
This is the current stable release for Debian, making Debian 10 a much
less interesting target for backports. Add a manually-triggered job
so we can still try buster occasionally.

Continue to use buster for mingw-w64 builds until format string issues
with bullseye toolchains can be sorted out.

Signed-off-by: Simon McVittie <smcv@collabora.com>
2022-02-25 14:08:55 +00:00
Simon McVittie
69c610f6f0 CI: Remove EOL versions of Debian and Ubuntu
Debian 9 'stretch' is EOL, and Ubuntu 16.04 is EOL unless you enter into
a special subscription with Canonical. This puts them outside our
informal security-support policy, and realistically, anyone sufficiently
change-averse to be following these distributions is not going to be
backporting a current version of dbus.

Signed-off-by: Simon McVittie <smcv@collabora.com>
2022-02-25 13:54:05 +00:00
Simon McVittie
254b17977e Disable MSVC CI by default for now
The necessary CI runner doesn't seem to be available, and we shouldn't
let that prevent us from merging dbus changes. This can be reverted
when the runner comes back.

Signed-off-by: Simon McVittie <smcv@collabora.com>
2022-02-25 13:54:05 +00:00
Simon McVittie
1df1955b04 build: Fix update-authors rule to work out-of-tree
Signed-off-by: Simon McVittie <smcv@collabora.com>
2022-02-23 19:42:46 +00:00
Simon McVittie
d15a2328f1 AUTHORS: Update from git history
Signed-off-by: Simon McVittie <smcv@collabora.com>
2022-02-23 19:42:26 +00:00
Simon McVittie
21784cacd3 Start development of dbus 1.13.24
Signed-off-by: Simon McVittie <smcv@collabora.com>
2022-02-23 19:40:15 +00:00