From 969f1f80bf255498abbec6886d443670c20a79c8 Mon Sep 17 00:00:00 2001 From: Samuli Piippo Date: Fri, 9 Jun 2017 09:34:09 +0300 Subject: Upgrade to Qt 5.9.0 * adapt QtWebEngine recipe to use GN instead of GYP * add QtRemoteObjects and QtWebView as a new Qt modules * update available QtBase configure arguments * remove obsolete patches * patch all .pc files to remove build paths * include generated QML cache files in packages * the patch "configure paths for target qmake properly" could not be applied anymore and support must be done differently * QtWebEngine now requires gcc-multilib to be installed on the host system, because the host tools are built to the same bitness as the target (arm -> x86, aarch64 -> x86-64) * refresh the patches to match with b5.9* branches on: https://github.com/meta-qt5/qtbase https://github.com/meta-qt5/qtwebengine and 56-based branch on https://github.com/meta-qt5/qtwebengine-chromium Signed-off-by: Samuli Piippo Signed-off-by: Martin Jansa --- .../0004-chromium-WebKit-fix-build-with-gcc7.patch | 41 ---------------------- 1 file changed, 41 deletions(-) delete mode 100644 recipes-qt/qt5/qtwebengine/0004-chromium-WebKit-fix-build-with-gcc7.patch (limited to 'recipes-qt/qt5/qtwebengine/0004-chromium-WebKit-fix-build-with-gcc7.patch') diff --git a/recipes-qt/qt5/qtwebengine/0004-chromium-WebKit-fix-build-with-gcc7.patch b/recipes-qt/qt5/qtwebengine/0004-chromium-WebKit-fix-build-with-gcc7.patch deleted file mode 100644 index 041d29b2..00000000 --- a/recipes-qt/qt5/qtwebengine/0004-chromium-WebKit-fix-build-with-gcc7.patch +++ /dev/null @@ -1,41 +0,0 @@ -From f62b851edbcc3ac3da448d7570908ad78ebe77dc Mon Sep 17 00:00:00 2001 -From: Martin Jansa -Date: Tue, 11 Jul 2017 10:18:13 +0200 -Subject: [PATCH] chromium: WebKit fix build with gcc7 - -Based on qtwebengine-opensource-src-5.8.0-wtf-gcc7.patch from -http://git.net/ml/scm-fedora-commits/2017-03/msg15697.html - -* Fixes: -In file included from ../../git/src/third_party/WebKit/Source/platform/heap/ThreadingTraits.h:14:0, - from ../../git/src/third_party/WebKit/Source/platform/heap/ThreadState.h:37, - from ../../git/src/third_party/WebKit/Source/platform/heap/GarbageCollected.h:8, - from ../../git/src/third_party/WebKit/Source/platform/heap/Visitor.h:35, - from ../../git/src/third_party/WebKit/Source/platform/heap/GCInfo.h:8, - from ../../git/src/third_party/WebKit/Source/platform/heap/Heap.h:35, - from ../../git/src/third_party/WebKit/Source/platform/heap/Handle.h:34, - from ../../git/src/third_party/WebKit/public/platform/WebPrivatePtr.h:38, - from ../../git/src/third_party/WebKit/public/platform/WebString.h:35, - from ../../git/src/third_party/WebKit/Source/platform/exported/FilePathConversion.cpp:8: -../../git/src/third_party/WebKit/Source/wtf/LinkedHashSet.h: In member function 'void WTF::LinkedHashSet::swap(WTF::LinkedHashSet&)': -../../git/src/third_party/WebKit/Source/wtf/LinkedHashSet.h:549:5: error: there are no arguments to 'swapAnchor' that depend on a template parameter, so a declaration of 'swapAnchor' must be available [-fpermissive] - swapAnchor(m_anchor, other.m_anchor); - ^~~~~~~~~~ -../../git/src/third_party/WebKit/Source/wtf/LinkedHashSet.h:549:5: note: (if you use '-fpermissive', G++ will accept your code, but allowing the use of an undeclared name is deprecated) ---- - chromium/third_party/WebKit/Source/wtf/LinkedHashSet.h | 2 ++ - 1 file changed, 2 insertions(+) - -diff --git a/chromium/third_party/WebKit/Source/wtf/LinkedHashSet.h b/chromium/third_party/WebKit/Source/wtf/LinkedHashSet.h -index e85c72fd65..6f94cd6734 100644 ---- a/chromium/third_party/WebKit/Source/wtf/LinkedHashSet.h -+++ b/chromium/third_party/WebKit/Source/wtf/LinkedHashSet.h -@@ -542,6 +542,8 @@ inline LinkedHashSet& LinkedHashSet::operator=(LinkedHas - return *this; - } - -+inline void swapAnchor(LinkedHashSetNodeBase& a, LinkedHashSetNodeBase& b); -+ - template - inline void LinkedHashSet::swap(LinkedHashSet& other) - { -- cgit v1.2.3-54-g00ecf