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: force use of bundled xcb-xinput #23572

Closed
wants to merge 2 commits into from
Closed

qt: force use of bundled xcb-xinput #23572

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b90976a
qt: force use of bundled xcb-xinput
ericLemanissier Apr 16, 2024
7e30f5b
fix components name
ericLemanissier Apr 17, 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: 5 additions & 3 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 @@ -697,6 +697,8 @@

args.append("-feature-gssapi" if self.options.get_safe("with_gssapi", False) else "-no-feature-gssapi")

args.append("-bundled-xcb-xinput")

for opt, conf_arg in [
("with_doubleconversion", "doubleconversion"),
("with_freetype", "freetype"),
Expand Down Expand Up @@ -946,7 +948,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 951 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 +1017,7 @@
reqs.append(corrected_req)
return reqs

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

Check warning on line 1020 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 Expand Up @@ -1182,11 +1184,11 @@
cocoa_reqs.append("PrintSupport")
_create_plugin("QCocoaIntegrationPlugin", "qcocoa", "platforms", cocoa_reqs)
_create_plugin("QMacStylePlugin", "qmacstyle", "styles", cocoa_reqs)
self.cpp_info.components["QCocoaIntegrationPlugin"].frameworks = ["AppKit", "Carbon", "CoreServices", "CoreVideo",
self.cpp_info.components["qtQCocoaIntegrationPlugin"].frameworks = ["AppKit", "Carbon", "CoreServices", "CoreVideo",
"IOKit", "IOSurface", "Metal", "QuartzCore"]
elif self.settings.os in ["iOS", "tvOS"]:
_create_plugin("QIOSIntegrationPlugin", "qios", "platforms", ["ClipboardSupport", "FontDatabaseSupport", "GraphicsSupport"])
self.cpp_info.components["QIOSIntegrationPlugin"].frameworks = ["AudioToolbox", "Foundation", "Metal",
self.cpp_info.components["qtQIOSIntegrationPlugin"].frameworks = ["AudioToolbox", "Foundation", "Metal",
"MobileCoreServices", "OpenGLES", "QuartzCore", "UIKit"]
elif self.settings.os == "watchOS":
_create_plugin("QMinimalIntegrationPlugin", "qminimal", "platforms", ["EventDispatcherSupport", "FontDatabaseSupport"])
Expand Down Expand Up @@ -1308,7 +1310,7 @@
"nss::nss", "libdrm::libdrm", "egl::egl"])
_create_module("WebEngineCore", webenginereqs)
if self.settings.os != "Windows":
self.cpp_info.components["WebEngineCore"].system_libs.append("resolv")
self.cpp_info.components["qtWebEngineCore"].system_libs.append("resolv")
_create_module("WebEngine", ["WebEngineCore"])
_create_module("WebEngineWidgets", ["WebEngineCore", "Quick", "PrintSupport", "Widgets", "Gui", "Network"])

Expand Down
12 changes: 7 additions & 5 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 @@ -578,6 +578,8 @@ def generate(self):

for feature in str(self.options.disabled_features).split():
tc.variables[f"FEATURE_{feature}"] = "OFF"

tc.variables["INPUT_bundled_xcb_xinput"] = "yes"

if self.settings.os == "Macos":
tc.variables["FEATURE_framework"] = "OFF"
Expand Down Expand Up @@ -1135,18 +1137,18 @@ def _create_plugin(pluginname, libname, plugintype, requires):
self.cpp_info.components["qtGui"].frameworks += ["AppKit", "Carbon"]
_create_plugin("QCocoaIntegrationPlugin", "qcocoa", "platforms", ["Core", "Gui"])
# https://github.com/qt/qtbase/blob/v6.6.1/src/plugins/platforms/cocoa/CMakeLists.txt#L51-L58
self.cpp_info.components["QCocoaIntegrationPlugin"].frameworks = [
self.cpp_info.components["qtQCocoaIntegrationPlugin"].frameworks = [
"AppKit", "Carbon", "CoreServices", "CoreVideo", "IOKit", "IOSurface", "Metal", "QuartzCore"
]
elif self.settings.os in ["iOS", "tvOS"]:
_create_plugin("QIOSIntegrationPlugin", "qios", "platforms", [])
# https://github.com/qt/qtbase/blob/v6.6.1/src/plugins/platforms/ios/CMakeLists.txt#L32-L37
self.cpp_info.components["QIOSIntegrationPlugin"].frameworks = [
self.cpp_info.components["qtQIOSIntegrationPlugin"].frameworks = [
"AudioToolbox", "Foundation", "Metal", "QuartzCore", "UIKit", "CoreGraphics"
]
if self.settings.os != "tvOS":
# https://github.com/qt/qtbase/blob/v6.6.1/src/plugins/platforms/ios/CMakeLists.txt#L66-L68
self.cpp_info.components["QIOSIntegrationPlugin"].frameworks += [
self.cpp_info.components["qtQIOSIntegrationPlugin"].frameworks += [
"AssetsLibrary", "UniformTypeIdentifiers", "Photos",
]
elif self.settings.os == "watchOS":
Expand Down Expand Up @@ -1174,9 +1176,9 @@ def _create_plugin(pluginname, libname, plugintype, requires):
if self.options.with_odbc:
_create_plugin("QODBCDriverPlugin", "qsqlodbc", "sqldrivers", [])
if self.settings.os != "Windows":
self.cpp_info.components["QODBCDriverPlugin"].requires.append("odbc::odbc")
self.cpp_info.components["qtQODBCDriverPlugin"].requires.append("odbc::odbc")
else:
self.cpp_info.components["QODBCDriverPlugin"].system_libs.append("odbc32")
self.cpp_info.components["qtQODBCDriverPlugin"].system_libs.append("odbc32")
networkReqs = []
if self.options.openssl:
networkReqs.append("openssl::openssl")
Expand Down
Loading