5.12.3
This commit is contained in:
Jan Grulich
parent
afc1c75b83
commit
9fe549303e
1
.gitignore
vendored
1
.gitignore
vendored
@ -1 +1,2 @@
|
||||
/qtbase-everywhere-src-5.12.1.tar.xz
|
||||
/qtbase-everywhere-src-5.12.3.tar.xz
|
||||
|
||||
@ -1,33 +0,0 @@
|
||||
From 8e6231f4ebd0957920b740fb0cc96af0ac66e6cf Mon Sep 17 00:00:00 2001
|
||||
From: Joerg Bornemann <joerg.bornemann@qt.io>
|
||||
Date: Wed, 30 Jan 2019 16:16:58 +0100
|
||||
Subject: [PATCH 129/525] Fix install targets for generated private headers
|
||||
|
||||
Header files of modules that specify generated_privates are usually
|
||||
not yet available at qmake-time. Thus, the installation rule must not
|
||||
check for the file's existence.
|
||||
|
||||
Change-Id: Ifc7ff95422912d255744c9006382ff181176ae77
|
||||
Fixes: QTBUG-71340
|
||||
Reviewed-by: Oliver Wolff <oliver.wolff@qt.io>
|
||||
Reviewed-by: Edward Welbourne <edward.welbourne@qt.io>
|
||||
---
|
||||
mkspecs/features/qt_installs.prf | 2 ++
|
||||
1 file changed, 2 insertions(+)
|
||||
|
||||
diff --git a/mkspecs/features/qt_installs.prf b/mkspecs/features/qt_installs.prf
|
||||
index 8f98987b99..1ebca17366 100644
|
||||
--- a/mkspecs/features/qt_installs.prf
|
||||
+++ b/mkspecs/features/qt_installs.prf
|
||||
@@ -38,6 +38,8 @@ qt_install_headers {
|
||||
|
||||
private_headers.files = $$SYNCQT.PRIVATE_HEADER_FILES $$SYNCQT.INJECTED_PRIVATE_HEADER_FILES
|
||||
private_headers.path = $$[QT_INSTALL_HEADERS]/$$MODULE_INCNAME/$$VERSION/$$MODULE_INCNAME/private
|
||||
+ generated_privates: \
|
||||
+ private_headers.CONFIG += no_check_exist
|
||||
INSTALLS += private_headers
|
||||
|
||||
qpa_headers.files = $$SYNCQT.QPA_HEADER_FILES
|
||||
--
|
||||
2.21.0
|
||||
|
||||
@ -1,58 +0,0 @@
|
||||
From 96f6cab22cab252cbe7a98bbeadde95497e0bd75 Mon Sep 17 00:00:00 2001
|
||||
From: Allan Sandfeld Jensen <allan.jensen@qt.io>
|
||||
Date: Tue, 26 Feb 2019 10:38:58 +0100
|
||||
Subject: [PATCH 234/518] Blacklist nouveau and llvmpipe for multithreading
|
||||
|
||||
After removing Mesa drivers from being blank blacklisted, we still need
|
||||
to blacklist nouveau specifically due to their lack of proper locking:
|
||||
https://bugs.freedesktop.org/show_bug.cgi?id=91632
|
||||
|
||||
llvmpipe is similarly blacklisted for now, as we lack enough information
|
||||
to know if the underlying issue behind QTCREATORBUG-10666 has been solved.
|
||||
|
||||
Fixes: QTBUG-73715
|
||||
Change-Id: I1a60b562cd9db94fa8462b922d6bfeebf0088dc5
|
||||
Reviewed-by: Laszlo Agocs <laszlo.agocs@qt.io>
|
||||
---
|
||||
.../xcb_glx/qglxintegration.cpp | 18 ++++++++++++++++++
|
||||
1 file changed, 18 insertions(+)
|
||||
|
||||
diff --git a/src/plugins/platforms/xcb/gl_integrations/xcb_glx/qglxintegration.cpp b/src/plugins/platforms/xcb/gl_integrations/xcb_glx/qglxintegration.cpp
|
||||
index d42a33c22b..476de6d1e5 100644
|
||||
--- a/src/plugins/platforms/xcb/gl_integrations/xcb_glx/qglxintegration.cpp
|
||||
+++ b/src/plugins/platforms/xcb/gl_integrations/xcb_glx/qglxintegration.cpp
|
||||
@@ -652,6 +652,12 @@ static const char *qglx_threadedgl_blacklist_renderer[] = {
|
||||
0
|
||||
};
|
||||
|
||||
+static const char *qglx_threadedgl_blacklist_vendor[] = {
|
||||
+ "llvmpipe", // QTCREATORBUG-10666
|
||||
+ "nouveau", // https://bugs.freedesktop.org/show_bug.cgi?id=91632
|
||||
+ nullptr
|
||||
+};
|
||||
+
|
||||
void QGLXContext::queryDummyContext()
|
||||
{
|
||||
if (m_queriedDummyContext)
|
||||
@@ -710,6 +716,18 @@ void QGLXContext::queryDummyContext()
|
||||
}
|
||||
}
|
||||
}
|
||||
+ if (const char *vendor = (const char *) glGetString(GL_VENDOR)) {
|
||||
+ for (int i = 0; qglx_threadedgl_blacklist_vendor[i]; ++i) {
|
||||
+ if (strstr(vendor, qglx_threadedgl_blacklist_vendor[i]) != 0) {
|
||||
+ qCDebug(lcQpaGl).nospace() << "Multithreaded OpenGL disabled: "
|
||||
+ "blacklisted vendor \""
|
||||
+ << qglx_threadedgl_blacklist_vendor[i]
|
||||
+ << "\"";
|
||||
+ m_supportsThreading = false;
|
||||
+ break;
|
||||
+ }
|
||||
+ }
|
||||
+ }
|
||||
|
||||
if (glxvendor && m_supportsThreading) {
|
||||
// Blacklist Mesa drivers due to QTCREATORBUG-10875 (crash in creator),
|
||||
--
|
||||
2.21.0
|
||||
|
||||
@ -52,8 +52,8 @@ BuildRequires: pkgconfig(libsystemd)
|
||||
|
||||
Name: qt5-qtbase
|
||||
Summary: Qt5 - QtBase components
|
||||
Version: 5.12.1
|
||||
Release: 7%{?dist}
|
||||
Version: 5.12.3
|
||||
Release: 1%{?dist}
|
||||
|
||||
# See LGPL_EXCEPTIONS.txt, for exception details
|
||||
License: LGPLv2 with exceptions or GPLv3 with exceptions
|
||||
@ -129,8 +129,6 @@ Patch68: qtbase-everywhere-src-5.11.1-python3.patch
|
||||
# glibc stat
|
||||
|
||||
## upstream patches
|
||||
Patch129: 0129-Fix-install-targets-for-generated-private-headers.patch
|
||||
Patch234: 0234-Blacklist-nouveau-and-llvmpipe-for-multithreading.patch
|
||||
|
||||
# Do not check any files in %%{_qt5_plugindir}/platformthemes/ for requires.
|
||||
# Those themes are there for platform integration. If the required libraries are
|
||||
@ -379,8 +377,6 @@ Qt5 libraries used for drawing widgets and OpenGL items.
|
||||
%setup -q -n %{qt_module}-everywhere-src-%{version}
|
||||
|
||||
## upstream fixes
|
||||
%patch129 -p1 -b .0129
|
||||
%patch234 -p1 -b .0234
|
||||
|
||||
%patch4 -p1 -b .QTBUG-35459
|
||||
# omit '-b .tell-the-truth-about-private-api' so it doesn't end up in installed files -- rdieter
|
||||
@ -1020,6 +1016,9 @@ fi
|
||||
|
||||
|
||||
%changelog
|
||||
* Tue Jun 04 2019 Jan Grulich <jgrulich@redhat.com> - 5.12.3-1
|
||||
- 5.12.3
|
||||
|
||||
* Fri May 10 2019 Rex Dieter <rdieter@fedoraproject.org> - 5.12.1-7
|
||||
- Fix install targets for generated private headers (#1702858)
|
||||
|
||||
|
||||
2
sources
2
sources
@ -1 +1 @@
|
||||
SHA512 (qtbase-everywhere-src-5.12.1.tar.xz) = 51494d8947ae16ab7aee22aca156035718f5a700737547de59b4d61d3919c00f4de858111c8928a66c0385604623d847d231892d964d53924a8c97b6e2bedf25
|
||||
SHA512 (qtbase-everywhere-src-5.12.3.tar.xz) = 1dab927573eb22b1ae772de3a418f7d3999ea78d6e667a7f2494390dd1f0981ea93f4f892cb6e124ac18812c780ee71da3021b485c61eaf1ef2234a5c12b7fe2
|
||||
|
||||
Loading…
Reference in New Issue
Block a user