From f9587a69f2876b19856788f5a844da90acfda614 Mon Sep 17 00:00:00 2001 From: dheater Date: Mon, 5 Feb 2024 21:30:12 -0600 Subject: [PATCH] As reported in issue #22654, qt depends on freetype/2.13.2 which depends on libpng/1.6.42 which conflicts with qt's dependency on libpng/1.6.40. Bumping the libpng dependency version on libpng Signed-off-by: dheater --- recipes/qt/6.x.x/conanfile.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/recipes/qt/6.x.x/conanfile.py b/recipes/qt/6.x.x/conanfile.py index 80e70011378b2..9e3b0dd0a6a02 100644 --- a/recipes/qt/6.x.x/conanfile.py +++ b/recipes/qt/6.x.x/conanfile.py @@ -336,7 +336,7 @@ def requirements(self): else: self.requires("libjpeg/9e") if self.options.get_safe("with_libpng", False) and not self.options.multiconfiguration: - self.requires("libpng/1.6.40") + self.requires("libpng/1.6.42") if self.options.with_sqlite3 and not self.options.multiconfiguration: self.requires("sqlite3/3.45.0") if self.options.get_safe("with_mysql", False):