Skip to content

Commit

Permalink
(conan-io#22920) dbus: Bump expat and glib dependencies to minimize c…
Browse files Browse the repository at this point in the history
…onflicts

The expat dependency must be bumped to not conflict with wayland.
Additionally, glib/2.78.1 and glib/2.78.3 are used much more than glib/2.77.0.
I went with glib/2.78.3 since it is newer and also required in the Qt packages.
Bump build dependencies as well.
  • Loading branch information
jwillikers authored and Ahajha committed Apr 6, 2024
1 parent 9095e56 commit de9c361
Showing 1 changed file with 4 additions and 4 deletions.
8 changes: 4 additions & 4 deletions recipes/dbus/1.x.x/conanfile.py
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")
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

0 comments on commit de9c361

Please sign in to comment.