Accepting request 507712 from KDE:Qt5

Qt 5.9.1

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

arm64-linux.patch

@@ -1,43 +0,0 @@
-From 801c957651fba94b5d7dde9cc490378a4dc3a987 Mon Sep 17 00:00:00 2001
-From: Allan Sandfeld Jensen <allan.jensen@qt.io>
-Date: Thu, 1 Jun 2017 11:40:02 +0200
-Subject: [PATCH] [Backport] GN: Add Arm64 Linux support
-
-Add Arm64 linux support be able to build GN binary for
-native arm64 builds.
-
-R=dpranke@chromium.org, brettw@chromium.org
-
-Review-Url: https://codereview.chromium.org/2550673002
-
-Task-number: QTBUG-61128
-Change-Id: I3aa6b6ca7df374428a7f4a8b4db9f488a8926f6c
-Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
----
- src/3rdparty/chromium/tools/gn/args.cc | 3 +++
- 1 file changed, 3 insertions(+)
-
-diff --git a/src/3rdparty/chromium/tools/gn/args.cc b/src/3rdparty/chromium/tools/gn/args.cc
-index 7285d7a..54703e1 100644
---- a/src/3rdparty/chromium/tools/gn/args.cc
-+++ b/src/3rdparty/chromium/tools/gn/args.cc
-@@ -266,6 +266,7 @@ void Args::SetSystemVarsLocked(Scope* dest) const {
-   static const char kX86[] = "x86";
-   static const char kX64[] = "x64";
-   static const char kArm[] = "arm";
-+  static const char kArm64[] = "arm64";
-   static const char kMips[] = "mipsel";
-   static const char kS390X[] = "s390x";
-   static const char kPPC64[] = "ppc64";
-@@ -280,6 +281,8 @@ void Args::SetSystemVarsLocked(Scope* dest) const {
-     arch = kX64;
-   else if (os_arch.substr(0, 3) == "arm")
-     arch = kArm;
-+  else if (os_arch == "aarch64")
-+    arch = kArm64;
-   else if (os_arch == "mips")
-     arch = kMips;
-   else if (os_arch == "s390x")
--- 
-2.7.4
-

arm64-toolchain.patch

@@ -1,42 +0,0 @@
-Subject: Add gcc toolchain for arm64/linux
-
-This is needed for Chromium builds in debian/arm64
-and matches how arm, x86 and x86_64 also have
-both clang and gcc toolchains available.
-
-R=brettw@chromium.org, dpranke@chromium.org, scottmg@chromium.org
-
-Committed: https://crrev.com/62c17901df9489112816380771666f4e6857cd59
-Cr-Commit-Position: refs/heads/master@{#436267}
-
----
-Index: src/3rdparty/chromium/build/toolchain/linux/BUILD.gn
-diff --git a/src/3rdparty/chromium/build/toolchain/linux/BUILD.gn b/src/3rdparty/chromium/build/toolchain/linux/BUILD.gn
-index 548722d3938017ac936b9088b7a686c2afbbb5fe..86cd7dabc6e86d22a266817dfbb3bf0c719f7992 100644
---- a/src/3rdparty/chromium/build/toolchain/linux/BUILD.gn
-+++ b/src/3rdparty/chromium/build/toolchain/linux/BUILD.gn
-@@ -21,6 +21,24 @@ clang_toolchain("clang_arm64") {
-   }
- }
- 
-+gcc_toolchain("arm64") {
-+  toolprefix = "aarch64-linux-gnu-"
-+
-+  cc = "${toolprefix}gcc"
-+  cxx = "${toolprefix}g++"
-+
-+  ar = "${toolprefix}ar"
-+  ld = cxx
-+  readelf = "${toolprefix}readelf"
-+  nm = "${toolprefix}nm"
-+
-+  toolchain_args = {
-+    current_cpu = "arm64"
-+    current_os = "linux"
-+    is_clang = false
-+  }
-+}
-+
- gcc_toolchain("arm") {
-   toolprefix = "arm-linux-gnueabihf-"
- 

armv6-ffmpeg-no-thumb.patch

@@ -1,8 +1,8 @@
-Index: qtwebengine-opensource-src-5.8.0/src/3rdparty/chromium/third_party/ffmpeg/chromium/config/Chromium/linux/arm/config.h
+Index: qtwebengine-opensource-src-5.9.1/src/3rdparty/chromium/third_party/ffmpeg/chromium/config/Chromium/linux/arm/config.h
 ===================================================================
---- qtwebengine-opensource-src-5.8.0.orig/src/3rdparty/chromium/third_party/ffmpeg/chromium/config/Chromium/linux/arm/config.h
+--- qtwebengine-opensource-src-5.9.1.orig/src/3rdparty/chromium/third_party/ffmpeg/chromium/config/Chromium/linux/arm/config.h
-+++ qtwebengine-opensource-src-5.8.0/src/3rdparty/chromium/third_party/ffmpeg/chromium/config/Chromium/linux/arm/config.h
++++ qtwebengine-opensource-src-5.9.1/src/3rdparty/chromium/third_party/ffmpeg/chromium/config/Chromium/linux/arm/config.h
-@@ -550,7 +550,7 @@
+@@ -569,7 +569,7 @@
  #define CONFIG_PIC 1
  #define CONFIG_POD2MAN 1
  #define CONFIG_RAISE_MAJOR 0

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

@@ -1,7 +1,7 @@
-Index: qtwebengine-opensource-src-5.9.0-beta4/src/core/web_engine_context.cpp
+Index: qtwebengine-opensource-src-5.9.1/src/core/web_engine_context.cpp
 ===================================================================
---- qtwebengine-opensource-src-5.9.0-beta4.orig/src/core/web_engine_context.cpp
+--- qtwebengine-opensource-src-5.9.1.orig/src/core/web_engine_context.cpp
-+++ qtwebengine-opensource-src-5.9.0-beta4/src/core/web_engine_context.cpp
++++ qtwebengine-opensource-src-5.9.1/src/core/web_engine_context.cpp
 @@ -90,6 +90,7 @@
  #include <QOffscreenSurface>
  #ifndef QT_NO_OPENGL
@@ -10,7 +10,7 @@ Index: qtwebengine-opensource-src-5.9.0-beta4/src/core/web_engine_context.cpp
  #endif
  #include <QQuickWindow>
  #include <QStringList>
-@@ -177,6 +178,39 @@ void dummyGetPluginCallback(const std::v
+@@ -179,6 +180,39 @@ void dummyGetPluginCallback(const std::v
  }
  #endif
  
@@ -50,7 +50,7 @@ Index: qtwebengine-opensource-src-5.9.0-beta4/src/core/web_engine_context.cpp
  } // namespace
  
  namespace QtWebEngineCore {
-@@ -339,9 +373,23 @@ WebEngineContext::WebEngineContext()
+@@ -349,9 +383,23 @@ WebEngineContext::WebEngineContext()
  
      GLContextHelper::initialize();
  

libqt5-qtwebengine.changes

@@ -1,3 +1,13 @@
+-------------------------------------------------------------------
+Sat Jul  1 08:03:22 UTC 2017 - lbeltrame@kde.org
+
+- Update to 5.9.1
+  * For more details please see:
+    http://blog.qt.io/blog/2017/06/30/qt-5-9-1-released/
+- Drop upstreamed patches:
+  * arm64-linux.patch
+  * arm64-toolchain.patch
+
 -------------------------------------------------------------------
 Tue Jun 13 11:26:59 UTC 2017 - fvogt@suse.com
 

libqt5-qtwebengine.spec

@@ -44,26 +44,22 @@
 %endif
 
 Name:           libqt5-qtwebengine
-Version:        5.9.0
+Version:        5.9.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:            https://www.qt.io
 %define base_name libqt5
-%define real_version 5.9.0
+%define real_version 5.9.1
-%define so_version 5.9.0
+%define so_version 5.9.1
 %define tar_version qtwebengine-opensource-src-%{real_version}
 Source:         https://download.qt.io/official_releases/qt/5.9/%{real_version}/submodules/%{tar_version}.tar.xz
 Source1:        baselibs.conf
 # PATCH-FIX-UPSTREAM armv6-ffmpeg-no-thumb.patch - Fix ffmpeg configuration for armv6
-Patch2:         armv6-ffmpeg-no-thumb.patch
+Patch1:         armv6-ffmpeg-no-thumb.patch
-# PATCH-FIX-UPSTREAM
-Patch3:         arm64-linux.patch
-# PATCH-FIX-UPSTREAM (chromium!)
-Patch4:         arm64-toolchain.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
+Patch2:         disable-gpu-when-using-nouveau-boo-1005323.diff
 # http://www.chromium.org/blink not ported to PowerPC
 ExcludeArch:    ppc ppc64 ppc64le s390 s390x
 # Try to fix i586 MemoryErrors with rpmlint
@@ -228,10 +224,8 @@ Examples for the libqt5-qtwebengine module.
 %prep
 %setup -q -n qtwebengine-opensource-src-%{real_version}
 sed -i 's|$(STRIP)|strip|g' src/core/core_module.pro
+%patch1 -p1
 %patch2 -p1
-%patch3 -p1
-%patch4 -p1
-%patch5 -p1
 # QTBUG-61128
 sed -i -e '/toolprefix = /d' -e 's/\${toolprefix}//g' \
   src/3rdparty/chromium/build/toolchain/linux/BUILD.gn

qtwebengine-opensource-src-5.9.0.tar.xz

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:2ed4a579b0fc89c586ed84f131f8c64f6fb70f3126711138ce68f1290ac2b820
-size 217995696

qtwebengine-opensource-src-5.9.1.tar.xz

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