From be8bc9f575ed214111222e0c474830dc06f44610 Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Tue, 1 Jan 2019 22:55:59 -0800 Subject: qtwebkit: Disable JIT for mips64 It does not build with JIT git/Source/JavaScriptCore/assembler/MacroAssembler.h:64:2: error: #error "The MacroAssembler is not supported on this platform." 64 | #error "The MacroAssembler is not supported on this platform." | ^~~~~ Signed-off-by: Khem Raj Signed-off-by: Martin Jansa --- recipes-qt/qt5/qtwebkit_git.bb | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'recipes-qt') diff --git a/recipes-qt/qt5/qtwebkit_git.bb b/recipes-qt/qt5/qtwebkit_git.bb index bd0c6aeb..c5473440 100644 --- a/recipes-qt/qt5/qtwebkit_git.bb +++ b/recipes-qt/qt5/qtwebkit_git.bb @@ -49,6 +49,10 @@ EXTRA_OECMAKE += " \ EXTRA_OECMAKE_append_toolchain-clang = " -DCMAKE_CXX_IMPLICIT_INCLUDE_DIRECTORIES:PATH='${STAGING_INCDIR}'" +# JIT not supported on MIPS64 +EXTRA_OECMAKE_append_mips64 = " -DENABLE_JIT=OFF " +EXTRA_OECMAKE_append_mips64el = " -DENABLE_JIT=OFF " + PACKAGECONFIG ??= "qtlocation qtmultimedia qtsensors qtwebchannel \ ${@bb.utils.filter('DISTRO_FEATURES', 'x11', d)} \ fontconfig \ -- cgit v1.2.3-54-g00ecf From f4c8cef8586d28f51f69a78717c10093f8a9f730 Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Fri, 4 Jan 2019 08:43:15 -0800 Subject: qtbase: Fix qtopcua issue on bigendian systems See http://errors.yoctoproject.org/Errors/Details/213681/ Signed-off-by: Khem Raj Signed-off-by: Martin Jansa --- recipes-qt/qt5/nativesdk-qtbase_git.bb | 3 ++- recipes-qt/qt5/qtbase-native_git.bb | 5 ++-- .../qtbase/0020-Always-build-uic-and-qvkgen.patch | 28 ---------------------- ...0-Fix-qbswap-calls-for-Big-Endian-targets.patch | 28 ++++++++++++++++++++++ .../qtbase/0021-Always-build-uic-and-qvkgen.patch | 28 ++++++++++++++++++++++ .../0021-Bootstrap-without-linkat-feature.patch | 27 --------------------- .../0022-Bootstrap-without-linkat-feature.patch | 27 +++++++++++++++++++++ recipes-qt/qt5/qtbase_git.bb | 3 ++- 8 files changed, 90 insertions(+), 59 deletions(-) delete mode 100644 recipes-qt/qt5/qtbase/0020-Always-build-uic-and-qvkgen.patch create mode 100644 recipes-qt/qt5/qtbase/0020-Fix-qbswap-calls-for-Big-Endian-targets.patch create mode 100644 recipes-qt/qt5/qtbase/0021-Always-build-uic-and-qvkgen.patch delete mode 100644 recipes-qt/qt5/qtbase/0021-Bootstrap-without-linkat-feature.patch create mode 100644 recipes-qt/qt5/qtbase/0022-Bootstrap-without-linkat-feature.patch (limited to 'recipes-qt') diff --git a/recipes-qt/qt5/nativesdk-qtbase_git.bb b/recipes-qt/qt5/nativesdk-qtbase_git.bb index dc1fc41b..e3e063a6 100644 --- a/recipes-qt/qt5/nativesdk-qtbase_git.bb +++ b/recipes-qt/qt5/nativesdk-qtbase_git.bb @@ -44,11 +44,12 @@ SRC_URI += "\ file://0017-Define-QMAKE_CXX.COMPILER_MACROS-for-clang-on-linux.patch \ file://0018-Fix-compile-issue-with-gcc-9.patch \ file://0019-Fix-compilation-of-qendian-s-qswap-specializations-o.patch \ + file://0022-Fix-qbswap-calls-for-Big-Endian-targets.patch \ " # common for qtbase-native and nativesdk-qtbase # Patches from https://github.com/meta-qt5/qtbase/commits/b5.12-native -# 5.12.meta-qt5-native.4 +# 5.12.meta-qt5-native.5 SRC_URI += " \ file://0020-Always-build-uic-and-qvkgen.patch \ " diff --git a/recipes-qt/qt5/qtbase-native_git.bb b/recipes-qt/qt5/qtbase-native_git.bb index 9f0fca51..3ab6d5e9 100644 --- a/recipes-qt/qt5/qtbase-native_git.bb +++ b/recipes-qt/qt5/qtbase-native_git.bb @@ -18,7 +18,7 @@ require qt5-git.inc # common for qtbase-native, qtbase-nativesdk and qtbase # Patches from https://github.com/meta-qt5/qtbase/commits/b5.12-shared -# 5.12.meta-qt5-shared.4 +# 5.12.meta-qt5-shared.5 SRC_URI += "\ file://0001-Add-linux-oe-g-platform.patch \ file://0002-cmake-Use-OE_QMAKE_PATH_EXTERNAL_HOST_BINS.patch \ @@ -39,11 +39,12 @@ SRC_URI += "\ file://0017-Define-QMAKE_CXX.COMPILER_MACROS-for-clang-on-linux.patch \ file://0018-Fix-compile-issue-with-gcc-9.patch \ file://0019-Fix-compilation-of-qendian-s-qswap-specializations-o.patch \ + file://0022-Fix-qbswap-calls-for-Big-Endian-targets.patch \ " # common for qtbase-native and nativesdk-qtbase # Patches from https://github.com/meta-qt5/qtbase/commits/b5.12-native -# 5.12.meta-qt5-native.4 +# 5.12.meta-qt5-native.5 SRC_URI += " \ file://0020-Always-build-uic-and-qvkgen.patch \ " diff --git a/recipes-qt/qt5/qtbase/0020-Always-build-uic-and-qvkgen.patch b/recipes-qt/qt5/qtbase/0020-Always-build-uic-and-qvkgen.patch deleted file mode 100644 index 2d942289..00000000 --- a/recipes-qt/qt5/qtbase/0020-Always-build-uic-and-qvkgen.patch +++ /dev/null @@ -1,28 +0,0 @@ -From f8ae183b543b1244fb272f26db330f52e0d53161 Mon Sep 17 00:00:00 2001 -From: Martin Jansa -Date: Sat, 16 Nov 2013 00:32:30 +0100 -Subject: [PATCH] Always build uic and qvkgen - -Even if we are not building gui or widgets. This tool is needed later -as a native tool when compiling the target. - -Change-Id: I257668ac28c22b192e7ec7736e6c23fa3be6bab6 -Signed-off-by: Mikko Levonmaa -Signed-off-by: Martin Jansa ---- - src/src.pro | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/src.pro b/src/src.pro -index 1c76a2e46f..fbd4014fb3 100644 ---- a/src/src.pro -+++ b/src/src.pro -@@ -232,7 +232,7 @@ qtConfig(gui) { - } - } - } --SUBDIRS += src_plugins -+SUBDIRS += src_plugins src_tools_uic src_tools_qvkgen - - nacl: SUBDIRS -= src_network src_testlib - diff --git a/recipes-qt/qt5/qtbase/0020-Fix-qbswap-calls-for-Big-Endian-targets.patch b/recipes-qt/qt5/qtbase/0020-Fix-qbswap-calls-for-Big-Endian-targets.patch new file mode 100644 index 00000000..4169fb76 --- /dev/null +++ b/recipes-qt/qt5/qtbase/0020-Fix-qbswap-calls-for-Big-Endian-targets.patch @@ -0,0 +1,28 @@ +From c94a6510ae983e46f60e0cfb1b0f20229c990d93 Mon Sep 17 00:00:00 2001 +From: Ville Voutilainen +Date: Fri, 4 Jan 2019 09:35:40 +0200 +Subject: [PATCH] Fix qbswap calls for Big Endian targets + +Upstream-Status: Backport +Task-number: QTBUG-71945 +Change-Id: I5356f8e32d00ea591b1f65cdd4111276fcf876ac +--- + src/corelib/global/qendian.h | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/src/corelib/global/qendian.h b/src/corelib/global/qendian.h +index f2e5833468..615f523888 100644 +--- a/src/corelib/global/qendian.h ++++ b/src/corelib/global/qendian.h +@@ -204,9 +204,9 @@ template inline Q_DECL_CONSTEXPR T qToBigEndian(T source) + template inline Q_DECL_CONSTEXPR T qFromBigEndian(T source) + { return source; } + template inline Q_DECL_CONSTEXPR T qToLittleEndian(T source) +-{ return qbswap(source); } ++{ return qbswap(source); } + template inline Q_DECL_CONSTEXPR T qFromLittleEndian(T source) +-{ return qbswap(source); } ++{ return qbswap(source); } + template inline void qToBigEndian(T src, void *dest) + { qToUnaligned(src, dest); } + template inline void qToLittleEndian(T src, void *dest) diff --git a/recipes-qt/qt5/qtbase/0021-Always-build-uic-and-qvkgen.patch b/recipes-qt/qt5/qtbase/0021-Always-build-uic-and-qvkgen.patch new file mode 100644 index 00000000..4958d432 --- /dev/null +++ b/recipes-qt/qt5/qtbase/0021-Always-build-uic-and-qvkgen.patch @@ -0,0 +1,28 @@ +From 7af04e47ddfb4d285aab6bbb7efb46eb06252ba2 Mon Sep 17 00:00:00 2001 +From: Martin Jansa +Date: Sat, 16 Nov 2013 00:32:30 +0100 +Subject: [PATCH] Always build uic and qvkgen + +Even if we are not building gui or widgets. This tool is needed later +as a native tool when compiling the target. + +Change-Id: I257668ac28c22b192e7ec7736e6c23fa3be6bab6 +Signed-off-by: Mikko Levonmaa +Signed-off-by: Martin Jansa +--- + src/src.pro | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/src.pro b/src/src.pro +index 1c76a2e46f..fbd4014fb3 100644 +--- a/src/src.pro ++++ b/src/src.pro +@@ -232,7 +232,7 @@ qtConfig(gui) { + } + } + } +-SUBDIRS += src_plugins ++SUBDIRS += src_plugins src_tools_uic src_tools_qvkgen + + nacl: SUBDIRS -= src_network src_testlib + diff --git a/recipes-qt/qt5/qtbase/0021-Bootstrap-without-linkat-feature.patch b/recipes-qt/qt5/qtbase/0021-Bootstrap-without-linkat-feature.patch deleted file mode 100644 index 733e69ac..00000000 --- a/recipes-qt/qt5/qtbase/0021-Bootstrap-without-linkat-feature.patch +++ /dev/null @@ -1,27 +0,0 @@ -From 4d5e38f1b5f42d61428b7984f9f4d7f22ebe2a2e Mon Sep 17 00:00:00 2001 -From: Samuli Piippo -Date: Fri, 24 Nov 2017 15:16:31 +0200 -Subject: [PATCH] Bootstrap without linkat feature - -qmake does not work together with pseudo when unnamed temporary files -are used with linkat. - -Upstream-Status: Inappropriate [OE specific] -[YOCTO #11996] ---- - src/corelib/global/qconfig-bootstrapped.h | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/corelib/global/qconfig-bootstrapped.h b/src/corelib/global/qconfig-bootstrapped.h -index f6a5d6b1d4..de0111cc3c 100644 ---- a/src/corelib/global/qconfig-bootstrapped.h -+++ b/src/corelib/global/qconfig-bootstrapped.h -@@ -91,7 +91,7 @@ - #define QT_FEATURE_itemmodel -1 - #define QT_FEATURE_library -1 - #ifdef __linux__ --# define QT_FEATURE_linkat 1 -+# define QT_FEATURE_linkat -1 - #else - # define QT_FEATURE_linkat -1 - #endif diff --git a/recipes-qt/qt5/qtbase/0022-Bootstrap-without-linkat-feature.patch b/recipes-qt/qt5/qtbase/0022-Bootstrap-without-linkat-feature.patch new file mode 100644 index 00000000..02ab9900 --- /dev/null +++ b/recipes-qt/qt5/qtbase/0022-Bootstrap-without-linkat-feature.patch @@ -0,0 +1,27 @@ +From 94cfb4e78bf96e8947ed0c91900e463b99857b30 Mon Sep 17 00:00:00 2001 +From: Samuli Piippo +Date: Fri, 24 Nov 2017 15:16:31 +0200 +Subject: [PATCH] Bootstrap without linkat feature + +qmake does not work together with pseudo when unnamed temporary files +are used with linkat. + +Upstream-Status: Inappropriate [OE specific] +[YOCTO #11996] +--- + src/corelib/global/qconfig-bootstrapped.h | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/corelib/global/qconfig-bootstrapped.h b/src/corelib/global/qconfig-bootstrapped.h +index f6a5d6b1d4..de0111cc3c 100644 +--- a/src/corelib/global/qconfig-bootstrapped.h ++++ b/src/corelib/global/qconfig-bootstrapped.h +@@ -91,7 +91,7 @@ + #define QT_FEATURE_itemmodel -1 + #define QT_FEATURE_library -1 + #ifdef __linux__ +-# define QT_FEATURE_linkat 1 ++# define QT_FEATURE_linkat -1 + #else + # define QT_FEATURE_linkat -1 + #endif diff --git a/recipes-qt/qt5/qtbase_git.bb b/recipes-qt/qt5/qtbase_git.bb index 5c967d2f..3d385dd6 100644 --- a/recipes-qt/qt5/qtbase_git.bb +++ b/recipes-qt/qt5/qtbase_git.bb @@ -14,7 +14,7 @@ LIC_FILES_CHKSUM = " \ # common for qtbase-native, qtbase-nativesdk and qtbase # Patches from https://github.com/meta-qt5/qtbase/commits/b5.12-shared -# 5.12.meta-qt5-shared.4 +# 5.12.meta-qt5-shared.5 SRC_URI += "\ file://0001-Add-linux-oe-g-platform.patch \ file://0002-cmake-Use-OE_QMAKE_PATH_EXTERNAL_HOST_BINS.patch \ @@ -35,6 +35,7 @@ SRC_URI += "\ file://0017-Define-QMAKE_CXX.COMPILER_MACROS-for-clang-on-linux.patch \ file://0018-Fix-compile-issue-with-gcc-9.patch \ file://0019-Fix-compilation-of-qendian-s-qswap-specializations-o.patch \ + file://0022-Fix-qbswap-calls-for-Big-Endian-targets.patch \ " -- cgit v1.2.3-54-g00ecf From 82abc2bb38e6db10b469975c1f50be1bc1c078e8 Mon Sep 17 00:00:00 2001 From: Martin Jansa Date: Sat, 12 Jan 2019 17:58:58 +0000 Subject: qtbase: fix incomplete recipe changes from previous commit * the patches were renamed, but I forgot to amend the SRC_URI modifications Signed-off-by: Martin Jansa --- recipes-qt/qt5/nativesdk-qtbase_git.bb | 6 +++--- recipes-qt/qt5/qtbase-native_git.bb | 6 +++--- recipes-qt/qt5/qtbase_git.bb | 2 +- 3 files changed, 7 insertions(+), 7 deletions(-) (limited to 'recipes-qt') diff --git a/recipes-qt/qt5/nativesdk-qtbase_git.bb b/recipes-qt/qt5/nativesdk-qtbase_git.bb index e3e063a6..1a0e38eb 100644 --- a/recipes-qt/qt5/nativesdk-qtbase_git.bb +++ b/recipes-qt/qt5/nativesdk-qtbase_git.bb @@ -23,7 +23,7 @@ FILESEXTRAPATHS =. "${FILE_DIRNAME}/qtbase:" # common for qtbase-native, qtbase-nativesdk and qtbase # Patches from https://github.com/meta-qt5/qtbase/commits/b5.12-shared -# 5.12.meta-qt5-shared.4 +# 5.12.meta-qt5-shared.5 SRC_URI += "\ file://0001-Add-linux-oe-g-platform.patch \ file://0002-cmake-Use-OE_QMAKE_PATH_EXTERNAL_HOST_BINS.patch \ @@ -44,14 +44,14 @@ SRC_URI += "\ file://0017-Define-QMAKE_CXX.COMPILER_MACROS-for-clang-on-linux.patch \ file://0018-Fix-compile-issue-with-gcc-9.patch \ file://0019-Fix-compilation-of-qendian-s-qswap-specializations-o.patch \ - file://0022-Fix-qbswap-calls-for-Big-Endian-targets.patch \ + file://0020-Fix-qbswap-calls-for-Big-Endian-targets.patch \ " # common for qtbase-native and nativesdk-qtbase # Patches from https://github.com/meta-qt5/qtbase/commits/b5.12-native # 5.12.meta-qt5-native.5 SRC_URI += " \ - file://0020-Always-build-uic-and-qvkgen.patch \ + file://0021-Always-build-uic-and-qvkgen.patch \ " # CMake's toolchain configuration of nativesdk-qtbase diff --git a/recipes-qt/qt5/qtbase-native_git.bb b/recipes-qt/qt5/qtbase-native_git.bb index 3ab6d5e9..e636167e 100644 --- a/recipes-qt/qt5/qtbase-native_git.bb +++ b/recipes-qt/qt5/qtbase-native_git.bb @@ -39,19 +39,19 @@ SRC_URI += "\ file://0017-Define-QMAKE_CXX.COMPILER_MACROS-for-clang-on-linux.patch \ file://0018-Fix-compile-issue-with-gcc-9.patch \ file://0019-Fix-compilation-of-qendian-s-qswap-specializations-o.patch \ - file://0022-Fix-qbswap-calls-for-Big-Endian-targets.patch \ + file://0020-Fix-qbswap-calls-for-Big-Endian-targets.patch \ " # common for qtbase-native and nativesdk-qtbase # Patches from https://github.com/meta-qt5/qtbase/commits/b5.12-native # 5.12.meta-qt5-native.5 SRC_URI += " \ - file://0020-Always-build-uic-and-qvkgen.patch \ + file://0021-Always-build-uic-and-qvkgen.patch \ " # only for qtbase-native SRC_URI += " \ - file://0021-Bootstrap-without-linkat-feature.patch \ + file://0022-Bootstrap-without-linkat-feature.patch \ " CLEANBROKEN = "1" diff --git a/recipes-qt/qt5/qtbase_git.bb b/recipes-qt/qt5/qtbase_git.bb index 3d385dd6..d89ab2b7 100644 --- a/recipes-qt/qt5/qtbase_git.bb +++ b/recipes-qt/qt5/qtbase_git.bb @@ -35,7 +35,7 @@ SRC_URI += "\ file://0017-Define-QMAKE_CXX.COMPILER_MACROS-for-clang-on-linux.patch \ file://0018-Fix-compile-issue-with-gcc-9.patch \ file://0019-Fix-compilation-of-qendian-s-qswap-specializations-o.patch \ - file://0022-Fix-qbswap-calls-for-Big-Endian-targets.patch \ + file://0020-Fix-qbswap-calls-for-Big-Endian-targets.patch \ " -- cgit v1.2.3-54-g00ecf From d055d6a279b4823582d7c9d81fcdba2f930456a3 Mon Sep 17 00:00:00 2001 From: Alistair Francis Date: Wed, 16 Jan 2019 16:38:10 -0800 Subject: qtbase: Update the PACKAGECONFIG_KDE to enable more Update PACKAGECONFIG_KDE to ensure that all required packages are enabled. Signed-off-by: Alistair Francis --- recipes-qt/qt5/qtbase_git.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'recipes-qt') diff --git a/recipes-qt/qt5/qtbase_git.bb b/recipes-qt/qt5/qtbase_git.bb index d89ab2b7..6d1c7d2d 100644 --- a/recipes-qt/qt5/qtbase_git.bb +++ b/recipes-qt/qt5/qtbase_git.bb @@ -68,7 +68,7 @@ LDFLAGS_append_x86 = "${@bb.utils.contains('DISTRO_FEATURES', 'ld-is-gold', ' -f PACKAGECONFIG_GL ?= "${@bb.utils.contains('DISTRO_FEATURES', 'opengl', 'gl', '', d)}" PACKAGECONFIG_FB ?= "${@bb.utils.contains('DISTRO_FEATURES', 'directfb', 'directfb', '', d)}" PACKAGECONFIG_X11 ?= "${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'xcb xcb-xinput glib xkb xkbcommon-evdev', '', d)}" -PACKAGECONFIG_KDE ?= "${@bb.utils.contains('DISTRO_FEATURES', 'kde', 'sm cups fontconfig kms gbm libinput', '', d)}" +PACKAGECONFIG_KDE ?= "${@bb.utils.contains('DISTRO_FEATURES', 'kde', 'sm cups fontconfig kms gbm libinput sql-sqlite accessibility openssl', '', d)}" PACKAGECONFIG_FONTS ?= "" PACKAGECONFIG_SYSTEM ?= "jpeg libpng zlib" PACKAGECONFIG_DISTRO ?= "" -- cgit v1.2.3-54-g00ecf From 080cc294b7e28eb4c77ccd2a3ea4d07b34c61738 Mon Sep 17 00:00:00 2001 From: Andreas Müller Date: Sat, 26 Jan 2019 00:03:30 +0100 Subject: qtwayland: workaround upstream bug: install missing headers manually MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Andreas Müller --- recipes-qt/qt5/qtwayland_git.bb | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) (limited to 'recipes-qt') diff --git a/recipes-qt/qt5/qtwayland_git.bb b/recipes-qt/qt5/qtwayland_git.bb index a1b38de2..8f901ad7 100644 --- a/recipes-qt/qt5/qtwayland_git.bb +++ b/recipes-qt/qt5/qtwayland_git.bb @@ -46,3 +46,20 @@ BBCLASSEXTEND =+ "native nativesdk" LDFLAGS_append_x86 = "${@bb.utils.contains('DISTRO_FEATURES', 'ld-is-gold', ' -fuse-ld=bfd ', '', d)}" SRC_URI += "file://0001-Revert-use-new-feature-name-xkbcommon_evdev-xkbcommo.patch" + +# Since version 5.11.2 some private headers are not installed. Work around +# until fixed upstream. See https://bugreports.qt.io/browse/QTBUG-71340 for +# further details +do_install_append() { + if [ -d "${B}/src/client" ]; then + upstream_pv=`echo "${PV}" | sed 's:+git.*::g'` + for header in `find ${B}/src/client -name '*wayland-*.h'`; do + header_base=`basename $header` + dest="${D}${includedir}/QtWaylandClient/$upstream_pv/QtWaylandClient/private/$header_base" + if [ ! -e "$dest" ]; then + echo "Manual install: $header_base to $dest" + install -m 644 "$header" "$dest" + fi + done + fi +} -- cgit v1.2.3-54-g00ecf From 9a83f2d9a69988c2805003a5f9e26e1038deface Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Tue, 29 Jan 2019 20:42:11 -0800 Subject: qtconnectivity: Fix build with clang/libc++ Signed-off-by: Khem Raj --- .../0001-Add-missing-header-for-errno.patch | 26 ++++++++++++++++++++++ recipes-qt/qt5/qtconnectivity_git.bb | 2 ++ 2 files changed, 28 insertions(+) create mode 100644 recipes-qt/qt5/qtconnectivity/0001-Add-missing-header-for-errno.patch (limited to 'recipes-qt') diff --git a/recipes-qt/qt5/qtconnectivity/0001-Add-missing-header-for-errno.patch b/recipes-qt/qt5/qtconnectivity/0001-Add-missing-header-for-errno.patch new file mode 100644 index 00000000..1b75095c --- /dev/null +++ b/recipes-qt/qt5/qtconnectivity/0001-Add-missing-header-for-errno.patch @@ -0,0 +1,26 @@ +From 4c6aa68761d8a85bffe7d545c816522a793e94a9 Mon Sep 17 00:00:00 2001 +From: Khem Raj +Date: Tue, 29 Jan 2019 20:29:19 -0800 +Subject: [PATCH] Add missing header for errno + +Upstream-Status: Pending +Signed-off-by: Khem Raj +--- + src/bluetooth/bluez/bluetoothmanagement.cpp | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/src/bluetooth/bluez/bluetoothmanagement.cpp b/src/bluetooth/bluez/bluetoothmanagement.cpp +index 31d3dc02..75d762e5 100644 +--- a/src/bluetooth/bluez/bluetoothmanagement.cpp ++++ b/src/bluetooth/bluez/bluetoothmanagement.cpp +@@ -45,6 +45,7 @@ + #include "bluez_data_p.h" + #include "../qbluetoothsocketbase_p.h" + ++#include + #include + #include + #include +-- +2.20.1 + diff --git a/recipes-qt/qt5/qtconnectivity_git.bb b/recipes-qt/qt5/qtconnectivity_git.bb index f2e00751..4d98b95a 100644 --- a/recipes-qt/qt5/qtconnectivity_git.bb +++ b/recipes-qt/qt5/qtconnectivity_git.bb @@ -10,6 +10,8 @@ LIC_FILES_CHKSUM = " \ file://LICENSE.FDL;md5=6d9f2a9af4c8b8c3c769f6cc1b6aaf7e \ " +SRC_URI += "file://0001-Add-missing-header-for-errno.patch" + DEPENDS += "qtbase qtdeclarative" inherit bluetooth -- cgit v1.2.3-54-g00ecf From 6713882563f4622ac92b87b4e95830b2556284bf Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Thu, 31 Jan 2019 22:22:41 -0800 Subject: maliit-framework,maliit-plugins: Fix build with libc++ Signed-off-by: Khem Raj --- ...namespace-its-not-there-in-c-11-and-newer.patch | 83 ++++++++++++++++++++++ recipes-qt/maliit/maliit-framework-qt5_git.bb | 1 + .../0001-Do-not-use-tr1-namespace.patch | 58 +++++++++++++++ recipes-qt/maliit/maliit-plugins-qt5_git.bb | 4 +- 4 files changed, 145 insertions(+), 1 deletion(-) create mode 100644 recipes-qt/maliit/maliit-framework-qt5/0001-Drop-tr1-namespace-its-not-there-in-c-11-and-newer.patch create mode 100644 recipes-qt/maliit/maliit-plugins-qt5/0001-Do-not-use-tr1-namespace.patch (limited to 'recipes-qt') diff --git a/recipes-qt/maliit/maliit-framework-qt5/0001-Drop-tr1-namespace-its-not-there-in-c-11-and-newer.patch b/recipes-qt/maliit/maliit-framework-qt5/0001-Drop-tr1-namespace-its-not-there-in-c-11-and-newer.patch new file mode 100644 index 00000000..920946ec --- /dev/null +++ b/recipes-qt/maliit/maliit-framework-qt5/0001-Drop-tr1-namespace-its-not-there-in-c-11-and-newer.patch @@ -0,0 +1,83 @@ +From 60e7464fe2b75bb7187a4be0d6ba944d2b46f93e Mon Sep 17 00:00:00 2001 +From: Khem Raj +Date: Thu, 31 Jan 2019 22:02:32 -0800 +Subject: [PATCH] Drop tr1 namespace its not there in c++11 and newer + +compile as C++11 code +libc++'s tr1 headers don't actually make a tr1 namespace. + +Upstream-Status: Pending +Signed-off-by: Khem Raj +--- + src/mimonscreenplugins.cpp | 10 +++++----- + .../ut_mimpluginmanagerconfig.cpp | 2 +- + .../ut_mimpluginmanagerconfig.h | 2 +- + 3 files changed, 7 insertions(+), 7 deletions(-) + +diff --git a/src/mimonscreenplugins.cpp b/src/mimonscreenplugins.cpp +index da6e937e..b830e1bf 100644 +--- a/src/mimonscreenplugins.cpp ++++ b/src/mimonscreenplugins.cpp +@@ -21,9 +21,9 @@ + #include + + #include +-#include ++#include + +-using namespace std::tr1::placeholders; ++using namespace std::placeholders; + + namespace + { +@@ -118,10 +118,10 @@ bool MImOnScreenPlugins::isEnabled(const QString &plugin) const + + std::remove_copy_if(mEnabledSubViews.begin(), mEnabledSubViews.end(), + std::back_inserter(mEnabledAndAvailableSubViews), +- std::tr1::bind(&MImOnScreenPlugins::isSubViewUnavailable, this, _1)); ++ std::bind(&MImOnScreenPlugins::isSubViewUnavailable, this, _1)); + + return std::find_if(mEnabledAndAvailableSubViews.begin(), mEnabledAndAvailableSubViews.end(), +- std::tr1::bind(equalPlugin, _1, plugin)) != mEnabledAndAvailableSubViews.end(); ++ std::bind(equalPlugin, _1, plugin)) != mEnabledAndAvailableSubViews.end(); + } + + bool MImOnScreenPlugins::isSubViewEnabled(const SubView &subView) const +@@ -138,7 +138,7 @@ QList MImOnScreenPlugins::enabledSubViews(const QSt + { + QList result; + std::remove_copy_if(mEnabledSubViews.begin(), mEnabledSubViews.end(), +- std::back_inserter(result), std::tr1::bind(notEqualPlugin, _1, plugin)); ++ std::back_inserter(result), std::bind(notEqualPlugin, _1, plugin)); + return result; + } + +diff --git a/tests/ut_mimpluginmanagerconfig/ut_mimpluginmanagerconfig.cpp b/tests/ut_mimpluginmanagerconfig/ut_mimpluginmanagerconfig.cpp +index dea443e3..677dd689 100644 +--- a/tests/ut_mimpluginmanagerconfig/ut_mimpluginmanagerconfig.cpp ++++ b/tests/ut_mimpluginmanagerconfig/ut_mimpluginmanagerconfig.cpp +@@ -39,7 +39,7 @@ + #include "mattributeextensionmanager.h" + #include "msharedattributeextensionmanager.h" + +-using namespace std::tr1; ++using namespace std; + + typedef QSet HandlerStates; + Q_DECLARE_METATYPE(HandlerStates); +diff --git a/tests/ut_mimpluginmanagerconfig/ut_mimpluginmanagerconfig.h b/tests/ut_mimpluginmanagerconfig/ut_mimpluginmanagerconfig.h +index 5b1b691b..3ea18747 100644 +--- a/tests/ut_mimpluginmanagerconfig/ut_mimpluginmanagerconfig.h ++++ b/tests/ut_mimpluginmanagerconfig/ut_mimpluginmanagerconfig.h +@@ -16,7 +16,7 @@ + + #include "mimserveroptions.h" + #include "mimsettingsqsettings.h" +-#include ++#include + + #include + #include +-- +2.20.1 + diff --git a/recipes-qt/maliit/maliit-framework-qt5_git.bb b/recipes-qt/maliit/maliit-framework-qt5_git.bb index 232e8252..308f3d02 100644 --- a/recipes-qt/maliit/maliit-framework-qt5_git.bb +++ b/recipes-qt/maliit/maliit-framework-qt5_git.bb @@ -10,6 +10,7 @@ SRC_URI = "git://github.com/maliit/framework.git;branch=master \ file://0001-Fix-MALIIT_INSTALL_PRF-to-allow-the-build-with-opene.patch \ file://maliit-server.desktop \ file://0001-config.pri-Use-O1-optimization-in-DEBUG-flags.patch \ + file://0001-Drop-tr1-namespace-its-not-there-in-c-11-and-newer.patch \ " SRCREV = "60b1b10de14f932420313c547ab801daf522d539" diff --git a/recipes-qt/maliit/maliit-plugins-qt5/0001-Do-not-use-tr1-namespace.patch b/recipes-qt/maliit/maliit-plugins-qt5/0001-Do-not-use-tr1-namespace.patch new file mode 100644 index 00000000..e5525379 --- /dev/null +++ b/recipes-qt/maliit/maliit-plugins-qt5/0001-Do-not-use-tr1-namespace.patch @@ -0,0 +1,58 @@ +From 19cc10dc4378e9eda15b58f3673f686c4ff845e2 Mon Sep 17 00:00:00 2001 +From: Khem Raj +Date: Thu, 31 Jan 2019 22:17:56 -0800 +Subject: [PATCH] Do not use tr1 namespace + +This is not a standard in C++11 + +Upstream-Status: Pending +Signed-off-by: Khem Raj +--- + maliit-keyboard/lib/logic/layouthelper.cpp | 16 ++++++++-------- + 1 file changed, 8 insertions(+), 8 deletions(-) + +diff --git a/maliit-keyboard/lib/logic/layouthelper.cpp b/maliit-keyboard/lib/logic/layouthelper.cpp +index a8bd995f..f694e819 100644 +--- a/maliit-keyboard/lib/logic/layouthelper.cpp ++++ b/maliit-keyboard/lib/logic/layouthelper.cpp +@@ -31,7 +31,7 @@ + */ + + #include +-#include ++#include + + #include "layouthelper.h" + #include "coreutils.h" +@@ -76,7 +76,7 @@ struct KeyPredicate + + } // namespace + +-typedef std::tr1::function EmitFunc; ++typedef std::function EmitFunc; + + class LayoutHelperPrivate + { +@@ -468,13 +468,13 @@ void LayoutHelper::onKeysOverriden(const KeyOverrides &overriden_keys, + d->overriden_keys = overriden_keys; + } + +- using std::tr1::placeholders::_1; +- using std::tr1::placeholders::_2; ++ using std::placeholders::_1; ++ using std::placeholders::_2; + +- d->overrideCheck(changed_ids, d->left, std::tr1::bind(&LayoutHelper::leftPanelChanged, this, _1, _2)); +- d->overrideCheck(changed_ids, d->right, std::tr1::bind(&LayoutHelper::rightPanelChanged, this, _1, _2)); +- d->overrideCheck(changed_ids, d->center, std::tr1::bind(&LayoutHelper::centerPanelChanged, this, _1, _2)); +- d->overrideCheck(changed_ids, d->extended, std::tr1::bind(&LayoutHelper::extendedPanelChanged, this, _1, _2)); ++ d->overrideCheck(changed_ids, d->left, std::bind(&LayoutHelper::leftPanelChanged, this, _1, _2)); ++ d->overrideCheck(changed_ids, d->right, std::bind(&LayoutHelper::rightPanelChanged, this, _1, _2)); ++ d->overrideCheck(changed_ids, d->center, std::bind(&LayoutHelper::centerPanelChanged, this, _1, _2)); ++ d->overrideCheck(changed_ids, d->extended, std::bind(&LayoutHelper::extendedPanelChanged, this, _1, _2)); + } + + }} // namespace Logic, MaliitKeyboard +-- +2.20.1 + diff --git a/recipes-qt/maliit/maliit-plugins-qt5_git.bb b/recipes-qt/maliit/maliit-plugins-qt5_git.bb index 8225cb54..8464e1f0 100644 --- a/recipes-qt/maliit/maliit-plugins-qt5_git.bb +++ b/recipes-qt/maliit/maliit-plugins-qt5_git.bb @@ -10,7 +10,9 @@ DEPENDS = "maliit-framework-qt5" RDEPENDS_${PN} += "qtsvg-plugins" -SRC_URI = "git://github.com/maliit/plugins.git;branch=master" +SRC_URI = "git://github.com/maliit/plugins.git;branch=master \ + file://0001-Do-not-use-tr1-namespace.patch \ + " SRCREV = "c6a348592607248a771a3dde5a0e33dc3c433a2a" PV = "0.99.0+git${SRCPV}" -- cgit v1.2.3-54-g00ecf From 6d919b0bf1ede1d585a6a198257d9e01cf01bd94 Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Fri, 1 Feb 2019 23:42:26 -0800 Subject: qt5-plugin-generic-vboxtouch: Fix build with clang/libc++ Signed-off-by: Khem Raj --- ...0001-include-errno.h-for-errno-definition.patch | 38 ++++++++++++++++++++++ recipes-qt/qt5/qt5-plugin-generic-vboxtouch_git.bb | 6 ++-- 2 files changed, 42 insertions(+), 2 deletions(-) create mode 100644 recipes-qt/qt5/qt5-plugin-generic-vboxtouch/0001-include-errno.h-for-errno-definition.patch (limited to 'recipes-qt') diff --git a/recipes-qt/qt5/qt5-plugin-generic-vboxtouch/0001-include-errno.h-for-errno-definition.patch b/recipes-qt/qt5/qt5-plugin-generic-vboxtouch/0001-include-errno.h-for-errno-definition.patch new file mode 100644 index 00000000..ff0eb56f --- /dev/null +++ b/recipes-qt/qt5/qt5-plugin-generic-vboxtouch/0001-include-errno.h-for-errno-definition.patch @@ -0,0 +1,38 @@ +From 2486c9ecc1db12132ee8c77ed69b1d301e75786b Mon Sep 17 00:00:00 2001 +From: Khem Raj +Date: Fri, 1 Feb 2019 23:35:24 -0800 +Subject: [PATCH] include errno.h for errno definition + +This fixes errors with clang/libc++ + +Upstream-Status: Pending +Signed-off-by: Khem Raj +--- + vboxtouch/setshape.cpp | 1 + + vboxtouch/vboxtouch.cpp | 1 + + 2 files changed, 2 insertions(+) + +diff --git a/vboxtouch/setshape.cpp b/vboxtouch/setshape.cpp +index 092f888..4dd25a1 100644 +--- a/vboxtouch/setshape.cpp ++++ b/vboxtouch/setshape.cpp +@@ -24,6 +24,7 @@ + #include + #include + ++#include + #include + #include + +diff --git a/vboxtouch/vboxtouch.cpp b/vboxtouch/vboxtouch.cpp +index 345fdcb..ffe1d50 100644 +--- a/vboxtouch/vboxtouch.cpp ++++ b/vboxtouch/vboxtouch.cpp +@@ -32,6 +32,7 @@ + + #include + ++#include + #include + #include + #include diff --git a/recipes-qt/qt5/qt5-plugin-generic-vboxtouch_git.bb b/recipes-qt/qt5/qt5-plugin-generic-vboxtouch_git.bb index 1f29dcfe..4e83c267 100644 --- a/recipes-qt/qt5/qt5-plugin-generic-vboxtouch_git.bb +++ b/recipes-qt/qt5/qt5-plugin-generic-vboxtouch_git.bb @@ -16,7 +16,10 @@ DEPENDS = "qtbase" # Needed with gcc-5.2 https://gcc.gnu.org/bugzilla/show_bug.cgi?id=65801 CXXFLAGS += "-Wno-narrowing" -SRC_URI = "git://github.com/nemomobile/qt5-plugin-generic-vboxtouch.git" +SRC_URI = "git://github.com/nemomobile/qt5-plugin-generic-vboxtouch.git \ + file://0001-VirtualboxTouchScreenHandler-initialize-m_mouse.patch;patchdir=.. \ + file://0001-include-errno.h-for-errno-definition.patch;patchdir=.. \ + " SRCREV = "3f2bdb5a1d346f02d5ab185522271ba2288a42bb" S = "${WORKDIR}/git/vboxtouch" @@ -25,4 +28,3 @@ inherit qmake5 FILES_${PN} += "${OE_QMAKE_PATH_PLUGINS}/generic/libvboxtouchplugin.so" FILES_${PN}-dev += "${OE_QMAKE_PATH_LIBS}/cmake/*" -SRC_URI += "file://0001-VirtualboxTouchScreenHandler-initialize-m_mouse.patch;patchdir=.." -- cgit v1.2.3-54-g00ecf From cb1b47212659a21514553cb0a0102861a6e2299b Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Sun, 3 Feb 2019 16:01:44 -0800 Subject: qtbase: Export host compiler and linker Certain portions of qtwebengine build involves building native tools using host compiler/linker, this however currently uses gcc and when we build with clang to compile the target pieces, chromium configures for clang and rightly so, but then does not have a way to define flags for host and target separately, and it ends up supplying same flags for both host and target builds, the trouble is that the options between clang and gcc are not always same in some cases, they dont understand each others options. So build starts to fail due to these errors about unknown cmdline options. This makes sure we inject CC_host, CXX_host, LD_host into qmake.conf so they can be used in such packages We use clang to do host builds when TOOLCHAIN = "clang" is used otherwise default to gcc as it was the case Signed-off-by: Khem Raj --- recipes-qt/qt5/qtbase_git.bb | 10 ++++++++++ 1 file changed, 10 insertions(+) (limited to 'recipes-qt') diff --git a/recipes-qt/qt5/qtbase_git.bb b/recipes-qt/qt5/qtbase_git.bb index 6d1c7d2d..adf0a43c 100644 --- a/recipes-qt/qt5/qtbase_git.bb +++ b/recipes-qt/qt5/qtbase_git.bb @@ -171,6 +171,13 @@ QT_CONFIG_FLAGS += " \ ${PACKAGECONFIG_CONFARGS} \ " +export CC_host_toolchain-clang = "clang" +export CXX_host_toolchain-clang = "clang++" +export LD_host_toolchain-clang = "clang++" +export CC_host ?= "gcc" +export CXX_host ?= "g++" +export LD_host ?= "g++" + # for qtbase configuration we need default settings # since we cannot set empty set filename to a not existent file deltask generate_qt_config_file @@ -249,6 +256,9 @@ do_install_append() { echo "isEmpty(QMAKE_LINK_C_SHLIB): QMAKE_LINK_C_SHLIB = $OE_QMAKE_LINK_NO_SYSROOT" >> $conf echo "isEmpty(QMAKE_LFLAGS): QMAKE_LFLAGS = ${OE_QMAKE_LDFLAGS}" >> $conf echo "isEmpty(QMAKE_STRIP): QMAKE_STRIP = ${TARGET_PREFIX}strip" >> $conf + echo "isEmpty(CC_host): CC_host = ${CC_host}" >> $conf + echo "isEmpty(CXX_host): CXX_host = ${CXX_host}" >> $conf + echo "isEmpty(LD_host): LD_host = ${LD_host}" >> $conf generate_target_qt_config_file ${D}${OE_QMAKE_PATH_BINS}/qt.conf -- cgit v1.2.3-54-g00ecf From 5be2654885b3699520c4370579c929e2ce352e80 Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Sat, 2 Feb 2019 23:25:58 -0800 Subject: qtwebengine: Fix build with clang/libc++ on aarch64/arm Signed-off-by: Khem Raj --- .../0001-Force-host-toolchain-configuration.patch | 16 ++-- ...new-feature-name-xkbcommon_evdev-xkbcommo.patch | 31 +++++++ .../0019-chromium-fix-build-with-clang.patch | 94 ++++++++++++++++++++++ ...-Check-for-__ARM_FP-2-before-using-__fp16.patch | 33 ++++++++ ...0021-chromium-Exclude-CRC32-for-32bit-arm.patch | 31 +++++++ recipes-qt/qt5/qtwebengine_git.bb | 4 + 6 files changed, 199 insertions(+), 10 deletions(-) create mode 100644 recipes-qt/qt5/qtwebengine/0003-Revert-use-new-feature-name-xkbcommon_evdev-xkbcommo.patch create mode 100644 recipes-qt/qt5/qtwebengine/chromium/0019-chromium-fix-build-with-clang.patch create mode 100644 recipes-qt/qt5/qtwebengine/chromium/0020-chromium-Check-for-__ARM_FP-2-before-using-__fp16.patch create mode 100644 recipes-qt/qt5/qtwebengine/chromium/0021-chromium-Exclude-CRC32-for-32bit-arm.patch (limited to 'recipes-qt') diff --git a/recipes-qt/qt5/qtwebengine/0001-Force-host-toolchain-configuration.patch b/recipes-qt/qt5/qtwebengine/0001-Force-host-toolchain-configuration.patch index b51c4c72..c9266582 100644 --- a/recipes-qt/qt5/qtwebengine/0001-Force-host-toolchain-configuration.patch +++ b/recipes-qt/qt5/qtwebengine/0001-Force-host-toolchain-configuration.patch @@ -17,8 +17,6 @@ Signed-off-by: Samuli Piippo src/core/config/linux.pri | 2 +- 2 files changed, 8 insertions(+), 8 deletions(-) -diff --git a/src/buildtools/configure_host.pro b/src/buildtools/configure_host.pro -index dd0d3e32..70161c82 100644 --- a/src/buildtools/configure_host.pro +++ b/src/buildtools/configure_host.pro @@ -4,7 +4,7 @@ TEMPLATE = aux @@ -37,9 +35,9 @@ index dd0d3e32..70161c82 100644 -" cc = \"$$which($$QMAKE_CC)\" " \ -" cxx = \"$$which($$QMAKE_CXX)\" " \ -" ld = \"$$which($$QMAKE_LINK)\" " \ -+" cc = \"$$which(gcc)\" " \ -+" cxx = \"$$which(g++)\" " \ -+" ld = \"$$which(g++)\" " \ ++" cc = \"$$which($$CC_host)\" " \ ++" cxx = \"$$which($$CXX_host)\" " \ ++" ld = \"$$which($$CXX_host)\" " \ " ar = \"$$which(ar)\" " \ " nm = \"$$which(nm)\" " \ " extra_cppflags = \"$$GN_HOST_EXTRA_CPPFLAGS\" " \ @@ -50,14 +48,12 @@ index dd0d3e32..70161c82 100644 -" cc = \"$$which($$QMAKE_CC)\" " \ -" cxx = \"$$which($$QMAKE_CXX)\" " \ -" ld = \"$$which($$QMAKE_LINK)\" " \ -+" cc = \"$$which(gcc)\" " \ -+" cxx = \"$$which(g++)\" " \ -+" ld = \"$$which(g++)\" " \ ++" cc = \"$$which($$CC_host)\" " \ ++" cxx = \"$$which($$CXX_host)\" " \ ++" ld = \"$$which($$CXX_host)\" " \ " ar = \"$$which(ar)\" " \ " nm = \"$$which(nm)\" " \ " toolchain_args = { " \ -diff --git a/src/core/config/linux.pri b/src/core/config/linux.pri -index 85b948db..c529c641 100644 --- a/src/core/config/linux.pri +++ b/src/core/config/linux.pri @@ -112,7 +112,7 @@ contains(QT_ARCH, "mips") { diff --git a/recipes-qt/qt5/qtwebengine/0003-Revert-use-new-feature-name-xkbcommon_evdev-xkbcommo.patch b/recipes-qt/qt5/qtwebengine/0003-Revert-use-new-feature-name-xkbcommon_evdev-xkbcommo.patch new file mode 100644 index 00000000..97f82847 --- /dev/null +++ b/recipes-qt/qt5/qtwebengine/0003-Revert-use-new-feature-name-xkbcommon_evdev-xkbcommo.patch @@ -0,0 +1,31 @@ +From 7d8231d53a5e79eaea9fe2566f407faf41b233b4 Mon Sep 17 00:00:00 2001 +From: Khem Raj +Date: Sat, 2 Feb 2019 23:23:14 -0800 +Subject: [PATCH] Revert "use new feature name xkbcommon_evdev -> xkbcommon" + +This reverts commit 21112a89e3d742451d6b449fc7075d51266fe709. + +To be compatible with qtbase 5.12.0, remove this patch when upgrading +qtbase to 5.12.1 + +Signed-off-by: Khem Raj +--- + src/core/web_event_factory.cpp | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/core/web_event_factory.cpp b/src/core/web_event_factory.cpp +index 06dbd7ff..a45f7048 100644 +--- a/src/core/web_event_factory.cpp ++++ b/src/core/web_event_factory.cpp +@@ -101,7 +101,7 @@ static KeyboardDriver keyboardDriverImpl() + if (platformName == QLatin1Literal("xcb") || platformName == QLatin1Literal("wayland")) + return KeyboardDriver::Xkb; + +-#if QT_CONFIG(libinput) && QT_CONFIG(xkbcommon) ++#if QT_CONFIG(libinput) && QT_CONFIG(xkbcommon_evdev) + // Based on QEglFSIntegration::createInputHandlers and QLibInputKeyboard::processKey. + if (platformName == QLatin1Literal("eglfs") && !qEnvironmentVariableIntValue("QT_QPA_EGLFS_NO_LIBINPUT")) + return KeyboardDriver::Xkb; +-- +2.20.1 + diff --git a/recipes-qt/qt5/qtwebengine/chromium/0019-chromium-fix-build-with-clang.patch b/recipes-qt/qt5/qtwebengine/chromium/0019-chromium-fix-build-with-clang.patch new file mode 100644 index 00000000..050fb064 --- /dev/null +++ b/recipes-qt/qt5/qtwebengine/chromium/0019-chromium-fix-build-with-clang.patch @@ -0,0 +1,94 @@ +From 4ed2bab8183cf8252b52a493665ddf84188f12f6 Mon Sep 17 00:00:00 2001 +From: Khem Raj +Date: Sat, 2 Feb 2019 19:28:59 -0800 +Subject: [PATCH] chromium: fix build with clang + +Upstream-Status: Pending +Signed-off-by: Khem Raj +--- + chromium/build/config/compiler/BUILD.gn | 27 ++----------------------- + 1 file changed, 2 insertions(+), 25 deletions(-) + +diff --git a/chromium/build/config/compiler/BUILD.gn b/chromium/build/config/compiler/BUILD.gn +index d223a4f6fd..1c42c49ea4 100644 +--- a/chromium/build/config/compiler/BUILD.gn ++++ b/chromium/build/config/compiler/BUILD.gn +@@ -544,13 +544,6 @@ config("compiler") { + ] + } + +- # Tells the compiler not to use absolute paths when passing the default +- # paths to the tools it invokes. We don't want this because we don't +- # really need it and it can mess up the goma cache entries. +- if (is_clang && !is_nacl) { +- cflags += [ "-no-canonical-prefixes" ] +- } +- + # C11/C++11 compiler flags setup. + # --------------------------- + if (is_linux || is_android || (is_nacl && is_clang) || current_os == "aix") { +@@ -748,8 +741,6 @@ config("compiler_cpu_abi") { + } + } else if (current_cpu == "arm") { + if (is_clang && !is_android && !is_nacl) { +- cflags += [ "--target=arm-linux-gnueabihf" ] +- ldflags += [ "--target=arm-linux-gnueabihf" ] + } + if (!is_nacl) { + cflags += [ +@@ -762,8 +753,6 @@ config("compiler_cpu_abi") { + } + } else if (current_cpu == "arm64") { + if (is_clang && !is_android && !is_nacl && !is_fuchsia) { +- cflags += [ "--target=aarch64-linux-gnu" ] +- ldflags += [ "--target=aarch64-linux-gnu" ] + } + } else if (current_cpu == "mipsel" && !is_nacl) { + ldflags += [ "-Wl,--hash-style=sysv" ] +@@ -772,9 +761,6 @@ config("compiler_cpu_abi") { + if (is_android) { + cflags += [ "--target=mipsel-linux-android" ] + ldflags += [ "--target=mipsel-linux-android" ] +- } else { +- cflags += [ "--target=mipsel-linux-gnu" ] +- ldflags += [ "--target=mipsel-linux-gnu" ] + } + } else { + cflags += [ "-EL" ] +@@ -853,10 +839,7 @@ config("compiler_cpu_abi") { + } else if (current_cpu == "mips" && !is_nacl) { + ldflags += [ "-Wl,--hash-style=sysv" ] + if (custom_toolchain == "") { +- if (is_clang) { +- cflags += [ "--target=mips-linux-gnu" ] +- ldflags += [ "--target=mips-linux-gnu" ] +- } else { ++ if (!is_clang) { + cflags += [ "-EB" ] + ldflags += [ "-EB" ] + } +@@ -902,9 +885,6 @@ config("compiler_cpu_abi") { + if (is_android) { + cflags += [ "--target=mips64el-linux-android" ] + ldflags += [ "--target=mips64el-linux-android" ] +- } else { +- cflags += [ "--target=mips64el-linux-gnuabi64" ] +- ldflags += [ "--target=mips64el-linux-gnuabi64" ] + } + } else { + cflags += [ +@@ -961,10 +941,7 @@ config("compiler_cpu_abi") { + } else if (current_cpu == "mips64") { + ldflags += [ "-Wl,--hash-style=sysv" ] + if (custom_toolchain == "") { +- if (is_clang) { +- cflags += [ "--target=mips64-linux-gnuabi64" ] +- ldflags += [ "--target=mips64-linux-gnuabi64" ] +- } else { ++ if (!is_clang) { + cflags += [ + "-EB", + "-mabi=64", +-- +2.20.1 + diff --git a/recipes-qt/qt5/qtwebengine/chromium/0020-chromium-Check-for-__ARM_FP-2-before-using-__fp16.patch b/recipes-qt/qt5/qtwebengine/chromium/0020-chromium-Check-for-__ARM_FP-2-before-using-__fp16.patch new file mode 100644 index 00000000..ef00025c --- /dev/null +++ b/recipes-qt/qt5/qtwebengine/chromium/0020-chromium-Check-for-__ARM_FP-2-before-using-__fp16.patch @@ -0,0 +1,33 @@ +From f304341d4e0a24469575129e2f2a79a969d8ecaf Mon Sep 17 00:00:00 2001 +From: Khem Raj +Date: Sat, 2 Feb 2019 22:09:20 -0800 +Subject: [PATCH 1/2] chromium: Check for __ARM_FP & 2 before using __fp16 + +The __fp16 type denotes half-precision (16-bit) floating-point. +The recommended way to test for this hardware support is to test bit 1 in __ARM_FP +and +If 16-bit floating-point is available, one of __ARM_FP16_FORMAT_IEEE and +__ARM_FP16_FORMAT_ALTERNATIVE will be defined to indicate the format in use + +Upstream-Status: Pending +Signed-off-by: Khem Raj +--- + chromium/third_party/skia/src/opts/SkRasterPipeline_opts.h | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/chromium/third_party/skia/src/opts/SkRasterPipeline_opts.h b/chromium/third_party/skia/src/opts/SkRasterPipeline_opts.h +index 33d9e7aa39..aaefa5371a 100644 +--- a/chromium/third_party/skia/src/opts/SkRasterPipeline_opts.h ++++ b/chromium/third_party/skia/src/opts/SkRasterPipeline_opts.h +@@ -679,7 +679,7 @@ SI F from_half(U16 h) { + } + + SI U16 to_half(F f) { +-#if defined(__ARM_FP16_FORMAT_IEEE) ++#if defined(__ARM_FP16_FORMAT_IEEE) && defined(__ARM_NEON__) && (__ARM_FP & 2) + __fp16 fp16 = __fp16(f); + U16 u16; + memcpy(&u16, &fp16, sizeof(U16)); +-- +2.20.1 + diff --git a/recipes-qt/qt5/qtwebengine/chromium/0021-chromium-Exclude-CRC32-for-32bit-arm.patch b/recipes-qt/qt5/qtwebengine/chromium/0021-chromium-Exclude-CRC32-for-32bit-arm.patch new file mode 100644 index 00000000..e0c0dbb6 --- /dev/null +++ b/recipes-qt/qt5/qtwebengine/chromium/0021-chromium-Exclude-CRC32-for-32bit-arm.patch @@ -0,0 +1,31 @@ +From 432514e835f5bfefc2bb88adbb2ba468e9c07beb Mon Sep 17 00:00:00 2001 +From: Khem Raj +Date: Tue, 5 Feb 2019 14:32:20 -0800 +Subject: [PATCH] chromium: Exclude CRC32 for 32bit arm + +This fixes build issues during cross compiling for linux using clang + +Fixes +src/3rdparty/chromium/third_party/zlib/crc32_simd.c:184: undefined reference to `__crc32d' + +Upstream-Status: Pending +Signed-off-by: Khem Raj +--- + chromium/third_party/zlib/BUILD.gn | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +--- a/chromium/third_party/zlib/BUILD.gn ++++ b/chromium/third_party/zlib/BUILD.gn +@@ -70,8 +70,11 @@ config("zlib_arm_crc32_config") { + # - ChromeOS has wrapper scripts that are borking the compiler flags. + # - Fuchsia just added a syscall for feature detection. + # TODO(cavalcantii): crbug.com/810125. ++ defines = [] + if (!is_ios && !is_chromeos && !is_fuchsia) { +- defines = [ "CRC32_ARMV8_CRC32" ] ++ if (current_cpu == "arm64") { ++ defines += [ "CRC32_ARMV8_CRC32" ] ++ } + if (is_android) { + defines += [ "ARMV8_OS_ANDROID" ] + } else if (is_linux || is_chromeos) { diff --git a/recipes-qt/qt5/qtwebengine_git.bb b/recipes-qt/qt5/qtwebengine_git.bb index b64965de..bcddf889 100644 --- a/recipes-qt/qt5/qtwebengine_git.bb +++ b/recipes-qt/qt5/qtwebengine_git.bb @@ -140,6 +140,7 @@ SRC_URI += " \ ${QT_GIT}/qtwebengine-chromium.git;name=chromium;branch=${QT_MODULE_BRANCH_CHROMIUM};protocol=${QT_GIT_PROTOCOL};destsuffix=git/src/3rdparty \ file://0001-Force-host-toolchain-configuration.patch \ file://0002-chromium_overrides.cpp-Fix-build-with-plugins-and-oz.patch \ + file://0003-Revert-use-new-feature-name-xkbcommon_evdev-xkbcommo.patch \ " SRC_URI_append_libc-musl = "\ file://0003-musl-don-t-use-pvalloc-as-it-s-not-available-on-musl.patch \ @@ -153,6 +154,9 @@ SRC_URI += " \ file://chromium/0002-chromium-workaround-for-too-long-.rps-file-name.patch;patchdir=src/3rdparty \ file://chromium/0003-chromium-Fix-build-with-gcc8.patch;patchdir=src/3rdparty \ file://chromium/0004-chromium-stack-pointer-clobber.patch;patchdir=src/3rdparty \ + file://chromium/0019-chromium-fix-build-with-clang.patch;patchdir=src/3rdparty \ + file://chromium/0020-chromium-Check-for-__ARM_FP-2-before-using-__fp16.patch;patchdir=src/3rdparty \ + file://chromium/0021-chromium-Exclude-CRC32-for-32bit-arm.patch;patchdir=src/3rdparty \ " SRC_URI_append_libc-musl = "\ -- cgit v1.2.3-54-g00ecf From e2d9845b059ce19b6dc6e2e8c21bd097c5fa0484 Mon Sep 17 00:00:00 2001 From: Andreas Müller Date: Wed, 30 Jan 2019 12:00:39 +0100 Subject: qwt-qt5: Fix multilib install MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit | ERROR: qwt-qt5-6.1.3-r0 do_package: QA Issue: qwt-qt5: Files/directories were installed but not shipped in any package: | /usr/lib/libqwt.so.6 | /usr/lib/libqwt.so.6.1 | /usr/lib/libqwt.so | /usr/lib/libqwt.so.6.1.3 | /usr/lib/pkgconfig | /usr/lib/pkgconfig/Qt5Qwt6.pc | Please set FILES such that these items are packaged. Alternatively if they are unneeded, avoid installing them or delete them within do_install. Signed-off-by: Andreas Müller --- recipes-qt/qwt/qwt-qt5_6.1.3.bb | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'recipes-qt') diff --git a/recipes-qt/qwt/qwt-qt5_6.1.3.bb b/recipes-qt/qwt/qwt-qt5_6.1.3.bb index 49f4f9e5..cb934025 100644 --- a/recipes-qt/qwt/qwt-qt5_6.1.3.bb +++ b/recipes-qt/qwt/qwt-qt5_6.1.3.bb @@ -25,7 +25,11 @@ EXTRA_QMAKEVARS_PRE += " \ " do_configure_prepend() { - sed -i 's:/usr/local/qwt-$$QWT_VERSION:${prefix}:' ${S}/*.pri + sed -i \ + -e 's:/usr/local/qwt-$$QWT_VERSION:${prefix}:' \ + -e 's:^QWT_INSTALL_LIBS.*:QWT_INSTALL_LIBS = ${libdir}:' \ + ${S}/*.pri + export QWT_INSTALL_LIBS=${libdir} } do_install_append() { -- cgit v1.2.3-54-g00ecf From 38ec3255605969bd8f515493622645dc01cc8642 Mon Sep 17 00:00:00 2001 From: Andreas Müller Date: Wed, 30 Jan 2019 12:41:40 +0100 Subject: qwt-qt5: upgrade 6.1.3 -> 6.1.4 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Andreas Müller --- recipes-qt/qwt/qwt-qt5_6.1.3.bb | 52 ----------------------------------------- recipes-qt/qwt/qwt-qt5_6.1.4.bb | 52 +++++++++++++++++++++++++++++++++++++++++ 2 files changed, 52 insertions(+), 52 deletions(-) delete mode 100644 recipes-qt/qwt/qwt-qt5_6.1.3.bb create mode 100644 recipes-qt/qwt/qwt-qt5_6.1.4.bb (limited to 'recipes-qt') diff --git a/recipes-qt/qwt/qwt-qt5_6.1.3.bb b/recipes-qt/qwt/qwt-qt5_6.1.3.bb deleted file mode 100644 index cb934025..00000000 --- a/recipes-qt/qwt/qwt-qt5_6.1.3.bb +++ /dev/null @@ -1,52 +0,0 @@ -SUMMARY = "Qt Widget Extension for Technical Applications" -SECTION = "libs" -HOMEPAGE = "http://qwt.sourceforge.net/index.html" - -# LGPLv2.1 + some exceptions -LICENSE = "QWTv1.0" -LIC_FILES_CHKSUM = "file://COPYING;md5=dac2743472b0462ff3cfb4af42051c88" - -DEPENDS = "qtbase qtsvg qttools" - -inherit qmake5 - -SRC_URI = " \ - ${SOURCEFORGE_MIRROR}/qwt/qwt-${PV}.tar.bz2;name=qwt \ - file://0001-Remove-rpath-from-binaries-they-point-to-buuild-area.patch \ -" -SRC_URI[qwt.md5sum] = "19d1f5fa5e22054d22ee3accc37c54ba" -SRC_URI[qwt.sha256sum] = "f3ecd34e72a9a2b08422fb6c8e909ca76f4ce5fa77acad7a2883b701f4309733" - -S = "${WORKDIR}/qwt-${PV}" - -EXTRA_QMAKEVARS_PRE += " \ - QWT_CONFIG+=QwtPkgConfig \ - QWT_CONFIG+=QwtExamples \ -" - -do_configure_prepend() { - sed -i \ - -e 's:/usr/local/qwt-$$QWT_VERSION:${prefix}:' \ - -e 's:^QWT_INSTALL_LIBS.*:QWT_INSTALL_LIBS = ${libdir}:' \ - ${S}/*.pri - export QWT_INSTALL_LIBS=${libdir} -} - -do_install_append() { - # seems out of tree build confuses installation of examples - # so install them manually - install -d ${D}${bindir}/ - cp ${B}/examples/bin/* ${D}${bindir}/ -} - - -PACKAGES_prepend = "${PN}-examples ${PN}-features ${PN}-plugins " -FILES_${PN}-examples = "${bindir}/*" -FILES_${PN}-features = "${prefix}/features" -FILES_${PN}-plugins = "${prefix}/plugins/designer/*.so" -FILES_${PN}-doc += "${prefix}/doc" - -INSANE_SKIP_${PN}-plugins += "libdir" -INSANE_SKIP_${PN}-dbg += "libdir" - -RPROVIDES_${PN}-dev = "libqwt-qt5-dev" diff --git a/recipes-qt/qwt/qwt-qt5_6.1.4.bb b/recipes-qt/qwt/qwt-qt5_6.1.4.bb new file mode 100644 index 00000000..d8e1dcd2 --- /dev/null +++ b/recipes-qt/qwt/qwt-qt5_6.1.4.bb @@ -0,0 +1,52 @@ +SUMMARY = "Qt Widget Extension for Technical Applications" +SECTION = "libs" +HOMEPAGE = "http://qwt.sourceforge.net/index.html" + +# LGPLv2.1 + some exceptions +LICENSE = "QWTv1.0" +LIC_FILES_CHKSUM = "file://COPYING;md5=dac2743472b0462ff3cfb4af42051c88" + +DEPENDS = "qtbase qtsvg qttools" + +inherit qmake5 + +SRC_URI = " \ + ${SOURCEFORGE_MIRROR}/qwt/qwt-${PV}.tar.bz2;name=qwt \ + file://0001-Remove-rpath-from-binaries-they-point-to-buuild-area.patch \ +" +SRC_URI[qwt.md5sum] = "4fb1852f694420e3ab9c583526edecc5" +SRC_URI[qwt.sha256sum] = "1529215329e51fc562e0009505a838f427919a18b362afff441f035b2d9b5bd9" + +S = "${WORKDIR}/qwt-${PV}" + +EXTRA_QMAKEVARS_PRE += " \ + QWT_CONFIG+=QwtPkgConfig \ + QWT_CONFIG+=QwtExamples \ +" + +do_configure_prepend() { + sed -i \ + -e 's:/usr/local/qwt-$$QWT_VERSION:${prefix}:' \ + -e 's:^QWT_INSTALL_LIBS.*:QWT_INSTALL_LIBS = ${libdir}:' \ + ${S}/*.pri + export QWT_INSTALL_LIBS=${libdir} +} + +do_install_append() { + # seems out of tree build confuses installation of examples + # so install them manually + install -d ${D}${bindir}/ + cp ${B}/examples/bin/* ${D}${bindir}/ +} + + +PACKAGES_prepend = "${PN}-examples ${PN}-features ${PN}-plugins " +FILES_${PN}-examples = "${bindir}/*" +FILES_${PN}-features = "${prefix}/features" +FILES_${PN}-plugins = "${prefix}/plugins/designer/*.so" +FILES_${PN}-doc += "${prefix}/doc" + +INSANE_SKIP_${PN}-plugins += "libdir" +INSANE_SKIP_${PN}-dbg += "libdir" + +RPROVIDES_${PN}-dev = "libqwt-qt5-dev" -- cgit v1.2.3-54-g00ecf From fb71293f257c6fd02ccc06765a96dbf11d4569a0 Mon Sep 17 00:00:00 2001 From: Martin Jansa Date: Thu, 14 Feb 2019 10:26:21 +0000 Subject: qtwebengine: drop 0002-chromium_overrides.cpp-Fix-build-with-plugins-and-oz.patch * with 5.12 it looks like it's not needed anymore, it causes following error instead: linking ../../lib/libQt5WebEngineCore.so.5.12.0 ../../../../git/src/3rdparty/chromium/content/browser/renderer_host/pepper/pepper_truetype_font_list_host.cc:79: error: undefined reference to 'content::GetFontFamilies_SlowBlocking(std::vector, std::allocator >, std::allocator, std::allocator > > >*)' ../../../../git/src/3rdparty/chromium/content/browser/renderer_host/pepper/pepper_truetype_font_list_host.cc:93: error: undefined reference to 'content::GetFontsInFamily_SlowBlocking(std::__cxx11::basic_string, std::allocator > const&, std::vector >*)' collect2: error: ld returned 1 exit status Makefile.core_module:74: recipe for target '../../lib/libQt5WebEngineCore.so.5.12.0' failed Signed-off-by: Martin Jansa --- ...errides.cpp-Fix-build-with-plugins-and-oz.patch | 50 ---------------------- recipes-qt/qt5/qtwebengine_git.bb | 1 - 2 files changed, 51 deletions(-) delete mode 100644 recipes-qt/qt5/qtwebengine/0002-chromium_overrides.cpp-Fix-build-with-plugins-and-oz.patch (limited to 'recipes-qt') diff --git a/recipes-qt/qt5/qtwebengine/0002-chromium_overrides.cpp-Fix-build-with-plugins-and-oz.patch b/recipes-qt/qt5/qtwebengine/0002-chromium_overrides.cpp-Fix-build-with-plugins-and-oz.patch deleted file mode 100644 index 4319058b..00000000 --- a/recipes-qt/qt5/qtwebengine/0002-chromium_overrides.cpp-Fix-build-with-plugins-and-oz.patch +++ /dev/null @@ -1,50 +0,0 @@ -From 76e9084f139341218eccb4c71766bbc3eaa3e61e Mon Sep 17 00:00:00 2001 -From: Martin Jansa -Date: Sun, 10 Jun 2018 10:26:17 +0000 -Subject: [PATCH] chromium_overrides.cpp: Fix build with plugins and ozone - enabled - -* otherwise it fails with: - | make[3]: Entering directory '/OE/build/owpb/webos-ports/tmp-glibc/work/i586-webos-linux/qtwebengine/5.10.1+gitAUTOINC+9dc8dff7a8_c858cc7609-r0/build/src/core' -| creating linker version script QtWebEngineCore.version -| rm -f libQt5WebEngineCore.so.5.10.1 libQt5WebEngineCore.so libQt5WebEngineCore.so.5 libQt5WebEngineCore.so.5.10 -| linking ../../lib/libQt5WebEngineCore.so.5.10.1 -| /OE/build/owpb/webos-ports/tmp-glibc/work/i586-webos-linux/qtwebengine/5.10.1+gitAUTOINC+9dc8dff7a8_c858cc7609-r0/recipe-sysroot-native/usr/bin/i586-webos-linux/../../libexec/i586-webos-linux/gcc/i586-webos-linux/7.3.0/ld: error: /OE/build/owpb/webos-ports/tmp-glibc/work/i586-webos-linux/qtwebengine/5.10.1+gitAUTOINC+9dc8dff7a8_c858cc7609-r0/build/src/core/release/obj/content/browser/browser/pepper_truetype_font_list_ozone.o: multiple definition of 'content::GetFontFamilies_SlowBlocking(std::vector, std::allocator >, std::allocator, std::allocator > > >*)' -| /OE/build/owpb/webos-ports/tmp-glibc/work/i586-webos-linux/qtwebengine/5.10.1+gitAUTOINC+9dc8dff7a8_c858cc7609-r0/recipe-sysroot-native/usr/bin/i586-webos-linux/../../libexec/i586-webos-linux/gcc/i586-webos-linux/7.3.0/ld: /OE/build/owpb/webos-ports/tmp-glibc/work/i586-webos-linux/qtwebengine/5.10.1+gitAUTOINC+9dc8dff7a8_c858cc7609-r0/build/src/core/release/obj/QtWebEngineCore/chromium_overrides.o: previous definition here -| /OE/build/owpb/webos-ports/tmp-glibc/work/i586-webos-linux/qtwebengine/5.10.1+gitAUTOINC+9dc8dff7a8_c858cc7609-r0/recipe-sysroot-native/usr/bin/i586-webos-linux/../../libexec/i586-webos-linux/gcc/i586-webos-linux/7.3.0/ld: error: /OE/build/owpb/webos-ports/tmp-glibc/work/i586-webos-linux/qtwebengine/5.10.1+gitAUTOINC+9dc8dff7a8_c858cc7609-r0/build/src/core/release/obj/content/browser/browser/pepper_truetype_font_list_ozone.o: multiple definition of 'content::GetFontsInFamily_SlowBlocking(std::__cxx11::basic_string, std::allocator > const&, std::vector >*)' -| /OE/build/owpb/webos-ports/tmp-glibc/work/i586-webos-linux/qtwebengine/5.10.1+gitAUTOINC+9dc8dff7a8_c858cc7609-r0/recipe-sysroot-native/usr/bin/i586-webos-linux/../../libexec/i586-webos-linux/gcc/i586-webos-linux/7.3.0/ld: /OE/build/owpb/webos-ports/tmp-glibc/work/i586-webos-linux/qtwebengine/5.10.1+gitAUTOINC+9dc8dff7a8_c858cc7609-r0/build/src/core/release/obj/QtWebEngineCore/chromium_overrides.o: previous definition here -| collect2: error: ld returned 1 exit status -| Makefile.core_module:74: recipe for target '../../lib/libQt5WebEngineCore.so.5.10.1' failed -| make[3]: *** [../../lib/libQt5WebEngineCore.so.5.10.1] Error 1 -| make[3]: Leaving directory '/OE/build/owpb/webos-ports/tmp-glibc/work/i586-webos-linux/qtwebengine/5.10.1+gitAUTOINC+9dc8dff7a8_c858cc7609-r0/build/src/core' -| Makefile:122: recipe for target 'sub-core_module-pro-make_first' failed -| make[2]: *** [sub-core_module-pro-make_first] Error 2 -| make[2]: Leaving directory '/OE/build/owpb/webos-ports/tmp-glibc/work/i586-webos-linux/qtwebengine/5.10.1+gitAUTOINC+9dc8dff7a8_c858cc7609-r0/build/src/core' -| Makefile:78: recipe for target 'sub-core-make_first' failed -| make[1]: *** [sub-core-make_first] Error 2 -| make[1]: Leaving directory '/OE/build/owpb/webos-ports/tmp-glibc/work/i586-webos-linux/qtwebengine/5.10.1+gitAUTOINC+9dc8dff7a8_c858cc7609-r0/build/src' -| Makefile:46: recipe for target 'sub-src-make_first' failed -| make: *** [sub-src-make_first] Error 2 -| ERROR: oe_runmake failed -| WARNING: /OE/build/owpb/webos-ports/tmp-glibc/work/i586-webos-linux/qtwebengine/5.10.1+gitAUTOINC+9dc8dff7a8_c858cc7609-r0/temp/run.do_compile.10122:1 exit 1 from 'exit 1' -| ERROR: Function failed: do_compile (log file is located at /OE/build/owpb/webos-ports/tmp-glibc/work/i586-webos-linux/qtwebengine/5.10.1+gitAUTOINC+9dc8dff7a8_c858cc7609-r0/temp/log.do_compile.10122) - -Signed-off-by: Martin Jansa -Signed-off-by: Christophe Chapuis ---- - src/core/chromium_overrides.cpp | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/core/chromium_overrides.cpp b/src/core/chromium_overrides.cpp -index 841dcf4c..2f2299b4 100644 ---- a/src/core/chromium_overrides.cpp -+++ b/src/core/chromium_overrides.cpp -@@ -140,7 +140,7 @@ std::unique_ptr GetFontList_SlowBlocking() - return std::move(font_list); - } - --#if QT_CONFIG(webengine_pepper_plugins) -+#if QT_CONFIG(webengine_pepper_plugins) && !defined(USE_OZONE) - // content/browser/renderer_host/pepper/pepper_truetype_font_list.h - void GetFontFamilies_SlowBlocking(std::vector *font_families) - { diff --git a/recipes-qt/qt5/qtwebengine_git.bb b/recipes-qt/qt5/qtwebengine_git.bb index bcddf889..ee87c884 100644 --- a/recipes-qt/qt5/qtwebengine_git.bb +++ b/recipes-qt/qt5/qtwebengine_git.bb @@ -139,7 +139,6 @@ QT_MODULE_BRANCH_CHROMIUM = "69-based" SRC_URI += " \ ${QT_GIT}/qtwebengine-chromium.git;name=chromium;branch=${QT_MODULE_BRANCH_CHROMIUM};protocol=${QT_GIT_PROTOCOL};destsuffix=git/src/3rdparty \ file://0001-Force-host-toolchain-configuration.patch \ - file://0002-chromium_overrides.cpp-Fix-build-with-plugins-and-oz.patch \ file://0003-Revert-use-new-feature-name-xkbcommon_evdev-xkbcommo.patch \ " SRC_URI_append_libc-musl = "\ -- cgit v1.2.3-54-g00ecf