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 5.x: lowercase system libs + bump dependencies #15435

Closed
wants to merge 3 commits into from
Closed

qt 5.x: lowercase system libs + bump dependencies #15435

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
9da836e
lowercase system libs
SpaceIm Jan 23, 2023
df3d14f
bump dependencies
SpaceIm Jan 24, 2023
9bec575
Merge branch 'master' into fix/qt-lowercase-systemlibs
SpaceIm Feb 1, 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
34 changes: 17 additions & 17 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 @@ -162,11 +162,11 @@ def build_requirements(self):
self.tool_requires("nodejs/16.3.0")
self.tool_requires("gperf/3.1")
# gperf, bison, flex, python >= 2.7.5 & < 3
if self.settings.os != "Windows":
if self._settings_build.os == "Windows":
self.tool_requires("winflexbison/2.5.24")
else:
self.tool_requires("bison/3.8.2")
self.tool_requires("flex/2.6.4")
else:
self.tool_requires("winflexbison/2.5.24")

# Check if a valid python2 is available in PATH or it will failflex
# Start by checking if python2 can be found
Expand Down Expand Up @@ -365,11 +365,11 @@ def requirements(self):
if self.options.openssl:
self.requires("openssl/1.1.1s")
if self.options.with_pcre2:
self.requires("pcre2/10.40")
self.requires("pcre2/10.42")
if self.options.get_safe("with_vulkan"):
self.requires("vulkan-loader/1.3.224.0")
self.requires("vulkan-loader/1.3.236.0")
if is_apple_os(self):
self.requires("moltenvk/1.1.10")
self.requires("moltenvk/1.2.1")
if self.options.with_glib:
self.requires("glib/2.75.2")
# if self.options.with_libiconv: # QTBUG-84708
Expand All @@ -381,9 +381,9 @@ def requirements(self):
if self.options.get_safe("with_fontconfig", False):
self.requires("fontconfig/2.13.93")
if self.options.get_safe("with_icu", False):
self.requires("icu/71.1")
self.requires("icu/72.1")
if self.options.get_safe("with_harfbuzz", False) and not self.options.multiconfiguration:
self.requires("harfbuzz/5.3.1")
self.requires("harfbuzz/6.0.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/2.1.4")
Expand All @@ -392,10 +392,10 @@ def requirements(self):
if self.options.get_safe("with_libpng", False) and not self.options.multiconfiguration:
self.requires("libpng/1.6.39")
if self.options.with_sqlite3 and not self.options.multiconfiguration:
self.requires("sqlite3/3.39.4")
self.requires("sqlite3/3.40.1")
self.options["sqlite3"].enable_column_metadata = True
if self.options.get_safe("with_mysql", False):
self.requires("libmysqlclient/8.0.30")
self.requires("libmysqlclient/8.0.31")
if self.options.with_pq:
self.requires("libpq/14.5")
if self.options.with_odbc:
Expand All @@ -405,21 +405,22 @@ def requirements(self):
self.requires("openal/1.22.2")
if self.options.get_safe("with_libalsa", False):
self.requires("libalsa/1.2.7.2")
if self.options.get_safe("with_x11", False):
if self.options.qtwayland or self.options.get_safe("with_x11"):
self.requires("xkbcommon/1.5.0")
if self.options.get_safe("with_x11", False):
self.requires("xorg/system")
if self.options.get_safe("opengl", "no") != "no":
self.requires("opengl/system")
if self.options.with_zstd:
self.requires("zstd/1.5.2")
if self.options.qtwebengine and self.settings.os in ["Linux", "FreeBSD"]:
self.requires("expat/2.4.9")
self.requires("expat/2.5.0")
self.requires("opus/1.3.1")
if not self.options.qtwayland:
self.requires("xorg-proto/2022.2")
self.requires("libxshmfence/1.3")
self.requires("nss/3.84")
self.requires("libdrm/2.4.109")
self.requires("nss/3.87")
self.requires("libdrm/2.4.114")
self.requires("egl/system")
if self.options.get_safe("with_gstreamer", False):
self.requires("gst-plugins-base/1.19.2")
Expand All @@ -429,11 +430,10 @@ def requirements(self):
self.requires("dbus/1.15.2")
if self.options.qtwayland:
self.requires("wayland/1.21.0")
self.requires("xkbcommon/1.5.0")
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_atspi"):
self.requires("at-spi2-core/2.46.0")
self.requires("at-spi2-core/2.47.1")
if self.options.get_safe("with_md4c", False):
self.requires("md4c/0.4.8")

Expand Down Expand Up @@ -1415,7 +1415,7 @@ def _create_plugin(pluginname, libname, plugintype, requires):
self.cpp_info.components["qtNetwork"].system_libs.append("dnsapi") # qtnetwork from qtbase requires "DnsFree" which is in "Dnsapi.lib" library
self.cpp_info.components["qtNetwork"].system_libs.append("iphlpapi")
if self.options.widgets:
self.cpp_info.components["qtWidgets"].system_libs.append("UxTheme")
self.cpp_info.components["qtWidgets"].system_libs.append("uxtheme")
self.cpp_info.components["qtWidgets"].system_libs.append("dwmapi")
if self.options.get_safe("qtwinextras"):
self.cpp_info.components["qtWinExtras"].system_libs.append("dwmapi") # qtwinextras requires "DwmGetColorizationColor" which is in "dwmapi.lib" library
Expand Down