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

Jump to bottom

xkbcommon/all: bump deps #19983

Merged
merged 12 commits into from
Oct 4, 2023
Merged

xkbcommon/all: bump deps #19983

Changes from all commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
416183c
xkbcommon/all: bump deps
ericLemanissier May 26, 2023
9f89cbd
xkbcommon/all: bump deps
ericLemanissier Jun 23, 2023
b04e19b
xkbcommon/all: bump deps
ericLemanissier Jul 7, 2023
81becd5
xkbcommon/all: bump deps
ericLemanissier Jul 17, 2023
a93670e
xkbcommon/all: bump deps
ericLemanissier Aug 9, 2023
d021f78
xkbcommon/all: bump deps
ericLemanissier Sep 1, 2023
5dd6f2d
xkbcommon/all: bump deps
ericLemanissier Sep 12, 2023
f4f0c0c
xkbcommon/all: bump deps
ericLemanissier Sep 30, 2023
1e80623
use <host_version>
ericLemanissier Oct 2, 2023
bf240f8
wayland-protocols is never a requirement
ericLemanissier Oct 4, 2023
72167de
wayland-protocols is a tool_requirement
ericLemanissier Oct 4, 2023
b1c73f1
fixup
ericLemanissier Oct 4, 2023
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/xkbcommon/all/conanfile.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@ def requirements(self):
if self.options.get_safe("xkbregistry"):
self.requires("libxml2/2.11.4")
if self.options.get_safe("with_wayland"):
self.requires("wayland/1.21.0")
self.requires("wayland/1.22.0")
if not self._has_build_profile:
self.requires("wayland-protocols/1.31")

Expand All @@ -76,12 +76,12 @@ def validate(self):
raise ConanInvalidConfiguration(f"{self.ref} is only compatible with Linux and FreeBSD")

def build_requirements(self):
self.tool_requires("meson/1.1.0")
self.tool_requires("meson/1.2.2")
self.tool_requires("bison/3.8.2")
if not self.conf.get("tools.gnu:pkg_config", default=False, check_type=str):
self.tool_requires("pkgconf/1.9.3")
self.tool_requires("pkgconf/2.0.3")
if self._has_build_profile and self.options.get_safe("with_wayland"):
self.tool_requires("wayland/1.21.0")
self.tool_requires("wayland/<host_version>")
Copy link
Contributor

@SpaceIm SpaceIm Oct 12, 2023 •
edited
Loading

Choose a reason for hiding this comment

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

required_conan_version has to be updated (required_conan_version = ">=1.60.0 <2 || >=2.0.5").

self.tool_requires("wayland-protocols/1.31")
Copy link
Contributor Author

Choose a reason for hiding this comment

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

cannot use <host_version> foy wayland-protocols, because it either either a requires or a tool_requires. Never both.


def source(self):
Expand Down