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.

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

Merge changes to QT from upstream/develop #185

Merged
merged 3 commits into from
Sep 20, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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: 17 additions & 5 deletions var/spack/repos/builtin/packages/qt/package.py
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,7 @@ class Qt(Package):

phases = ["configure", "build", "install"]

version("5.15.10", sha256="b545cb83c60934adc9a6bbd27e2af79e5013de77d46f5b9f5bb2a3c762bf55ca")
version("5.15.9", sha256="26d5f36134db03abe4a6db794c7570d729c92a3fc1b0bf9b1c8f86d0573cd02f")
version("5.15.8", sha256="776a9302c336671f9406a53bd30b8e36f825742b2ec44a57c08217bff0fa86b9")
version("5.15.7", sha256="8a71986676a3f37a198a9113acedbfd5bc5606a459b6b85816d951458adbe9a0")
Expand Down Expand Up @@ -60,13 +61,16 @@ class Qt(Package):
variant("gtk", default=False, description="Build with gtkplus.")
variant("gui", default=True, description="Build the Qt GUI module and dependencies")
variant("opengl", default=False, description="Build with OpenGL support.")
variant("location", default=False, when="+opengl", description="Build the Qt Location module.")
variant("phonon", default=False, description="Build with phonon support.")
variant("shared", default=True, description="Build shared libraries.")
variant("sql", default=True, description="Build with SQL support.")
variant("ssl", default=True, description="Build with OpenSSL support.")
variant("tools", default=True, description="Build tools, including Qt Designer.")
variant("webkit", default=False, description="Build the Webkit extension")

provides("qmake")

# Patches for qt@3
patch("qt3-accept.patch", when="@3")
patch("qt3-headers.patch", when="@3")
Expand Down Expand Up @@ -134,6 +138,15 @@ class Qt(Package):
working_dir="qtwebsockets",
when="@5.14: %gcc@11:",
)
# patch that adds missing `#include <cstdint>` in several files
# required for gcc 13 (even though the original patch was developed for gcc 10)
# (see https://gcc.gnu.org/gcc-13/porting_to.html)
patch(
"https://src.fedoraproject.org/rpms/qt5-qtlocation/raw/b6d99579de9ce5802c592b512a9f644a5e4690b9/f/qtlocation-gcc10.patch",
sha256="78c70fbd0c74031c5f0f1f5990e0b4214fc04c5073c67ce1f23863373932ec86",
working_dir="qtlocation",
when="@5.15.10 %gcc@10:",
)
# https://github.com/microsoft/vcpkg/issues/21055
patch("qt5-macos12.patch", working_dir="qtbase", when="@5.14: %apple-clang@13:")

Expand Down Expand Up @@ -255,8 +268,6 @@ class Qt(Package):
msg="Apple Silicon requires a very new version of qt",
)

use_xcode = True

# Mapping for compilers/systems in the QT 'mkspecs'
compiler_mapping = {
"intel": ("icc",),
Expand Down Expand Up @@ -714,6 +725,10 @@ def configure(self, spec, prefix):
# https://wiki.qt.io/QtWayland
config_args.extend(["-skip", "wayland"])

if "~location" in spec:
if version >= Version("5.15"):
config_args.extend(["-skip", "qtlocation"])

if "~opengl" in spec:
config_args.extend(["-skip", "multimedia"])
config_args.extend(["-skip", "qt3d"])
Expand All @@ -724,9 +739,6 @@ def configure(self, spec, prefix):
if version >= Version("5.14"):
config_args.extend(["-skip", "qtquick3d"])

if version >= Version("5.15"):
config_args.extend(["-skip", "qtlocation"])

else:
# v5.0: qt3d uses internal-only libassimp
# v5.5: external-only libassimp
Expand Down
34 changes: 0 additions & 34 deletions var/spack/repos/builtin/packages/qt/qt5-15-gcc13.patch

This file was deleted.