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

qt: add version ranges to libpng and expat #24606

Closed
wants to merge 1 commit into from
Closed

qt: add version ranges to libpng and expat #24606

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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/qt/5.x.x/conanfile.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -381,7 +381,7 @@
else:
self.requires("libjpeg/9e")
if self.options.get_safe("with_libpng", False) and not self.options.multiconfiguration:
self.requires("libpng/1.6.42")
self.requires("libpng/[>=1.6 <2]")
if self.options.with_sqlite3 and not self.options.multiconfiguration:
self.requires("sqlite3/3.45.0")
if self.options.get_safe("with_mysql", False):
Expand All @@ -404,7 +404,7 @@
if self.options.with_zstd:
self.requires("zstd/1.5.5")
if self.options.qtwebengine and self.settings.os in ["Linux", "FreeBSD"]:
self.requires("expat/2.6.0")
self.requires("expat/[>=2.6.2 <3]")
self.requires("opus/1.4")
if not self.options.qtwayland:
self.requires("xorg-proto/2022.2")
Expand Down Expand Up @@ -445,9 +445,9 @@

def build_requirements(self):
if self._settings_build.os == "Windows" and is_msvc(self):
self.tool_requires("jom/1.1.3")
self.tool_requires("jom/1.1.4")
if self.options.qtwebengine:
self.tool_requires("ninja/1.11.1")
self.tool_requires("ninja/1.12.1")
self.tool_requires("nodejs/18.15.0")
self.tool_requires("gperf/3.1")
# gperf, bison, flex, python >= 2.7.5 & < 3
Expand Down Expand Up @@ -933,7 +933,7 @@
filecontents += 'set(CMAKE_AUTOMOC_MACRO_NAMES "Q_OBJECT" "Q_GADGET" "Q_GADGET_EXPORT" "Q_NAMESPACE" "Q_NAMESPACE_EXPORT")\n'
save(self, os.path.join(self.package_folder, self._cmake_core_extras_file), filecontents)

def _create_private_module(module, dependencies=[]):

Check warning on line 936 in recipes/qt/5.x.x/conanfile.py

View workflow job for this annotation

GitHub Actions / Lint changed conanfile.py (v2 migration) 

 Dangerous default value [] as argument
if "Core" not in dependencies:
dependencies.append("Core")
dependencies_string = ';'.join(f'Qt5::{dependency}' for dependency in dependencies)
Expand Down Expand Up @@ -1002,7 +1002,7 @@
reqs.append(corrected_req)
return reqs

def _create_module(module, requires=[], has_include_dir=True):

Check warning on line 1005 in recipes/qt/5.x.x/conanfile.py

View workflow job for this annotation

GitHub Actions / Lint changed conanfile.py (v2 migration) 

 Dangerous default value [] as argument
componentname = f"qt{module}"
assert componentname not in self.cpp_info.components, f"Module {module} already present in self.cpp_info.components"
self.cpp_info.components[componentname].set_property("cmake_target_name", f"Qt5::{module}")
Expand Down
8 changes: 4 additions & 4 deletions recipes/qt/6.x.x/conanfile.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -351,7 +351,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.42")
self.requires("libpng/[>=1.6 <2]")
if self.options.with_sqlite3 and not self.options.multiconfiguration:
self.requires("sqlite3/3.45.0")
if self.options.get_safe("with_mysql", False):
Expand Down Expand Up @@ -380,7 +380,7 @@ def requirements(self):
if self.options.with_brotli:
self.requires("brotli/1.1.0")
if self.options.get_safe("qtwebengine") and self.settings.os == "Linux":
self.requires("expat/2.6.0")
self.requires("expat/[>=2.6.2 <3]")
self.requires("opus/1.4")
self.requires("xorg-proto/2022.2")
self.requires("libxshmfence/1.3")
Expand All @@ -400,9 +400,9 @@ def requirements(self):

def build_requirements(self):
self.tool_requires("cmake/[>=3.21.1 <4]")
self.tool_requires("ninja/1.11.1")
self.tool_requires("ninja/1.12.1")
if not self.conf.get("tools.gnu:pkg_config", check_type=str):
self.tool_requires("pkgconf/2.1.0")
self.tool_requires("pkgconf/2.2.0")
if self.settings.os == "Windows":
self.tool_requires('strawberryperl/5.32.1.1')

Expand Down
Loading