From a5a39413401fd13021250219c379dbae01e8861cdb78f5092b0a770384f58f42 Mon Sep 17 00:00:00 2001 From: Dominique Leuenberger Date: Wed, 13 Feb 2019 09:16:48 +0000 Subject: [PATCH] Accepting request 670075 from KDE:Qt5 - Add 0001-Fix-compile-issue-with-gcc-9.patch to fix building with the latest libstdc++ (boo#1121561) - Remove workaround patch as fixed in KWin meanwhile: * 0001-Revert-xcb-Initialize-OpenGL-integration-only-when-r.patch - Add 0001-Revert-xcb-Initialize-OpenGL-integration-only-when-r.patch: * Revert upstream commit 60cecc86f8 to work around display flickering issues with some display drivers (https://bugreports.qt.io/browse/QTBUG-73122, boo#1120090) OBS-URL: https://build.opensuse.org/request/show/670075 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/libqt5-qtbase?expand=0&rev=93 --- 0001-Fix-compile-issue-with-gcc-9.patch | 28 +++++++++++++++++++++++++ libqt5-qtbase.changes | 20 ++++++++++++++++++ libqt5-qtbase.spec | 1 + 3 files changed, 49 insertions(+) create mode 100644 0001-Fix-compile-issue-with-gcc-9.patch diff --git a/0001-Fix-compile-issue-with-gcc-9.patch b/0001-Fix-compile-issue-with-gcc-9.patch new file mode 100644 index 0000000..1b422c0 --- /dev/null +++ b/0001-Fix-compile-issue-with-gcc-9.patch @@ -0,0 +1,28 @@ +From 4bc9f80bb0875648a2f3eca5b14e4e9e56cfda4d Mon Sep 17 00:00:00 2001 +From: Allan Sandfeld Jensen +Date: Tue, 13 Nov 2018 16:00:23 +0100 +Subject: [PATCH] Fix compile issue with gcc 9 + +It appears messenne_twisters in the latest libstdc++ has one more +requirement before it is willing to construct with our +SystemGenerator struct as an sseq provider. + +Change-Id: If38151d1fa6f40a80274acc26d9ed6b4ac6049fe +Reviewed-by: Giuseppe D'Angelo +Reviewed-by: Thiago Macieira +--- + src/corelib/global/qrandom.cpp | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/src/corelib/global/qrandom.cpp b/src/corelib/global/qrandom.cpp +index 23e5e499b2..03534cf453 100644 +--- a/src/corelib/global/qrandom.cpp ++++ b/src/corelib/global/qrandom.cpp +@@ -218,6 +218,7 @@ struct QRandomGenerator::SystemGenerator + #endif // Q_OS_WINRT + + static SystemGenerator &self(); ++ typedef quint32 result_type; + void generate(quint32 *begin, quint32 *end) Q_DECL_NOEXCEPT_EXPR(FillBufferNoexcept); + + // For std::mersenne_twister_engine implementations that use something diff --git a/libqt5-qtbase.changes b/libqt5-qtbase.changes index 664ccc0..cd5e766 100644 --- a/libqt5-qtbase.changes +++ b/libqt5-qtbase.changes @@ -1,3 +1,23 @@ +------------------------------------------------------------------- +Wed Jan 30 08:59:56 UTC 2019 - alarrosa@suse.com + +- Add 0001-Fix-compile-issue-with-gcc-9.patch to fix building with + the latest libstdc++ (boo#1121561) + +------------------------------------------------------------------- +Fri Jan 18 19:53:40 UTC 2019 - Fabian Vogt + +- Remove workaround patch as fixed in KWin meanwhile: + * 0001-Revert-xcb-Initialize-OpenGL-integration-only-when-r.patch + +------------------------------------------------------------------- +Thu Jan 17 14:01:50 UTC 2019 - Karl Cheng + +- Add 0001-Revert-xcb-Initialize-OpenGL-integration-only-when-r.patch: + * Revert upstream commit 60cecc86f8 to work around display + flickering issues with some display drivers + (https://bugreports.qt.io/browse/QTBUG-73122, boo#1120090) + ------------------------------------------------------------------- Mon Jan 7 13:56:29 UTC 2019 - bwiedemann@suse.com diff --git a/libqt5-qtbase.spec b/libqt5-qtbase.spec index 88726dd..0a81a58 100644 --- a/libqt5-qtbase.spec +++ b/libqt5-qtbase.spec @@ -72,6 +72,7 @@ Patch19: qapplication-emit-palettechanged.patch # PATCH-FIX-UPSTREAM Patch20: 0001-Fix-qfloat16-methods-definition-without-declaration-.patch # patches 1000-2000 and above from upstream 5.12 branch # +Patch1000: 0001-Fix-compile-issue-with-gcc-9.patch # patches 2000-3000 and above from upstream 5.13/dev branch # Patch2000: reproducible-qrc-time.patch BuildRequires: alsa-devel