summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Kuhn <michael.kuhn@ovgu.de>2021-05-03 15:14:11 +0200
committerGitHub <noreply@github.com>2021-05-03 15:14:11 +0200
commit653fbcc9377072f927354cde053384e51ae62947 (patch)
treefae99f2f91681135a055fd037069e63d4c9c2729
parentabd3e2bbfa2fb1a7b1a1a1a17e789dd3af79476e (diff)
downloadspack-653fbcc9377072f927354cde053384e51ae62947.tar.gz
spack-653fbcc9377072f927354cde053384e51ae62947.tar.bz2
spack-653fbcc9377072f927354cde053384e51ae62947.tar.xz
spack-653fbcc9377072f927354cde053384e51ae62947.zip
qt: add patches for gcc@11 (#23387)
-rw-r--r--var/spack/repos/builtin/packages/qt/package.py13
1 files changed, 13 insertions, 0 deletions
diff --git a/var/spack/repos/builtin/packages/qt/package.py b/var/spack/repos/builtin/packages/qt/package.py
index a69c0ea7f2..59082fa3de 100644
--- a/var/spack/repos/builtin/packages/qt/package.py
+++ b/var/spack/repos/builtin/packages/qt/package.py
@@ -128,6 +128,19 @@ class Qt(Package):
patch('qt5-15-gcc-10.patch', when='@5.12.7:5.15 %gcc@8:')
patch('qt514.patch', when='@5.14')
patch('qt514-isystem.patch', when='@5.14.2')
+ # https://bugreports.qt.io/browse/QTBUG-90395
+ patch('https://src.fedoraproject.org/rpms/qt5-qtbase/raw/6ae41be8260f0f5403367eb01f7cd8319779674a/f/qt5-qtbase-gcc11.patch',
+ sha256='9378afd071ad5c0ec8f7aef48421e4b9fab02f24c856bee9c0951143941913c5',
+ working_dir='qtbase',
+ when='@5.14: %gcc@11:')
+ patch('https://src.fedoraproject.org/rpms/qt5-qtdeclarative/raw/593481a2541d3218f285dd7b46bdc5f4c76075ab/f/qt5-qtdeclarative-gcc11.patch',
+ sha256='2081e9cb85f6712be9b63c70204efa3da954c07d857283eeae16d1b0409704bd',
+ working_dir='qtdeclarative',
+ when='@5.14: %gcc@11:')
+ patch('https://src.fedoraproject.org/rpms/qt5-qtwebsockets/raw/f54f4ce6fa27941e9e6d606103d32056078edc74/f/qt5-qtwebsockets-gcc11.patch',
+ sha256='84b099109d08adf177adf9d3542b6215ec3e42138041d523860dbfdcb59fdaae',
+ working_dir='qtwebsockets',
+ when='@5.14: %gcc@11:')
conflicts('%gcc@10:', when='@5.9:5.12.6 +opengl')
# Build-only dependencies