Commit graph

7053 commits

Author SHA1 Message Date
Simon McVittie
b7ea5a3aad README: Mention the -alpha, -beta, -rc tags since 1.17.x
Signed-off-by: Simon McVittie <smcv@collabora.com>
2024-12-17 12:48:18 +00:00
Simon McVittie
c1a3be5276 README: Stop describing odd/even as Linux kernel versioning
The Linux kernel hasn't used this versioning scheme for years
(the last odd-numbered development branch was 2.5).

We are still using the odd/even versioning scheme, and so are some other
library projects. Cite GLib and SDL as better examples of projects that
still use it.

Signed-off-by: Simon McVittie <smcv@collabora.com>
2024-12-17 12:48:00 +00:00
Simon McVittie
33d4876806 README.win, README.cygwin: Describe dbus4win, etc. as historical
The merge of Windows-specific dbus ports into the same git repository
as the original Unix-only implementation was a long time ago now,
and exists on several stable-branches, not just master.

This also avoids explicitly mentioning the name of the master branch,
which is likely to be renamed to main in future.

Signed-off-by: Simon McVittie <smcv@collabora.com>
2024-12-17 12:45:27 +00:00
Simon McVittie
6ea7644852 README.win: Capitalize "Windows"
Signed-off-by: Simon McVittie <smcv@collabora.com>
2024-12-17 12:43:37 +00:00
Simon McVittie
209ad5c761 README.win: Mention Meson instead of Autotools
The choice of build system is now Meson/CMake rather than Autotools/CMake.

Signed-off-by: Simon McVittie <smcv@collabora.com>
2024-12-17 12:43:25 +00:00
Simon McVittie
7f362782d6 INSTALL, README: Simplify Meson vs. CMake recommendation
Now that 1.16.0 has been released and 1.15.x is EOL, it's misleading
to say that Meson is the recommended build system for Unix only on the
master branch: it's the recommended build system for Unix on the
dbus-1.16 branch, too.

This also avoids explicitly naming the master branch, which is likely
to get renamed to main.

Signed-off-by: Simon McVittie <smcv@collabora.com>
2024-12-17 12:42:36 +00:00
Simon McVittie
8e17865aca CONTRIBUTING: Replace Autotools build options with Meson equivalents
Signed-off-by: Simon McVittie <smcv@collabora.com>
2024-12-17 12:40:48 +00:00
Simon McVittie
3d809e6223 CONTRIBUTING: Update details of the current branch
Signed-off-by: Simon McVittie <smcv@collabora.com>
2024-12-17 12:40:10 +00:00
Simon McVittie
9affc8a09d tools: Fix a cross-reference to Mesa's master branch
Mesa has renamed its default branch to main.

Signed-off-by: Simon McVittie <smcv@collabora.com>
2024-12-17 12:29:37 +00:00
Simon McVittie
5b4dca37f9 build: Bump ABI current and age parameters to distinguish from 1.16.x
Signed-off-by: Simon McVittie <smcv@collabora.com>
2024-12-16 15:29:15 +00:00
Simon McVittie
8301c2c98f Merge branch 'dbus-1.16' 2024-12-16 15:28:29 +00:00
Simon McVittie
69e79b896a Prepare v1.16.0
Signed-off-by: Simon McVittie <smcv@collabora.com>
2024-12-16 12:21:54 +00:00
Simon McVittie
880c3d1f73 Merge branch 'dbus-1.16' 2024-12-16 11:01:14 +00:00
Simon McVittie
971060ad73 NEWS: Update
Signed-off-by: Simon McVittie <smcv@collabora.com>
2024-12-16 11:00:00 +00:00
Simon McVittie
60d6f41c67 INSTALL: libexpat is not required if the dbus-daemon is not built
Signed-off-by: Simon McVittie <smcv@collabora.com>
2024-12-16 10:59:42 +00:00
Simon McVittie
f1a4c1c481 INSTALL: Mention how to build as a Meson subproject
Signed-off-by: Simon McVittie <smcv@collabora.com>
2024-12-16 10:59:20 +00:00
Simon McVittie
25e370ce8f meson: Don't interpolate the result of configure_file() into a format()
configure_file() returns a file object, which was not intended to be a
valid parameter for format() (even though in practice it works the way
we wanted it to), causing newer Meson versions to report deprecation
warnings.

If the version of Meson is new enough, we can use the full_path()
method. Otherwise, we'll have to re-compute the output filename.

Signed-off-by: Simon McVittie <smcv@collabora.com>
(cherry picked from commit 872ce4d29a)
2024-12-16 10:41:31 +00:00
Simon McVittie
7094a4047e meson: Consistently use boolean defaults for boolean options
Meson accepts either booleans or strings as defaults for a boolean
option, but recommends booleans, and raises deprecation warnings for
strings.

Signed-off-by: Simon McVittie <smcv@collabora.com>
(cherry picked from commit dc56afed59)
2024-12-16 10:41:25 +00:00
Simon McVittie
7d3bc75835 Merge branch 'meson' into 'master'
meson: Fix deprecation warnings

See merge request dbus/dbus!507
2024-12-13 17:39:58 +00:00
Simon McVittie
872ce4d29a meson: Don't interpolate the result of configure_file() into a format()
configure_file() returns a file object, which was not intended to be a
valid parameter for format() (even though in practice it works the way
we wanted it to), causing newer Meson versions to report deprecation
warnings.

If the version of Meson is new enough, we can use the full_path()
method. Otherwise, we'll have to re-compute the output filename.

Signed-off-by: Simon McVittie <smcv@collabora.com>
2024-12-13 13:58:01 +00:00
Simon McVittie
dc56afed59 meson: Consistently use boolean defaults for boolean options
Meson accepts either booleans or strings as defaults for a boolean
option, but recommends booleans, and raises deprecation warnings for
strings.

Signed-off-by: Simon McVittie <smcv@collabora.com>
2024-12-13 13:58:01 +00:00
Simon McVittie
b95f7aab26 CI: Use Debian 12 as default container
I don't think we use this for anything any more, because all build
targets run in some more specific container; but just in case it's
used, we should select the current stable release of Debian and not a
previous, EOL version.

Signed-off-by: Simon McVittie <smcv@collabora.com>
(cherry picked from commit 431c78b5fb)
2024-12-13 11:18:27 +00:00
Simon McVittie
3e4a52743e Merge branch 'ci' into 'master'
CI: Use Debian 12 as default container

See merge request dbus/dbus!508
2024-12-13 11:17:30 +00:00
Simon McVittie
431c78b5fb CI: Use Debian 12 as default container
I don't think we use this for anything any more, because all build
targets run in some more specific container; but just in case it's
used, we should select the current stable release of Debian and not a
previous, EOL version.

Signed-off-by: Simon McVittie <smcv@collabora.com>
2024-12-13 11:00:15 +00:00
Simon McVittie
510eca1433 Merge branch 'dbus-1.16' 2024-12-13 10:32:08 +00:00
Simon McVittie
c0adbe9f9c Update NEWS
Signed-off-by: Simon McVittie <smcv@collabora.com>
2024-12-13 10:32:02 +00:00
Ralf Habacker
6740ff8a4a cmake: update minimum required version to 3.10
This fixes a deprecation warning that compatibility with CMake < 3.10
will be removed from a future version of CMake.

Resolves: dbus/dbus#533

Signed-off-by: Ralf Habacker <ralf.habacker@freenet.de>
(cherry picked from commit ca39b3799e)
2024-12-13 10:28:02 +00:00
Ralf Habacker
5c611c9339 cmake: add missing environment variables for running tests
To achieve comparable results with Meson, the test environment should
provide the same set of environment variables when used in the source
code or the test environment.

Resolves: dbus/dbus#541

Signed-off-by: Ralf Habacker <ralf.habacker@freenet.de>
(cherry picked from commit 8a78585514)
2024-12-13 10:27:59 +00:00
Simon McVittie
f455ba12d6 Merge branch 'fix-issue-533' into 'master'
cmake: update minimum required version to 3.10

Closes #533

See merge request dbus/dbus!506
2024-12-13 10:26:40 +00:00
Ralf Habacker
ca39b3799e cmake: update minimum required version to 3.10
This fixes a deprecation warning that compatibility with CMake < 3.10
will be removed from a future version of CMake.

Resolves: dbus/dbus#533

Signed-off-by: Ralf Habacker <ralf.habacker@freenet.de>
2024-12-12 22:03:54 +01:00
Simon McVittie
e6b77c3454 Merge branch 'fix-issue-541' into 'master'
cmake: add missing environment variables for running tests

Closes #541

See merge request dbus/dbus!505
2024-12-12 15:52:20 +00:00
Ralf Habacker
8a78585514 cmake: add missing environment variables for running tests
To achieve comparable results with Meson, the test environment should
provide the same set of environment variables when used in the source
code or the test environment.

Resolves: dbus/dbus#541

Signed-off-by: Ralf Habacker <ralf.habacker@freenet.de>
2024-12-12 16:34:08 +01:00
Simon McVittie
ba0722719c Merge branch 'dbus-1.16' 2024-12-11 16:21:26 +00:00
Simon McVittie
1a470c60c4 Post-release version bump
Signed-off-by: Simon McVittie <smcv@collabora.com>
2024-12-11 16:21:01 +00:00
Simon McVittie
daf657a6b0 Prepare v1.15.92
Signed-off-by: Simon McVittie <smcv@collabora.com>
2024-12-11 13:27:54 +00:00
Simon McVittie
dfadf1b68c Update NEWS
Signed-off-by: Simon McVittie <smcv@collabora.com>
2024-12-11 13:19:40 +00:00
Simon McVittie
08cc615c26 Merge branch 'dbus-1.16' 2024-12-11 13:16:16 +00:00
Simon McVittie
5d88ad15ea Update NEWS
dbus!501 intentionally not mentioned here, it's a purely internal change.

Signed-off-by: Simon McVittie <smcv@collabora.com>
2024-12-11 13:16:10 +00:00
Simon McVittie
ff872f76fb cmake: Use a better bug reference
Signed-off-by: Simon McVittie <smcv@collabora.com>
(cherry picked from commit 648f4c2c37)
2024-12-11 13:13:34 +00:00
Simon McVittie
2565691762 bus: Update a build system cross-reference
We no longer have an Autotools build system, but Meson sets the same
environment variables that Autotools used to set. CMake does not, yet,
but ideally should.

Resolves: https://gitlab.freedesktop.org/dbus/dbus/-/issues/538
Signed-off-by: Simon McVittie <smcv@collabora.com>
(cherry picked from commit 229e48f549)
2024-12-11 13:13:30 +00:00
Mohamed Akram
8e0e949643 sysdeps-unix: Report missing launchd session bus as non-fatal
init_connections_unlocked() is called when connecting to any of the
well-known buses, and it initializes all of the well-known addresses:
session, system and starter. This means that a failure here causes
failure to connect to any one of the well-known buses, even if the
failure is actually only relevant to a different well-known bus.
As such, it should only fail on genuinely fatal errors, for example
an out-of-memory condition. It calls init_session_address() and
indirectly _dbus_lookup_session_address(), which therefore need to
have similar behaviour.

Previously, _dbus_lookup_session_address() would fail with a
fatal error whenever the macOS session bus was not correctly set up,
but that breaks the ability to connect to the system bus on macOS,
even though the system bus is not directly related to the session bus.
Instead, we should report a missing session bus as "not supported",
reserving an unsuccessful result for fatal situations like
out-of-memory. This brings _dbus_lookup_session_address_launchd()
into line with the error behaviour of _dbus_lookup_user_bus().

Closes: #510
(cherry picked from commit 827e952793)
2024-12-11 13:13:17 +00:00
Simon McVittie
648f4c2c37 cmake: Use a better bug reference
Signed-off-by: Simon McVittie <smcv@collabora.com>
2024-12-11 13:02:57 +00:00
Simon McVittie
c45d2992b8 Merge branch 'issue538' into 'master'
bus: Update a build system cross-reference

Closes #538

See merge request dbus/dbus!501
2024-12-11 12:51:55 +00:00
Simon McVittie
229e48f549 bus: Update a build system cross-reference
We no longer have an Autotools build system, but Meson sets the same
environment variables that Autotools used to set. CMake does not, yet,
but ideally should.

Resolves: https://gitlab.freedesktop.org/dbus/dbus/-/issues/538
Signed-off-by: Simon McVittie <smcv@collabora.com>
2024-12-11 12:50:32 +00:00
Simon McVittie
12265328a6 Merge branch 'diagnose-leaked-fd' into 'master'
_dbus_check_fdleaks_leave: Try to describe what the leaked fd is

See merge request dbus/dbus!503
2024-12-11 12:50:14 +00:00
Simon McVittie
3a37279e32 _dbus_check_fdleaks_leave: Try to describe what the leaked fd is
Similar to ebf487ef, but in a different situation.

Signed-off-by: Simon McVittie <smcv@collabora.com>
2024-12-11 12:48:37 +00:00
Simon McVittie
c0f0516662 Merge branch 'fix-macos-system-bus' into 'master'
sysdeps-unix: Report missing launchd session bus as non-fatal

Closes #510

See merge request dbus/dbus!461
2024-12-10 16:53:11 +00:00
Mohamed Akram
827e952793 sysdeps-unix: Report missing launchd session bus as non-fatal
init_connections_unlocked() is called when connecting to any of the
well-known buses, and it initializes all of the well-known addresses:
session, system and starter. This means that a failure here causes
failure to connect to any one of the well-known buses, even if the
failure is actually only relevant to a different well-known bus.
As such, it should only fail on genuinely fatal errors, for example
an out-of-memory condition. It calls init_session_address() and
indirectly _dbus_lookup_session_address(), which therefore need to
have similar behaviour.

Previously, _dbus_lookup_session_address() would fail with a
fatal error whenever the macOS session bus was not correctly set up,
but that breaks the ability to connect to the system bus on macOS,
even though the system bus is not directly related to the session bus.
Instead, we should report a missing session bus as "not supported",
reserving an unsuccessful result for fatal situations like
out-of-memory. This brings _dbus_lookup_session_address_launchd()
into line with the error behaviour of _dbus_lookup_user_bus().

Closes: #510
2024-12-10 16:52:25 +00:00
Simon McVittie
b407eba60d Start NEWS for 1.17.x
For now, the changes that have happened in parallel on the 1.16.x branch
are listed under 1.15.91.

Signed-off-by: Simon McVittie <smcv@collabora.com>
2024-12-10 16:06:21 +00:00
Simon McVittie
8890a5cd69 Merge branch 'dbus-1.16' 2024-12-10 16:05:20 +00:00