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

qt: security, bump expat, sqlite #23517

Closed
wants to merge 4 commits into from
Closed

qt: security, bump expat, sqlite #23517

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
c270205
qt: security, bump expat, sqlite
mayeut Apr 13, 2024
1eb67de
use version range for expat
mayeut Apr 15, 2024
2b72133
Merge branch 'master' into qt-security
mayeut Apr 18, 2024
4f574a9
Merge branch 'master' into qt-security
mayeut May 7, 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/qt/5.x.x/conanfile.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -377,13 +377,13 @@
self.requires("harfbuzz/8.3.0")
if self.options.get_safe("with_libjpeg", False) and not self.options.multiconfiguration:
if self.options.with_libjpeg == "libjpeg-turbo":
self.requires("libjpeg-turbo/3.0.1")
self.requires("libjpeg-turbo/3.0.2")
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")
self.requires("sqlite3/3.45.2")
if self.options.get_safe("with_mysql", False):
self.requires("libmysqlclient/8.1.0")
if self.options.with_pq:
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 @@ -946,7 +946,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 949 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 @@ -1015,7 +1015,7 @@
reqs.append(corrected_req)
return reqs

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

Check warning on line 1018 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 @@ -346,13 +346,13 @@ def requirements(self):
self.requires("harfbuzz/8.3.0")
if self.options.get_safe("with_libjpeg", False) and not self.options.multiconfiguration:
if self.options.with_libjpeg == "libjpeg-turbo":
self.requires("libjpeg-turbo/3.0.1")
self.requires("libjpeg-turbo/3.0.2")
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")
self.requires("sqlite3/3.45.2")
if self.options.get_safe("with_mysql", False):
self.requires("libmysqlclient/8.1.0")
if self.options.with_pq:
Expand All @@ -379,7 +379,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 Down
Loading