Accepting request 446455 from KDE:Qt5

Update to 5.7.1

OBS-URL: https://build.opensuse.org/request/show/446455
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/libqt5-qtwebengine?expand=0&rev=17

Do-not-depend-on-Linux-4.5.patch

@@ -1,32 +0,0 @@
-From b12ffcd411d4776f7120ccecb3be34344d930d2b Mon Sep 17 00:00:00 2001
-From: Allan Sandfeld Jensen <allan.jensen@theqtcompany.com>
-Date: Tue, 9 Aug 2016 16:21:29 +0200
-Subject: Do not depend on Linux 4.5
-
-Avoid using MADV_FREE that was only recently added to Linux. It will fail when
-run on older Linux kernels.
-
-Change-Id: I9b0369fb31402f088b2327c12f70dd39f5e4c8c0
-Reviewed-by: Peter Varga <pvarga@inf.u-szeged.hu>
----
- src/3rdparty/chromium/third_party/WebKit/Source/wtf/PageAllocator.cpp | 5 +++++
- 1 file changed, 5 insertions(+)
-
-diff --git a/src/3rdparty/chromium/third_party/WebKit/Source/wtf/PageAllocator.cpp b/src/3rdparty/chromium/third_party/WebKit/Source/wtf/PageAllocator.cpp
-index 121b687..be7c3b9 100644
---- a/src/3rdparty/chromium/third_party/WebKit/Source/wtf/PageAllocator.cpp
-+++ b/src/3rdparty/chromium/third_party/WebKit/Source/wtf/PageAllocator.cpp
-@@ -39,6 +39,11 @@
- 
- #include <sys/mman.h>
- 
-+#if OS(LINUX) && defined(MADV_FREE)
-+// Added in Linux 4.5, but we don't want to depend on 4.5 at runtime
-+#undef MADV_FREE
-+#endif
-+
- #ifndef MADV_FREE
- #define MADV_FREE MADV_DONTNEED
- #endif
--- 
-cgit v1.0-4-g1e03

detect-gcc6-use-fno-delete-null-pointer-checks.diff

@@ -1,31 +0,0 @@
-From c7aeb3b03ecce75c40d3f53352e8b7b3a4d6d050 Mon Sep 17 00:00:00 2001
-From: Allan Sandfeld Jensen <allan.jensen@theqtcompany.com>
-Date: Fri, 10 Jun 2016 14:46:24 +0200
-Subject: [PATCH] Enable -fno_delete_null_pointer_checks on V8 for G++ 6
-
-Detect g++ 6 and disable null pointer check optimizations on v8.
-
-Change-Id: I5064823af3784786d455ce86592b5e65c1020f21
-Task-number: QTBUG-53956
-Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
----
- src/3rdparty              | 2 +-
- src/core/config/linux.pri | 2 ++
- 2 files changed, 3 insertions(+), 1 deletion(-)
-
-diff --git a/src/core/config/linux.pri b/src/core/config/linux.pri
-index 8854a4b..b579e2a 100644
---- a/src/core/config/linux.pri
-+++ b/src/core/config/linux.pri
-@@ -29,6 +29,8 @@ use?(nss) {
-         use_openssl_certs=1
- }
- 
-+gcc:!clang: greaterThan(QT_GCC_MAJOR_VERSION, 5): GYP_CONFIG += v8_no_delete_null_pointer_checks=1
-+
- contains(QT_CONFIG, system-zlib): use?(system_minizip): GYP_CONFIG += use_system_zlib=1
- contains(QT_CONFIG, system-png): GYP_CONFIG += use_system_libpng=1
- contains(QT_CONFIG, system-jpeg): GYP_CONFIG += use_system_libjpeg=1
--- 
-2.7.4
-

disable-gpu-when-using-nouveau-boo-1005323.diff

@@ -2,16 +2,15 @@ Index: qtwebengine-opensource-src-5.7.1/src/core/web_engine_context.cpp
 ===================================================================
 --- qtwebengine-opensource-src-5.7.1.orig/src/core/web_engine_context.cpp
 +++ qtwebengine-opensource-src-5.7.1/src/core/web_engine_context.cpp
-@@ -87,6 +87,8 @@
+@@ -88,6 +88,7 @@
- #include <QFileInfo>
  #include <QGuiApplication>
+ #include <QOffscreenSurface>
  #include <QOpenGLContext>
 +#include <QOpenGLFunctions>
-+#include <QOffscreenSurface>
  #include <QStringList>
+ #include <QSurfaceFormat>
  #include <QVector>
- #include <qpa/qplatformnativeinterface.h>
+@@ -162,6 +163,37 @@ void dummyGetPluginCallback(const std::v
-@@ -158,6 +160,37 @@ void dummyGetPluginCallback(const std::v
  }
  #endif
  
@@ -49,25 +48,25 @@ Index: qtwebengine-opensource-src-5.7.1/src/core/web_engine_context.cpp
  } // namespace
  
  namespace QtWebEngineCore {
-@@ -294,7 +327,20 @@ WebEngineContext::WebEngineContext()
+@@ -309,8 +341,20 @@ WebEngineContext::WebEngineContext()
- 
+
      GLContextHelper::initialize();
- 
+
--    if (usingANGLE() || usingSoftwareDynamicGL() || usingQtQuick2DRenderer()) {
 +    bool disableGpu = qEnvironmentVariableIsSet("QT_WEBENGINE_DISABLE_GPU");
 +
 +    if (!qEnvironmentVariableIsSet("QT_WEBENGINE_DISABLE_NOUVEAU_WORKAROUND") && openGLVendor() == QStringLiteral("nouveau"))
 +    {
 +        qWarning() << "Nouveau openGL driver detected. Qt WebEngine will disable usage of the GPU.\n"
-+                      "Please consider using the propietary NVIDIA drivers.\n\n"
++                      "Note: you can set the QT_WEBENGINE_DISABLE_NOUVEAU_WORKAROUND\n"
-+                      "Alternatively, you can set the QT_WEBENGINE_DISABLE_NOUVEAU_WORKAROUND\n"
 +                      "environment variable before running this application, but this is \n"
 +                      "not recommended since this usually causes applications to crash as\n"
 +                      "Nouveau openGL drivers don't support multithreaded rendering";
 +        disableGpu = true;
 +    }
 +
-+    if (usingANGLE() || usingSoftwareDynamicGL() || usingQtQuick2DRenderer() || disableGpu) {
+     const char *glType = 0;
-         parsedCommandLine->AppendSwitch(switches::kDisableGpu);
+-    if (!usingANGLE() && !usingSoftwareDynamicGL() && !usingQtQuick2DRenderer()) {
-     } else {
++    if (!usingANGLE() && !usingSoftwareDynamicGL() && !usingQtQuick2DRenderer() && !disableGpu) {
-         const char *glType = 0;
+         if (qt_gl_global_share_context() && qt_gl_global_share_context()->isValid()) {
+             // If the native handle is QEGLNativeContext try to use GL ES/2, if there is no native handle
+             // assume we are using wayland and try GL ES/2, and finally Ozone demands GL ES/2 too.

libqt5-qtwebengine.changes

@@ -1,3 +1,14 @@
+-------------------------------------------------------------------
+Wed Dec 14 16:06:02 UTC 2016 - hrvoje.senjan@gmail.com
+
+- Update to 5.7.1
+  * For more details please see:
+    https://blog.qt.io/blog/2016/12/14/qt-5-7-1-released/
+    and https://www.qt.io/qt5-7/
+- Drop upstreamed patches:
+  Do-not-depend-on-Linux-4.5.patch and
+  detect-gcc6-use-fno-delete-null-pointer-checks.diff
+
 -------------------------------------------------------------------
 Thu Nov  3 10:47:39 UTC 2016 - wbauer@tmo.at
 

libqt5-qtwebengine.spec

@@ -19,28 +19,24 @@
 %define qt5_snapshot 0
 
 Name:           libqt5-qtwebengine
-Version:        5.7.0
+Version:        5.7.1
 Release:        0
 Summary:        Qt 5 WebEngine Library
 License:        SUSE-LGPL-2.1-with-digia-exception-1.1 or GPL-3.0
 Group:          Development/Libraries/X11
 Url:            http://qt.digia.com
 %define base_name libqt5
-%define real_version 5.7.0
+%define real_version 5.7.1
-%define so_version 5.7.0
+%define so_version 5.7.1
 %define tar_version qtwebengine-opensource-src-%{real_version}
 Source:         %{tar_version}.tar.xz
 Source1:        baselibs.conf
 # PATCH-FIX-UPSTREAM: use-fno-delete-null-pointer-checks-with-gcc-6.diff - Fix crashes when using GCC6
 Patch0:         use-fno-delete-null-pointer-checks-with-gcc-6.diff
-# PATCH-FIX-UPSTREAM: detect-gcc6-use-fno-delete-null-pointer-checks.diff - Fix crashes with GCC 6
-Patch1:         detect-gcc6-use-fno-delete-null-pointer-checks.diff
 # PATCH-FIX-UPSTREAM armv6-ffmpeg-no-thumb.patch - Fix ffmpeg configuration for armv6
 Patch2:         armv6-ffmpeg-no-thumb.patch
 # PATCH-FIX-UPSTREAM webrtc-build-with-neon.patch - Properly configure webrtc for neon support
 Patch3:         webrtc-build-with-neon.patch
-# PATCH-FIX-UPSTREAM Do-not-depend-on-Linux-4.5.patch
-Patch4:         Do-not-depend-on-Linux-4.5.patch
 # PATCH-FIX-UPSTREAM disable-gpu-when-using-nouveau-boo-1005323.diff -- Detect nouveau opengl drivers and disable gpu usage to work around nouveau crashing
 Patch5:         disable-gpu-when-using-nouveau-boo-1005323.diff
 # http://www.chromium.org/blink not ported to PowerPC
@@ -150,10 +146,8 @@ Qt is a set of libraries for developing applications.
 %setup -q -n qtwebengine-opensource-src-%{real_version}
 sed -i 's|$(STRIP)|strip|g' src/core/core_module.pro
 %patch0 -p1
-%patch1 -p1
 %patch2 -p1
 %patch3 -p1
-%patch4 -p1
 %patch5 -p1
 
 %package devel

qtwebengine-opensource-src-5.7.0.tar.xz

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:985762fff5cd8a1a0d2a644a4a51238676898685f9ff1a78c3f2800025d6dc5d
-size 165709640

qtwebengine-opensource-src-5.7.1.tar.xz

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:2101883e3d632b50133a14e3bbdc1d4d649e405c9618f2eef1b72a7b821ccc2b
+size 163782564

use-fno-delete-null-pointer-checks-with-gcc-6.diff

@@ -36,7 +36,7 @@ index 15d6014..2c6fbf6 100644
      # Chrome needs this definition unconditionally. For standalone V8 builds,
      # it's handled in build/standalone.gypi.
      'want_separate_host_toolset%': 1,
-@@ -1069,6 +1073,9 @@
+@@ -1066,6 +1070,9 @@
            [ 'v8_no_strict_aliasing==1', {
              'cflags': [ '-fno-strict-aliasing' ],
            }],