From ad3ce4b0dc46aa01f70bf3d27bce6f5a48c540f58720205208e817ba93646555 Mon Sep 17 00:00:00 2001 From: Dominique Leuenberger Date: Fri, 8 Dec 2017 11:53:11 +0000 Subject: [PATCH] Accepting request 545965 from KDE:Qt5 Qt 5.9.3 OBS-URL: https://build.opensuse.org/request/show/545965 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/libqt5-qtwebengine?expand=0&rev=27 --- libqt5-qtwebengine.changes | 11 ++++++++++ libqt5-qtwebengine.spec | 9 +++++--- qtwebengine-opensource-src-5.9.2.tar.xz | 3 --- qtwebengine-opensource-src-5.9.3.tar.xz | 3 +++ spinlock-armv6.patch | 29 +++++++++++++++++++++++++ 5 files changed, 49 insertions(+), 6 deletions(-) delete mode 100644 qtwebengine-opensource-src-5.9.2.tar.xz create mode 100644 qtwebengine-opensource-src-5.9.3.tar.xz create mode 100644 spinlock-armv6.patch diff --git a/libqt5-qtwebengine.changes b/libqt5-qtwebengine.changes index 4878d07..d1f09a3 100644 --- a/libqt5-qtwebengine.changes +++ b/libqt5-qtwebengine.changes @@ -1,3 +1,14 @@ +------------------------------------------------------------------- +Sat Nov 25 12:46:51 UTC 2017 - fabian@ritter-vogt.de + +- Update to 5.9.3 + * New bugfix release + * For more details, see: + http://code.qt.io/cgit/qt/qtwebengine.git/tree/dist/changes-5.9.3/?h=v5.9.3 + +- Add patch to fix build on armv6: + spinlock-armv6.patch + ------------------------------------------------------------------- Tue Oct 31 16:49:12 UTC 2017 - fabian@ritter-vogt.de diff --git a/libqt5-qtwebengine.spec b/libqt5-qtwebengine.spec index 2e305b4..975b29b 100644 --- a/libqt5-qtwebengine.spec +++ b/libqt5-qtwebengine.spec @@ -49,15 +49,15 @@ %endif Name: libqt5-qtwebengine -Version: 5.9.2 +Version: 5.9.3 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.2 -%define so_version 5.9.2 +%define real_version 5.9.3 +%define so_version 5.9.3 %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 @@ -67,6 +67,8 @@ Patch1: armv6-ffmpeg-no-thumb.patch 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 Patch3: harmony-fix.diff +# PATCH-FIX-OPENSUSE +Patch4: spinlock-armv6.patch # http://www.chromium.org/blink not ported to PowerPC ExcludeArch: ppc ppc64 ppc64le s390 s390x # Try to fix i586 MemoryErrors with rpmlint @@ -240,6 +242,7 @@ sed -i 's|$(STRIP)|strip|g' src/core/core_module.pro %patch1 -p1 %patch2 -p1 %patch3 -p1 +%patch4 -p1 # QTBUG-61128 sed -i -e '/toolprefix = /d' -e 's/\${toolprefix}//g' \ src/3rdparty/chromium/build/toolchain/linux/BUILD.gn diff --git a/qtwebengine-opensource-src-5.9.2.tar.xz b/qtwebengine-opensource-src-5.9.2.tar.xz deleted file mode 100644 index 1737583..0000000 --- a/qtwebengine-opensource-src-5.9.2.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:cab069e4589f806640bebe4077c70e5cd5ffeb146c6e8caca6c4454fc0c4a108 -size 217353592 diff --git a/qtwebengine-opensource-src-5.9.3.tar.xz b/qtwebengine-opensource-src-5.9.3.tar.xz new file mode 100644 index 0000000..347a3a3 --- /dev/null +++ b/qtwebengine-opensource-src-5.9.3.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:45ae1142fd87271c100f4d7889427738e774e86db5d8f6bcf9ceb99d18571d37 +size 217344496 diff --git a/spinlock-armv6.patch b/spinlock-armv6.patch new file mode 100644 index 0000000..e91fb97 --- /dev/null +++ b/spinlock-armv6.patch @@ -0,0 +1,29 @@ +From: Fabian Vogt +Subject: Fix build on non-MP ARM archs +References: boo#1064535 + +The ARM ISA before armv6k does not have a yield instruction. + +Index: qtwebengine-opensource-src-5.9.1/src/3rdparty/chromium/third_party/WebKit/Source/wtf/SpinLock.cpp +=================================================================== +--- qtwebengine-opensource-src-5.9.1.orig/src/3rdparty/chromium/third_party/WebKit/Source/wtf/SpinLock.cpp ++++ qtwebengine-opensource-src-5.9.1/src/3rdparty/chromium/third_party/WebKit/Source/wtf/SpinLock.cpp +@@ -29,7 +29,17 @@ + #elif COMPILER(GCC) || COMPILER(CLANG) + #if CPU(X86_64) || CPU(X86) + #define YIELD_PROCESSOR __asm__ __volatile__("pause") +-#elif CPU(ARM) || CPU(ARM64) ++#elif (defined(_ARM_ARCH_6K__) || \ ++ defined(_ARM_ARCH_6Z__) || \ ++ defined(_ARM_ARCH_6ZK__) || \ ++ defined(__ARM_ARCH_6T2__) || \ ++ defined(__ARM_ARCH_7__) || \ ++ defined(__ARM_ARCH_7A__) || \ ++ defined(__ARM_ARCH_7R__) || \ ++ defined(__ARM_ARCH_7M__) || \ ++ defined(__ARM_ARCH_7S__) || \ ++ defined(__ARM_ARCH_8A__) || \ ++ defined(__aarch64__)) + #define YIELD_PROCESSOR __asm__ __volatile__("yield") + #elif CPU(MIPS) + // The MIPS32 docs state that the PAUSE instruction is a no-op on older