Skip to content

Commit

Permalink
(#23506) pango: fix conflicts with cairo, bump deps
Browse files Browse the repository at this point in the history
  • Loading branch information
mayeut authored May 6, 2024
1 parent 2b0bfd4 commit 7824269
Showing 1 changed file with 4 additions and 4 deletions.
8 changes: 4 additions & 4 deletions recipes/pango/all/conanfile.py
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@ def requirements(self):
self.requires("freetype/2.13.2")

if self.options.with_fontconfig:
self.requires("fontconfig/2.14.2")
self.requires("fontconfig/2.15.0")
if self.options.with_xft:
self.requires("libxft/2.3.8")
if (
Expand All @@ -78,7 +78,7 @@ def requirements(self):
if self.options.with_cairo:
# "pango/pangocairo.h" includes "cairo.h"
self.requires("cairo/1.18.0", transitive_headers=True)
self.requires("glib/2.78.1", transitive_headers=True, transitive_libs=True)
self.requires("glib/2.78.3", transitive_headers=True, transitive_libs=True)
self.requires("fribidi/1.0.13")
# "pango/pango-coverage.h" includes "hb.h"
self.requires("harfbuzz/8.3.0", transitive_headers=True)
Expand Down Expand Up @@ -118,9 +118,9 @@ def validate(self):

def build_requirements(self):
self.tool_requires("glib/<host_version>")
self.tool_requires("meson/1.3.0")
self.tool_requires("meson/1.4.0")
if not self.conf.get("tools.gnu:pkg_config", default=False, check_type=str):
self.tool_requires("pkgconf/2.0.3")
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 7824269

Please sign in to comment.