diff --git a/qt5-qtbase.spec b/qt5-qtbase.spec index f59aa19..39ee6ce 100644 --- a/qt5-qtbase.spec +++ b/qt5-qtbase.spec @@ -55,7 +55,7 @@ BuildRequires: pkgconfig(libsystemd) Name: qt5-qtbase Summary: Qt5 - QtBase components Version: 5.15.2 -Release: 9%{?dist} +Release: 10%{?dist} # See LGPL_EXCEPTIONS.txt, for exception details License: LGPLv2 with exceptions or GPLv3 with exceptions @@ -133,6 +133,10 @@ Patch90: %{name}-gcc11.patch # glibc stat ## upstream patches +# see also patch90 +Patch200: qtbase-QTBUG-90395.patch +Patch201: qtbase-QTBUG-89977.patch + # Do not check any files in %%{_qt5_plugindir}/platformthemes/ for requires. # Those themes are there for platform integration. If the required libraries are @@ -396,6 +400,8 @@ Qt5 libraries used for drawing widgets and OpenGL items. %patch90 -p1 -b .gcc11 ## upstream patches +%patch200 -p1 -b .QTBUG-90395 +%patch201 -p1 -b .QTBUG-89977 # move some bundled libs to ensure they're not accidentally used pushd src/3rdparty @@ -1056,6 +1062,10 @@ fi %changelog +* Sat Feb 06 2021 Rex Dieter - 5.15.2-10 +- FTBFS: qendian.h (and qfloat16.h) missing include (QTBUG-90395) +- Qt build on GCC 11 (QTBUG-89977) + * Mon Feb 01 2021 Jan Grulich - 5.15.2-9 - Disable getentropy on RHEL diff --git a/qtbase-QTBUG-89977.patch b/qtbase-QTBUG-89977.patch new file mode 100644 index 0000000..cfaac11 --- /dev/null +++ b/qtbase-QTBUG-89977.patch @@ -0,0 +1,11 @@ +diff -up qtbase-everywhere-src-5.15.2/src/corelib/text/qbytearray.h.foo qtbase-everywhere-src-5.15.2/src/corelib/text/qbytearray.h +--- qtbase-everywhere-src-5.15.2/src/corelib/text/qbytearray.h.foo 2020-10-27 03:02:11.000000000 -0500 ++++ qtbase-everywhere-src-5.15.2/src/corelib/text/qbytearray.h 2021-02-06 17:05:04.879201352 -0600 +@@ -51,6 +49,7 @@ + + #include + #include ++#include + + #ifdef truncate + #error qbytearray.h must be included before any header file that defines truncate diff --git a/qtbase-QTBUG-90395.patch b/qtbase-QTBUG-90395.patch new file mode 100644 index 0000000..cc4bb6e --- /dev/null +++ b/qtbase-QTBUG-90395.patch @@ -0,0 +1,23 @@ +diff -up qtbase-everywhere-src-5.15.2/src/corelib/global/qendian.h.QTBUG-90395 qtbase-everywhere-src-5.15.2/src/corelib/global/qendian.h +--- qtbase-everywhere-src-5.15.2/src/corelib/global/qendian.h.QTBUG-90395 2020-10-27 03:02:11.000000000 -0500 ++++ qtbase-everywhere-src-5.15.2/src/corelib/global/qendian.h 2021-02-06 16:36:27.072105717 -0600 +@@ -44,6 +44,8 @@ + #include + #include + ++#include ++ + // include stdlib.h and hope that it defines __GLIBC__ for glibc-based systems + #include + #include +diff -up qtbase-everywhere-src-5.15.2/src/corelib/global/qfloat16.h.QTBUG-90395 qtbase-everywhere-src-5.15.2/src/corelib/global/qfloat16.h +--- qtbase-everywhere-src-5.15.2/src/corelib/global/qfloat16.h.QTBUG-90395 2021-02-06 16:36:27.074105730 -0600 ++++ qtbase-everywhere-src-5.15.2/src/corelib/global/qfloat16.h 2021-02-06 16:37:19.212440114 -0600 +@@ -43,6 +43,7 @@ + + #include + #include ++#include + #include + + #if defined(QT_COMPILER_SUPPORTS_F16C) && defined(__AVX2__) && !defined(__F16C__)