diff --git a/disable-gpu-when-using-nouveau-boo-1005323.diff b/disable-gpu-when-using-nouveau-boo-1005323.diff index 5c40222..de53abf 100644 --- a/disable-gpu-when-using-nouveau-boo-1005323.diff +++ b/disable-gpu-when-using-nouveau-boo-1005323.diff @@ -7,11 +7,11 @@ It also crashes when running on wayland, the cause is not yet known. Work around these issues by not doing GPU-accelerated rendering in such cases. -Index: qtwebengine-everywhere-src-5.10.0/src/core/web_engine_context.cpp +Index: qtwebengine-everywhere-src-5.11.0/src/core/web_engine_context.cpp =================================================================== ---- qtwebengine-everywhere-src-5.10.0.orig/src/core/web_engine_context.cpp -+++ qtwebengine-everywhere-src-5.10.0/src/core/web_engine_context.cpp -@@ -93,6 +93,7 @@ +--- qtwebengine-everywhere-src-5.11.0.orig/src/core/web_engine_context.cpp ++++ qtwebengine-everywhere-src-5.11.0/src/core/web_engine_context.cpp +@@ -100,6 +100,7 @@ #include #ifndef QT_NO_OPENGL # include @@ -19,7 +19,7 @@ Index: qtwebengine-everywhere-src-5.10.0/src/core/web_engine_context.cpp #endif #include #include -@@ -167,6 +168,39 @@ void dummyGetPluginCallback(const std::v +@@ -178,6 +179,39 @@ void dummyGetPluginCallback(const std::v } #endif @@ -59,7 +59,7 @@ Index: qtwebengine-everywhere-src-5.10.0/src/core/web_engine_context.cpp } // namespace namespace QtWebEngineCore { -@@ -379,6 +413,27 @@ WebEngineContext::WebEngineContext() +@@ -414,6 +448,27 @@ WebEngineContext::WebEngineContext() const char *glType = 0; #ifndef QT_NO_OPENGL @@ -87,7 +87,7 @@ Index: qtwebengine-everywhere-src-5.10.0/src/core/web_engine_context.cpp bool tryGL = !usingANGLE() && (!usingSoftwareDynamicGL() -@@ -389,7 +444,7 @@ WebEngineContext::WebEngineContext() +@@ -424,7 +479,7 @@ WebEngineContext::WebEngineContext() || enableWebGLSoftwareRendering #endif ) diff --git a/fix-build-with-ffmpeg4.patch b/fix-build-with-ffmpeg4.patch new file mode 100644 index 0000000..3ebcb51 --- /dev/null +++ b/fix-build-with-ffmpeg4.patch @@ -0,0 +1,32 @@ +From a568ded46a678eac8139cb06595819c5ae874177 Mon Sep 17 00:00:00 2001 +From: Xiaohan Wang +Date: Mon, 29 Jan 2018 21:28:28 +0000 +Subject: [PATCH] media: Increase DecoderBuffer::kPaddingSize to 64 + +AV_INPUT_BUFFER_PADDING_SIZE has been increased to 64 in FFmpeg: +https://github.com/FFmpeg/FFmpeg/commit/6e80079a2840ee407c5d126030eb1066bcbfdfc5 + +BUG=777484 + +Change-Id: I1bd68d1c1b0c3131f28d6e07e1444b89800c09db +Reviewed-on: https://chromium-review.googlesource.com/889686 +Reviewed-by: Dale Curtis +Commit-Queue: Xiaohan Wang +Cr-Commit-Position: refs/heads/master@{#532593} +--- + src/3rdparty/chromium/media/base/decoder_buffer.h | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/3rdparty/chromium/media/base/decoder_buffer.h b/src/3rdparty/chromium/media/base/decoder_buffer.h +index 0341e5784f725..60ffba708b0e5 100644 +--- a/src/3rdparty/chromium/media/base/decoder_buffer.h ++++ b/src/3rdparty/chromium/media/base/decoder_buffer.h +@@ -37,7 +37,7 @@ class MEDIA_EXPORT DecoderBuffer + : public base::RefCountedThreadSafe { + public: + enum { +- kPaddingSize = 32, ++ kPaddingSize = 64, + #if defined(ARCH_CPU_ARM_FAMILY) + kAlignmentSize = 16 + #else diff --git a/fix-build-with-gcc-8-for-real.patch b/fix-build-with-gcc-8-for-real.patch new file mode 100644 index 0000000..4cc9df6 --- /dev/null +++ b/fix-build-with-gcc-8-for-real.patch @@ -0,0 +1,30 @@ +From b8eb1cbe818f3cf1e6518dadb21cb54b84d890b9 Mon Sep 17 00:00:00 2001 +From: Scott Violet +Date: Fri, 2 Mar 2018 00:39:29 +0000 +Subject: [PATCH] Fixes operator bool in InterfaceRequest + +BUG=none +TEST=none + +Change-Id: Iaa66929033aeea93fcbb31c2793f0251b3b7db8b +Reviewed-on: https://chromium-review.googlesource.com/944253 +Reviewed-by: Ken Rockot +Commit-Queue: Scott Violet +Cr-Commit-Position: refs/heads/master@{#540376} +--- + src/3rdparty/chromium/mojo/public/cpp/bindings/interface_request.h | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/3rdparty/chromium/mojo/public/cpp/bindings/interface_request.h b/src/3rdparty/chromium/mojo/public/cpp/bindings/interface_request.h +index 1007cb0b8c80f..ccfdb3716e5d9 100644 +--- a/src/3rdparty/chromium/mojo/public/cpp/bindings/interface_request.h ++++ b/src/3rdparty/chromium/mojo/public/cpp/bindings/interface_request.h +@@ -54,7 +54,7 @@ class InterfaceRequest { + // Indicates whether the request currently contains a valid message pipe. + bool is_pending() const { return handle_.is_valid(); } + +- explicit operator bool() const { return handle_; } ++ explicit operator bool() const { return handle_.is_valid(); } + + // Removes the message pipe from the request and returns it. + ScopedMessagePipeHandle PassMessagePipe() { return std::move(handle_); } diff --git a/fix-build-with-gcc-8.patch b/fix-build-with-gcc-8.patch new file mode 100644 index 0000000..07af2d2 --- /dev/null +++ b/fix-build-with-gcc-8.patch @@ -0,0 +1,46 @@ +From b65488bce5e804e97acb64ccb696195699a26b8a Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?J=C3=BCri=20Valdmann?= +Date: Wed, 16 May 2018 02:27:40 +0000 +Subject: [PATCH] Fix operator bool in AssociatedInterfacePtrInfo and + AssociatedInterfaceRequest + +Current version does not compile with GCC 8.1 and for good reason: there's no +operator bool defined in ScopedInterfaceEndpointHandle. + +Bug: 795173, 819294 +Change-Id: Ia0677af3160fb24c376c66863956ee6d171d7caf +Reviewed-on: https://chromium-review.googlesource.com/1059153 +Commit-Queue: Raphael Kubo da Costa +Reviewed-by: Ken Rockot +Cr-Commit-Position: refs/heads/master@{#558931} +--- + src/3rdparty/chromium/mojo/public/cpp/bindings/associated_interface_ptr_info.h | 2 +- + src/3rdparty/chromium/mojo/public/cpp/bindings/associated_interface_request.h | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) + +diff --git a/src/3rdparty/chromium/mojo/public/cpp/bindings/associated_interface_ptr_info.h b/src/3rdparty/chromium/mojo/public/cpp/bindings/associated_interface_ptr_info.h +index 1f79662bd7945..cc3f627167956 100644 +--- a/src/3rdparty/chromium/mojo/public/cpp/bindings/associated_interface_ptr_info.h ++++ b/src/3rdparty/chromium/mojo/public/cpp/bindings/associated_interface_ptr_info.h +@@ -45,7 +45,7 @@ class AssociatedInterfacePtrInfo { + + bool is_valid() const { return handle_.is_valid(); } + +- explicit operator bool() const { return handle_; } ++ explicit operator bool() const { return handle_.is_valid(); } + + ScopedInterfaceEndpointHandle PassHandle() { + return std::move(handle_); +diff --git a/src/3rdparty/chromium/mojo/public/cpp/bindings/associated_interface_request.h b/src/3rdparty/chromium/mojo/public/cpp/bindings/associated_interface_request.h +index 12d2f3ce1df1a..0926f3df92f85 100644 +--- a/src/3rdparty/chromium/mojo/public/cpp/bindings/associated_interface_request.h ++++ b/src/3rdparty/chromium/mojo/public/cpp/bindings/associated_interface_request.h +@@ -50,7 +50,7 @@ class AssociatedInterfaceRequest { + // handle. + bool is_pending() const { return handle_.is_valid(); } + +- explicit operator bool() const { return handle_; } ++ explicit operator bool() const { return handle_.is_valid(); } + + ScopedInterfaceEndpointHandle PassHandle() { return std::move(handle_); } + diff --git a/harmony-fix.diff b/harmony-fix.diff index d0c50a0..65f4970 100644 --- a/harmony-fix.diff +++ b/harmony-fix.diff @@ -3,10 +3,10 @@ Date: 2017-09-19 23:30:08 -0700 Subject: This is required for QtWebEngine to show the patent-free LCD rendering. Without this patch, only grayscale rendering is used. References: boo#1061344 Upstream: submitted -Index: qtwebengine-everywhere-src-5.10.0/src/3rdparty/chromium/third_party/skia/src/ports/SkFontHost_FreeType.cpp +Index: qtwebengine-everywhere-src-5.11.0/src/3rdparty/chromium/third_party/skia/src/ports/SkFontHost_FreeType.cpp =================================================================== ---- qtwebengine-everywhere-src-5.10.0.orig/src/3rdparty/chromium/third_party/skia/src/ports/SkFontHost_FreeType.cpp -+++ qtwebengine-everywhere-src-5.10.0/src/3rdparty/chromium/third_party/skia/src/ports/SkFontHost_FreeType.cpp +--- qtwebengine-everywhere-src-5.11.0.orig/src/3rdparty/chromium/third_party/skia/src/ports/SkFontHost_FreeType.cpp ++++ qtwebengine-everywhere-src-5.11.0/src/3rdparty/chromium/third_party/skia/src/ports/SkFontHost_FreeType.cpp @@ -99,8 +99,6 @@ public: FreeTypeLibrary() : fGetVarDesignCoordinates(nullptr) @@ -43,7 +43,7 @@ Index: qtwebengine-everywhere-src-5.10.0/src/3rdparty/chromium/third_party/skia/ // FT_Library_SetLcdFilterWeights was introduced in FreeType 2.4.0. // The following platforms provide FreeType of at least 2.4.0. -@@ -661,17 +653,6 @@ void SkTypeface_FreeType::onFilterRec(Sk +@@ -659,17 +651,6 @@ void SkTypeface_FreeType::onFilterRec(Sk rec->fTextSize = SkIntToScalar(1 << 14); } @@ -61,7 +61,7 @@ Index: qtwebengine-everywhere-src-5.10.0/src/3rdparty/chromium/third_party/skia/ SkPaint::Hinting h = rec->getHinting(); if (SkPaint::kFull_Hinting == h && !isLCD(*rec)) { // collapse full->normal hinting if we're not doing LCD -@@ -1072,11 +1053,11 @@ bool SkScalerContext_FreeType::getCBoxFo +@@ -1062,11 +1043,11 @@ bool SkScalerContext_FreeType::getCBoxFo void SkScalerContext_FreeType::updateGlyphIfLCD(SkGlyph* glyph) { if (isLCD(fRec)) { if (fLCDIsVert) { diff --git a/libqt5-qtwebengine.changes b/libqt5-qtwebengine.changes index 95758d9..a4e01ab 100644 --- a/libqt5-qtwebengine.changes +++ b/libqt5-qtwebengine.changes @@ -1,3 +1,20 @@ +------------------------------------------------------------------- +Thu Jun 7 07:18:15 UTC 2018 - fvogt@suse.com + +- Add yet another upstream chromium patch to fix build with GCC 8.1: + * fix-build-with-gcc-8-for-real.patch + +------------------------------------------------------------------- +Tue Jun 5 12:02:59 UTC 2018 - lbeltrame@kde.org + +- Add upstream Chromium patch to fix build with GCC 8.1: + * fix-build-with-gcc-8.patch +- Add upstream Chromium patch to fix build with ffmpeg 4: + * fix-build-with-ffmpeg4.patch +- Refresh patches: + * disable-gpu-when-using-nouveau-boo-1005323.diff + * harmony-fix.diff + ------------------------------------------------------------------- Wed May 30 07:54:28 UTC 2018 - fabian@ritter-vogt.de @@ -192,7 +209,7 @@ Wed Nov 15 11:41:56 UTC 2017 - fabian@ritter-vogt.de Thu Nov 2 08:53:34 UTC 2017 - tittiatcoke@gmail.com - Add some feature from the Chromium builds to determine the maximum - allowed parallel processes based on the available memory. Also + allowed parallel processes based on the available memory. Also ensure that the ninja build follows this maximum ------------------------------------------------------------------- @@ -312,7 +329,7 @@ Tue May 30 14:32:33 UTC 2017 - fabian@ritter-vogt.de Wed May 24 19:16:41 UTC 2017 - fabian@ritter-vogt.de - Update to 5.9.0 RC: - * For more details please see: + * For more details please see: http://lists.qt-project.org/pipermail/announce/2017-May/000115.html and https://wiki.qt.io/New_Features_in_Qt_5.9 - Remove patches, now upstream: @@ -417,7 +434,7 @@ Fri Mar 18 19:03:33 UTC 2016 - hrvoje.senjan@gmail.com ------------------------------------------------------------------- Thu Dec 3 07:24:43 UTC 2015 - mlin@suse.com -- Do not build on s390 and s390x, chromium have not ported to them +- Do not build on s390 and s390x, chromium have not ported to them ------------------------------------------------------------------- Fri Oct 16 20:22:42 UTC 2015 - hrvoje.senjan@gmail.com @@ -456,7 +473,7 @@ Mon Jun 29 15:23:43 UTC 2015 - schwab@suse.de ------------------------------------------------------------------- Mon Jun 22 11:56:10 UTC 2015 - tittiatcoke@gmail.com -- Add patch gcc50-fixes.diff to fix the detection of the GCC 5.x +- Add patch gcc50-fixes.diff to fix the detection of the GCC 5.x compiler. Patch is equal to the one used for Chromium ------------------------------------------------------------------- diff --git a/libqt5-qtwebengine.spec b/libqt5-qtwebengine.spec index ca590c0..a31df84 100644 --- a/libqt5-qtwebengine.spec +++ b/libqt5-qtwebengine.spec @@ -72,6 +72,10 @@ Patch2: disable-gpu-when-using-nouveau-boo-1005323.diff # PATCH-FIX-UPSTREAM harmony-fix.diff -- Show the patent-free LCD rendering. Without this patch, only grayscale rendering is used. (for freetype-2.8.1) boo#1061344 Patch5: harmony-fix.diff Patch6: no-return-in-nonvoid-function.diff +# PATCH-FIX-UPSTREAM +Patch7: fix-build-with-ffmpeg4.patch +Patch8: fix-build-with-gcc-8.patch +Patch9: fix-build-with-gcc-8-for-real.patch # http://www.chromium.org/blink not ported to PowerPC ExcludeArch: ppc ppc64 ppc64le s390 s390x # Try to fix i586 MemoryErrors with rpmlint @@ -305,7 +309,7 @@ if test -n "$makeproc" -a "$makeproc" -gt 1 ; then fi # Ensure that also the internal chromium build follows the right number of parallell -# processess instead of its defaults. +# processess instead of its defaults. export NINJAFLAGS="-j $makeproc" %if 0%{?suse_version} < 1330