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/6.x.x: bump deps #19639

Closed
wants to merge 20 commits into from
Closed

qt/6.x.x: bump deps #19639

Changes from 14 commits
Commits
Show all changes
20 commits
Select commit Hold shift + click to select a range
7bd75ec
qt/6.x.x: bump deps
ericLemanissier Aug 3, 2023
2ab2582
qt/6.x.x: bump deps
ericLemanissier Aug 4, 2023
ee35f8f
qt/6.x.x: bump deps
ericLemanissier Aug 5, 2023
27309af
qt/6.x.x: bump deps
ericLemanissier Aug 9, 2023
45f60d6
qt/6.x.x: bump deps
ericLemanissier Aug 10, 2023
2eee09a
qt/6.x.x: bump deps
ericLemanissier Aug 23, 2023
c58eba9
qt/6.x.x: bump deps
ericLemanissier Aug 23, 2023
5a3387d
qt/6.x.x: bump deps
ericLemanissier Aug 23, 2023
9e4487c
qt/6.x.x: bump deps
ericLemanissier Aug 25, 2023
0481d65
qt/6.x.x: bump deps
ericLemanissier Sep 1, 2023
43e823d
qt/6.x.x: bump deps
ericLemanissier Sep 1, 2023
7a7f448
qt/6.x.x: bump deps
ericLemanissier Sep 2, 2023
a0eb206
qt/6.x.x: bump deps
ericLemanissier Sep 4, 2023
4fb03a2
Unbump zlib
ericLemanissier Sep 7, 2023
f4620ec
disable vcpkg
ericLemanissier Sep 22, 2023
3fb3b25
use version range for zlib
ericLemanissier Sep 22, 2023
6b3112a
bump harfbuzz
ericLemanissier Oct 2, 2023
63d1a13
Update conanfile.py
ericLemanissier Oct 5, 2023
fb48afe
Update conanfile.py
ericLemanissier Oct 5, 2023
75617e3
Update conanfile.py
ericLemanissier Oct 5, 2023
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
22 changes: 11 additions & 11 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 @@ -301,11 +301,11 @@ def requirements(self):
if self.options.with_pcre2:
self.requires("pcre2/10.42")
if self.options.get_safe("with_vulkan"):
self.requires("vulkan-loader/1.3.239.0")
self.requires("vulkan-loader/1.3.243.0")
if is_apple_os(self):
self.requires("moltenvk/1.2.2")
if self.options.with_glib:
self.requires("glib/2.77.0")
self.requires("glib/2.77.3")
if self.options.with_doubleconversion and not self.options.multiconfiguration:
self.requires("double-conversion/3.3.0")
if self.options.get_safe("with_freetype", False) and not self.options.multiconfiguration:
Expand All @@ -315,20 +315,20 @@ def requirements(self):
if self.options.get_safe("with_icu", False):
self.requires("icu/73.2")
if self.options.get_safe("with_harfbuzz", False) and not self.options.multiconfiguration:
self.requires("harfbuzz/8.0.1")
self.requires("harfbuzz/8.1.1")
if self.options.get_safe("with_libjpeg", False) and not self.options.multiconfiguration:
if self.options.with_libjpeg == "libjpeg-turbo":
self.requires("libjpeg-turbo/2.1.5")
self.requires("libjpeg-turbo/3.0.0")
else:
self.requires("libjpeg/9e")
if self.options.get_safe("with_libpng", False) and not self.options.multiconfiguration:
self.requires("libpng/1.6.40")
if self.options.with_sqlite3 and not self.options.multiconfiguration:
self.requires("sqlite3/3.42.0")
self.requires("sqlite3/3.43.0")
if self.options.get_safe("with_mysql", False):
self.requires("libmysqlclient/8.0.31")
self.requires("libmysqlclient/8.1.0")
if self.options.with_pq:
self.requires("libpq/15.3")
self.requires("libpq/15.4")
if self.options.with_odbc:
if self.settings.os != "Windows":
self.requires("odbc/2.3.11")
Expand All @@ -347,10 +347,10 @@ def requirements(self):
self.requires("xkbcommon/1.5.0")
self.requires("wayland/1.22.0")
if self.options.with_brotli:
self.requires("brotli/1.0.9")
self.requires("brotli/1.1.0")
if self.options.get_safe("qtwebengine") and self.settings.os == "Linux":
self.requires("expat/2.5.0")
self.requires("opus/1.3.1")
self.requires("opus/1.4")
self.requires("xorg-proto/2022.2")
self.requires("libxshmfence/1.3")
self.requires("nss/3.89")
Expand All @@ -360,7 +360,7 @@ def requirements(self):
if self.options.get_safe("with_pulseaudio", False):
self.requires("pulseaudio/14.2")
if self.options.with_dbus:
self.requires("dbus/1.15.6")
self.requires("dbus/1.15.8")
if self.settings.os in ['Linux', 'FreeBSD'] and self.options.with_gssapi:
self.requires("krb5/1.18.3") # conan-io/conan-center-index#4102
if self.options.get_safe("with_md4c", False):
Expand All @@ -370,7 +370,7 @@ def build_requirements(self):
self.tool_requires("cmake/[>=3.21.1 <4]")
self.tool_requires("ninja/1.11.1")
if not self.conf.get("tools.gnu:pkg_config", check_type=str):
self.tool_requires("pkgconf/1.9.5")
self.tool_requires("pkgconf/2.0.2")
if self.settings.os == "Windows":
self.tool_requires('strawberryperl/5.32.1.1')

Expand Down