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

harfbuzz: bump deps, fix conflict with cairo when building pango #23505

Closed
wants to merge 3 commits into from
Closed

harfbuzz: bump deps, fix conflict with cairo when building pango #23505

Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
ce91379
harfbuzz: bump deps
mayeut Apr 13, 2024
70b2231
revert icu bump
mayeut Apr 15, 2024
da0a3df
Merge branch 'master' into harfbuzz-bump-deps
mayeut Apr 17, 2024
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/harfbuzz/all/conanfile.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -82,9 +82,9 @@ def requirements(self):
if self.options.with_freetype:
self.requires("freetype/2.13.2")
if self.options.with_icu:
self.requires("icu/74.1")
self.requires("icu/74.2")
mayeut marked this conversation as resolved.
Show resolved Hide resolved
if self.options.with_glib:
self.requires("glib/2.78.1")
self.requires("glib/2.78.3")

def validate(self):
if self.options.shared and self.options.with_glib and not self.dependencies["glib"].options.shared:
Expand All @@ -100,15 +100,15 @@ def validate(self):
)

def build_requirements(self):
self.tool_requires("meson/1.3.2")
self.tool_requires("meson/1.4.0")
if not self.conf.get("tools.gnu:pkg_config", check_type=str):
self.tool_requires("pkgconf/2.1.0")
if self.options.with_glib:
self.tool_requires("glib/<host_version>")
if self.settings.os == "Macos":
# Ensure that the gettext we use at build time is compatible
# with the libiconv that is transitively exposed by glib
self.tool_requires("gettext/0.21")
self.tool_requires("gettext/0.22.5")

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