Accepting request 637856 from KDE:Qt5

Qt 5.11.2

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

fix-build-with-ffmpeg4.patch

@@ -1,32 +0,0 @@
-From a568ded46a678eac8139cb06595819c5ae874177 Mon Sep 17 00:00:00 2001
-From: Xiaohan Wang <xhwang@chromium.org>
-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 <dalecurtis@chromium.org>
-Commit-Queue: Xiaohan Wang <xhwang@chromium.org>
-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<DecoderBuffer> {
-  public:
-   enum {
--    kPaddingSize = 32,
-+    kPaddingSize = 64,
- #if defined(ARCH_CPU_ARM_FAMILY)
-     kAlignmentSize = 16
- #else

libqt5-qtwebengine.changes

@@ -1,3 +1,18 @@
+-------------------------------------------------------------------
+Fri Sep 21 07:59:57 UTC 2018 - fabian@ritter-vogt.de
+
+- Update to 5.11.2
+  * New bugfix release
+  * For more details please see:
+  * http://code.qt.io/cgit/qt/qtwebengine.git/plain/dist/changes-5.11.2/?h=v5.11.2
+- Remove patches, now upstream:
+  * fix-build-with-ffmpeg4.patch
+
+-------------------------------------------------------------------
+Tue Aug 14 09:31:03 UTC 2018 - wbauer@tmo.at
+
+- Use pkgconfig() notation for the libav* BuildRequires
+
 -------------------------------------------------------------------
 Sat Jun 30 09:22:22 UTC 2018 - fabian@ritter-vogt.de
 

libqt5-qtwebengine.spec

@@ -52,16 +52,16 @@
 %global _qtwebengine_dictionaries_dir %{_libqt5_datadir}/qtwebengine_dictionaries
 
 Name:           libqt5-qtwebengine
-Version:        5.11.1
+Version:        5.11.2
 Release:        0
 Summary:        Qt 5 WebEngine Library
 License:        LGPL-3.0-only or GPL-2.0-only or GPL-3.0-only
 Group:          Development/Libraries/X11
 Url:            https://www.qt.io
 %define base_name libqt5
-%define real_version 5.11.1
-%define so_version 5.11.1
-%define tar_version qtwebengine-everywhere-src-5.11.1
+%define real_version 5.11.2
+%define so_version 5.11.2
+%define tar_version qtwebengine-everywhere-src-5.11.2
 Source:         https://download.qt.io/official_releases/qt/5.11/%{real_version}/submodules/%{tar_version}.tar.xz
 Source1:        baselibs.conf
 # PATCH-FIX-UPSTREAM armv6-ffmpeg-no-thumb.patch - Fix ffmpeg configuration for armv6
@@ -72,7 +72,6 @@ Patch2:         disable-gpu-when-using-nouveau-boo-1005323.diff
 Patch5:         harmony-fix.diff
 Patch6:         no-return-in-nonvoid-function.diff
 # PATCH-FIX-UPSTREAM
-Patch7:         fix-build-with-ffmpeg4.patch
 Patch8:         chromium-66.0.3359.170-gcc8-alignof.patch
 # http://www.chromium.org/blink not ported to PowerPC
 ExcludeArch:    ppc ppc64 ppc64le s390 s390x
@@ -187,9 +186,9 @@ BuildRequires:  pkgconfig(icu-i18n) >= 54.0
 BuildRequires:  pkgconfig(vpx) >= 1.4.0
 %endif
 %if %{with system_ffmpeg}
-BuildRequires:  libavformat-devel
-BuildRequires:  libavcodec-devel
-BuildRequires:  libavutil-devel
+BuildRequires:  pkgconfig(libavformat)
+BuildRequires:  pkgconfig(libavcodec)
+BuildRequires:  pkgconfig(libavutil)
 %endif
 %if %qt5_snapshot
 #to create the forwarding headers

qtwebengine-everywhere-src-5.11.1.tar.xz

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

qtwebengine-everywhere-src-5.11.2.tar.xz

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