Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

dbus: Bump expat and glib dependencies to minimize conflicts #22920

Merged
merged 1 commit into from
Mar 22, 2024
Merged

dbus: Bump expat and glib dependencies to minimize conflicts #22920

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions recipes/dbus/1.x.x/conanfile.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,9 +67,9 @@ def layout(self):
basic_layout(self, src_folder="src")

def requirements(self):
self.requires("expat/2.5.0")
self.requires("expat/2.6.0")
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It will break Qt5 and Qt6. Both are using expat 2.5.0 and require dbus.

Copy link
Contributor Author

@jwillikers jwillikers Feb 28, 2024 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@uilianries Wayland also currently breaks them... just not by default since Wayland is disabled by default if I remember correctly. Would you rather I downgrade expat in Wayland to 2.5.0? Or open PRs to bump dependencies in Qt 5 and 6?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I went ahead and opened #22929 to bump expat to 2.6.0 in Qt.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This inconsistency blocks #22387

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

#22929 has been merged, so this should be good to go now.

if self.options.with_glib:
self.requires("glib/2.77.0")
self.requires("glib/2.78.3")
if self.options.get_safe("with_systemd"):
self.requires("libsystemd/253.6")
if self.options.with_selinux:
Expand All @@ -82,9 +82,9 @@ def validate(self):
raise ConanInvalidConfiguration(f"{self.ref} requires at least gcc 7.")

def build_requirements(self):
self.tool_requires("meson/1.2.0")
self.tool_requires("meson/1.3.2")
if not self.conf.get("tools.gnu:pkg_config",check_type=str):
self.tool_requires("pkgconf/1.9.5")
self.tool_requires("pkgconf/2.1.0")

def source(self):
get(self, **self.conan_data["sources"][self.version], strip_root=True)
Expand Down
Loading