diff options
author | Mikko Gronoff <mikko.gronoff@qt.io> | 2018-09-26 12:26:29 +0300 |
---|---|---|
committer | Mikko Gronoff <mikko.gronoff@qt.io> | 2018-09-26 13:30:15 +0300 |
commit | a34f936566039c2cba6a0e58192398255a0653b8 (patch) | |
tree | 609467ab742ba1b01d4eb9a3999587454086f24b | |
parent | fa6bdc2e91ddb6755d7ce463b623b4eed706d438 (diff) | |
parent | 3439f344fbb4c1ee2b13ddb54435716c53d79be2 (diff) |
Merge remote-tracking branch 'qtyocto/5.11' into 5.12
* qtyocto/5.11:
3439f34 qtbase: update changelog
0bc53eb qt5: update submodules
1b356a7 Merge remote-tracking branch 'qtyocto/upstream/master' into 5.11
9ffdd55 qtscript: Update the custom patch from mainline
95d64ea qtbase: remove renameat2 PACKAGECONFIG
2d1d807 qtbase: fix build with glibc-2.28 - for non-readers like me
e4abbde qtwebengine: Fix optonal glib-2.0 dependency
1fb8aff qtwebkit_git.bb: Fix configure failure on bison
cb7dfcc qtwebengine: Add PACKAGECONFIG for pepper-plugins printing-and-pdf spellchecker
70b090a qtwebengine: add a package config to enable proprietary codecs
bb38f64 qt3d-runtime: add recipe for Qt 3D Studio runtime library
75e2d3a qtbase: update the dependency for gbm PACKAGECONFIG
539e4f0 qtbase: fix build with glibc-2.28
c2e4ec6 nativesdk-packagegroup-qt5-toolchain-host: Add perl modules
4587cc3 qtchooser: drop useless patch, set PV
3a4ad54 packagegroup-qt5-toolchain-target: Remove non-existing qttranslations-qt from rdeps
2736dcf qtbase: Add a kde PACKAGECONFIG
Conflicts:
recipes-qt/qt5/nativesdk-qtbase_git.bb
recipes-qt/qt5/qtbase-native_git.bb
recipes-qt/qt5/qtbase_git.bb
recipes-qt/qt5/qtdeclarative_git.bb
Change-Id: Ic58c0577f9df0aaac613befeacb1db98c6af5d17
15 files changed, 122 insertions, 114 deletions
diff --git a/recipes-qt/packagegroups/nativesdk-packagegroup-qt5-toolchain-host.bb b/recipes-qt/packagegroups/nativesdk-packagegroup-qt5-toolchain-host.bb index 71746f03..4b46e676 100644 --- a/recipes-qt/packagegroups/nativesdk-packagegroup-qt5-toolchain-host.bb +++ b/recipes-qt/packagegroups/nativesdk-packagegroup-qt5-toolchain-host.bb @@ -11,4 +11,5 @@ RDEPENDS_${PN} += " \ nativesdk-packagegroup-sdk-host \ nativesdk-qttools-tools \ nativesdk-qtbase-tools \ + nativesdk-perl-modules \ " diff --git a/recipes-qt/packagegroups/packagegroup-qt5-toolchain-target.bb b/recipes-qt/packagegroups/packagegroup-qt5-toolchain-target.bb index 8219aeb2..d020cc35 100755 --- a/recipes-qt/packagegroups/packagegroup-qt5-toolchain-target.bb +++ b/recipes-qt/packagegroups/packagegroup-qt5-toolchain-target.bb @@ -36,7 +36,6 @@ RDEPENDS_${PN} += " \ qtbase-mkspecs \ qtbase-plugins \ qtbase-staticdev \ - qttranslations-qt \ qttranslations-qtbase \ qttranslations-qthelp \ qtcharts-dev \ diff --git a/recipes-qt/qt5/nativesdk-qtbase_git.bb b/recipes-qt/qt5/nativesdk-qtbase_git.bb index 184d3730..b9732f79 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.11-shared -# 5.11.meta-qt5-shared.6 +# 5.11.meta-qt5-shared.7 SRC_URI += "\ file://0001-Add-linux-oe-g-platform.patch \ file://0002-cmake-Use-OE_QMAKE_PATH_EXTERNAL_HOST_BINS.patch \ @@ -37,13 +37,14 @@ SRC_URI += "\ file://0010-linux-clang-Invert-conditional-for-defining-QT_SOCKL.patch \ file://0011-tst_qlocale-Enable-QT_USE_FENV-only-on-glibc.patch \ file://0012-mkspecs-common-gcc-base.conf-Use-I-instead-of-isyste.patch \ + file://0015-Check-glibc-version-for-renameat2-statx-on-non-boots.patch \ " # common for qtbase-native and nativesdk-qtbase # Patches from https://github.com/meta-qt5/qtbase/commits/b5.11-native -# 5.11.meta-qt5-native.6 +# 5.11.meta-qt5-native.7 SRC_URI += " \ - file://0014-Always-build-uic-and-qvkgen.patch \ + file://0016-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 be86a93b..1ea5fda1 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.11-shared -# 5.11.meta-qt5-shared.6 +# 5.11.meta-qt5-shared.7 SRC_URI += "\ file://0001-Add-linux-oe-g-platform.patch \ file://0002-cmake-Use-OE_QMAKE_PATH_EXTERNAL_HOST_BINS.patch \ @@ -32,18 +32,19 @@ SRC_URI += "\ file://0010-linux-clang-Invert-conditional-for-defining-QT_SOCKL.patch \ file://0011-tst_qlocale-Enable-QT_USE_FENV-only-on-glibc.patch \ file://0012-mkspecs-common-gcc-base.conf-Use-I-instead-of-isyste.patch \ + file://0015-Check-glibc-version-for-renameat2-statx-on-non-boots.patch \ " # common for qtbase-native and nativesdk-qtbase # Patches from https://github.com/meta-qt5/qtbase/commits/b5.10-native -# 5.11.meta-qt5-native.6 +# 5.11.meta-qt5-native.7 SRC_URI += " \ - file://0014-Always-build-uic-and-qvkgen.patch \ + file://0016-Always-build-uic-and-qvkgen.patch \ " # only for qtbase-native SRC_URI += " \ - file://0015-Bootstrap-without-linkat-feature.patch \ + file://0017-Bootstrap-without-linkat-feature.patch \ " CLEANBROKEN = "1" diff --git a/recipes-qt/qt5/qtbase/0015-Check-glibc-version-for-renameat2-statx-on-non-boots.patch b/recipes-qt/qt5/qtbase/0015-Check-glibc-version-for-renameat2-statx-on-non-boots.patch new file mode 100644 index 00000000..e1e1087c --- /dev/null +++ b/recipes-qt/qt5/qtbase/0015-Check-glibc-version-for-renameat2-statx-on-non-boots.patch @@ -0,0 +1,41 @@ +From 7e287f4793f75a7291386a904d3361460748b15b Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@gmail.com> +Date: Tue, 21 Aug 2018 00:29:06 +0200 +Subject: [PATCH] Check glibc version for renameat2/statx on non bootstrapped + build +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Upstream-Status: Pending + +Signed-off-by: Andreas Müller <schnitzeltony@gmail.com> +--- + src/corelib/io/qfilesystemengine_unix.cpp | 11 ++++++++++++ + 1 file changed, 11 insertions(+) + +diff --git a/src/corelib/io/qfilesystemengine_unix.cpp b/src/corelib/io/qfilesystemengine_unix.cpp +index be6ce48d0cb..1bf1bebc7f1 100644 +--- a/src/corelib/io/qfilesystemengine_unix.cpp ++++ b/src/corelib/io/qfilesystemengine_unix.cpp +@@ -98,6 +98,17 @@ extern "C" NSString *NSTemporaryDirectory(); + # define FICLONE _IOW(0x94, 9, int) + #endif + ++// renameat2/statx features for non bootstrapped build ++#ifndef QT_BOOTSTRAPPED ++#ifdef __GLIBC_PREREQ ++# define QT_FEATURE_renameat2 (__GLIBC_PREREQ(2, 28) ? 1 : -1) ++# define QT_FEATURE_statx (__GLIBC_PREREQ(2, 28) ? 1 : -1) ++#else ++# define QT_FEATURE_renameat2 -1 ++# define QT_FEATURE_statx -1 ++#endif ++#endif ++ + # if defined(Q_OS_ANDROID) + // renameat2() and statx() are disabled on Android because quite a few systems + // come with sandboxes that kill applications that make system calls outside a +-- +2.14.4 + diff --git a/recipes-qt/qt5/qtbase/0014-Always-build-uic-and-qvkgen.patch b/recipes-qt/qt5/qtbase/0016-Always-build-uic-and-qvkgen.patch index 060e8fbf..0a32e881 100644 --- a/recipes-qt/qt5/qtbase/0014-Always-build-uic-and-qvkgen.patch +++ b/recipes-qt/qt5/qtbase/0016-Always-build-uic-and-qvkgen.patch @@ -1,4 +1,4 @@ -From 7b0de75cc3d85b44f96f1c6869c65399351a1398 Mon Sep 17 00:00:00 2001 +From 7ad41f69af974ec924eb27c86fb15d5da9384d6c Mon Sep 17 00:00:00 2001 From: Martin Jansa <Martin.Jansa@gmail.com> Date: Sat, 16 Nov 2013 00:32:30 +0100 Subject: [PATCH] Always build uic and qvkgen diff --git a/recipes-qt/qt5/qtbase/0015-Bootstrap-without-linkat-feature.patch b/recipes-qt/qt5/qtbase/0017-Bootstrap-without-linkat-feature.patch index 8863ddd8..4f5fdc95 100644 --- a/recipes-qt/qt5/qtbase/0015-Bootstrap-without-linkat-feature.patch +++ b/recipes-qt/qt5/qtbase/0017-Bootstrap-without-linkat-feature.patch @@ -1,4 +1,4 @@ -From 6ff049f08cbe80b00b34859acdc5ccf7b9c9ae18 Mon Sep 17 00:00:00 2001 +From 05bbd2dce8c7f4a40d86841671763b9d8b51c886 Mon Sep 17 00:00:00 2001 From: Samuli Piippo <samuli.piippo@qt.io> Date: Fri, 24 Nov 2017 15:16:31 +0200 Subject: [PATCH] Bootstrap without linkat feature @@ -13,7 +13,7 @@ Upstream-Status: Inappropriate [OE specific] 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/corelib/global/qconfig-bootstrapped.h b/src/corelib/global/qconfig-bootstrapped.h -index 3469ebe5e6..cb889f27c2 100644 +index c5585ea32a..de895e7bf4 100644 --- a/src/corelib/global/qconfig-bootstrapped.h +++ b/src/corelib/global/qconfig-bootstrapped.h @@ -90,7 +90,7 @@ diff --git a/recipes-qt/qt5/qtbase_git.bb b/recipes-qt/qt5/qtbase_git.bb index 6ef23107..0138c13b 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.11-shared -# 5.11.meta-qt5-shared.6 +# 5.11.meta-qt5-shared.7 SRC_URI += "\ file://0001-Add-linux-oe-g-platform.patch \ file://0002-cmake-Use-OE_QMAKE_PATH_EXTERNAL_HOST_BINS.patch \ @@ -28,8 +28,10 @@ SRC_URI += "\ file://0010-linux-clang-Invert-conditional-for-defining-QT_SOCKL.patch \ file://0011-tst_qlocale-Enable-QT_USE_FENV-only-on-glibc.patch \ file://0012-mkspecs-common-gcc-base.conf-Use-I-instead-of-isyste.patch \ + file://0015-Check-glibc-version-for-renameat2-statx-on-non-boots.patch \ " + # for syncqt RDEPENDS_${PN}-tools += "perl" @@ -59,6 +61,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_FONTS ?= "" PACKAGECONFIG_SYSTEM ?= "jpeg libpng zlib" PACKAGECONFIG_DISTRO ?= "" @@ -78,6 +81,7 @@ PACKAGECONFIG ?= " \ ${PACKAGECONFIG_GL} \ ${PACKAGECONFIG_FB} \ ${PACKAGECONFIG_X11} \ + ${PACKAGECONFIG_KDE} \ ${PACKAGECONFIG_FONTS} \ ${PACKAGECONFIG_SYSTEM} \ ${PACKAGECONFIG_DISTRO} \ @@ -138,7 +142,7 @@ PACKAGECONFIG[gtk] = "-gtk,-no-gtk,gtk+3" PACKAGECONFIG[directfb] = "-directfb,-no-directfb,directfb" PACKAGECONFIG[linuxfb] = "-linuxfb,-no-linuxfb" PACKAGECONFIG[kms] = "-kms,-no-kms,drm virtual/egl" -PACKAGECONFIG[gbm] = "-gbm,-no-gbm,virtual/mesa" +PACKAGECONFIG[gbm] = "-gbm,-no-gbm,virtual/libgbm" PACKAGECONFIG[icu] = "-icu,-no-icu,icu" PACKAGECONFIG[udev] = "-libudev,-no-libudev,udev" PACKAGECONFIG[openssl] = "-openssl,-no-openssl,openssl,libssl" @@ -146,8 +150,6 @@ PACKAGECONFIG[widgets] = "-widgets,-no-widgets" PACKAGECONFIG[libproxy] = "-libproxy,-no-libproxy,libproxy" PACKAGECONFIG[libinput] = "-libinput,-no-libinput,libinput" PACKAGECONFIG[journald] = "-journald,-no-journald,systemd" -# needs kernel 3.16+ -PACKAGECONFIG[renameat2] = "-feature-renameat2,-no-feature-renameat2," # needs kernel 3.17+ PACKAGECONFIG[getentropy] = "-feature-getentropy,-no-feature-getentropy," diff --git a/recipes-qt/qt5/qtscript/0001-3rdparty-javascriptcore-Add-RISC-V-support.patch b/recipes-qt/qt5/qtscript/0001-3rdparty-javascriptcore-Add-RISC-V-support.patch new file mode 100644 index 00000000..878a8ab9 --- /dev/null +++ b/recipes-qt/qt5/qtscript/0001-3rdparty-javascriptcore-Add-RISC-V-support.patch @@ -0,0 +1,50 @@ +From 21781f11a71d4e6449d89372aa9cc5b95ce8a67c Mon Sep 17 00:00:00 2001 +From: Alistair Francis <alistair.francis@wdc.com> +Date: Wed, 18 Jul 2018 14:26:21 -0700 +Subject: [PATCH] 3rdparty/javascriptcore: Add RISC-V support + +Signed-off-by: Alistair Francis <alistair.francis@wdc.com> +Change-Id: I81f15084ef6b5b8d855c1f568cacca176af51b57 +Reviewed-by: Simon Hausmann <simon.hausmann@qt.io> + +Upstream-Status: Backport +--- + .../javascriptcore/JavaScriptCore/wtf/Platform.h | 14 ++++++++++++-- + 1 file changed, 12 insertions(+), 2 deletions(-) + +diff --git a/src/3rdparty/javascriptcore/JavaScriptCore/wtf/Platform.h b/src/3rdparty/javascriptcore/JavaScriptCore/wtf/Platform.h +index 00caa6d..96942c7 100644 +--- a/src/3rdparty/javascriptcore/JavaScriptCore/wtf/Platform.h ++++ b/src/3rdparty/javascriptcore/JavaScriptCore/wtf/Platform.h +@@ -397,6 +397,16 @@ + #endif + #endif /* __mips__ */ + ++/* CPU(RISCV64) - RISC-V 64-bit */ ++#if defined(__riscv) && __riscv_xlen == 64 ++#define WTF_CPU_RISCV64 1 ++#endif ++ ++/* CPU(RISCV32) - RISC-V 32-bit */ ++#if defined(__riscv) && __riscv_xlen == 32 ++#define WTF_CPU_RISCV32 1 ++#endif ++ + /* ==== OS() - underlying operating system; only to be used for mandated low-level services like + virtual memory, not to choose a GUI toolkit ==== */ + +@@ -948,9 +958,9 @@ + #endif + + #if !defined(WTF_USE_JSVALUE64) && !defined(WTF_USE_JSVALUE32) && !defined(WTF_USE_JSVALUE32_64) +-#if (CPU(X86_64) && !CPU(X32) && (OS(UNIX) || OS(WINDOWS) || OS(SOLARIS) || OS(HPUX))) || (CPU(IA64) && !CPU(IA64_32)) || CPU(ALPHA) || CPU(AIX64) || CPU(SPARC64) || CPU(MIPS64) || CPU(AARCH64) ++#if (CPU(X86_64) && !CPU(X32) && (OS(UNIX) || OS(WINDOWS) || OS(SOLARIS) || OS(HPUX))) || (CPU(IA64) && !CPU(IA64_32)) || CPU(ALPHA) || CPU(AIX64) || CPU(SPARC64) || CPU(MIPS64) || CPU(AARCH64) || CPU(RISCV64) + #define WTF_USE_JSVALUE64 1 +-#elif CPU(ARM) || CPU(PPC64) ++#elif CPU(ARM) || CPU(PPC64) || CPU(RISCV32) + #define WTF_USE_JSVALUE32 1 + #elif OS(WINDOWS) && COMPILER(MINGW) + /* Using JSVALUE32_64 causes padding/alignement issues for JITStubArg +-- +2.17.1 + diff --git a/recipes-qt/qt5/qtscript/0001-javascriptcore-Use-64-bit-ints.patch b/recipes-qt/qt5/qtscript/0001-javascriptcore-Use-64-bit-ints.patch deleted file mode 100644 index a083decf..00000000 --- a/recipes-qt/qt5/qtscript/0001-javascriptcore-Use-64-bit-ints.patch +++ /dev/null @@ -1,58 +0,0 @@ -From 8fd53951d53ef8c5b62fe985665dad0545bb3161 Mon Sep 17 00:00:00 2001 -From: Alistair Francis <alistair.francis@wdc.com> -Date: Mon, 4 Jun 2018 14:24:59 -0700 -Subject: [PATCH] javascriptcore: Use 64-bit ints - -Where required use 64-bit integers for casts. - -Signed-off-by: Alistair Francis <alistair.francis@wdc.com> -Upstream-Status: Pending ---- - .../JavaScriptCore/assembler/X86Assembler.h | 2 +- - .../javascriptcore/JavaScriptCore/runtime/JSValue.h | 8 ++++++++ - 2 files changed, 9 insertions(+), 1 deletion(-) - -diff --git a/src/3rdparty/javascriptcore/JavaScriptCore/assembler/X86Assembler.h b/src/3rdparty/javascriptcore/JavaScriptCore/assembler/X86Assembler.h -index ab3d05f..ed5965f 100644 ---- a/src/3rdparty/javascriptcore/JavaScriptCore/assembler/X86Assembler.h -+++ b/src/3rdparty/javascriptcore/JavaScriptCore/assembler/X86Assembler.h -@@ -2033,7 +2033,7 @@ private: - } - } - --#if !CPU(X86_64) -+#if CPU(X86) - void memoryModRM(int reg, void* address) - { - // noBase + ModRmMemoryNoDisp means noBase + ModRmMemoryDisp32! -diff --git a/src/3rdparty/javascriptcore/JavaScriptCore/runtime/JSValue.h b/src/3rdparty/javascriptcore/JavaScriptCore/runtime/JSValue.h -index 7584c52..958ac89 100644 ---- a/src/3rdparty/javascriptcore/JavaScriptCore/runtime/JSValue.h -+++ b/src/3rdparty/javascriptcore/JavaScriptCore/runtime/JSValue.h -@@ -490,7 +490,11 @@ namespace JSC { - u.asBits.tag = CellTag; - else - u.asBits.tag = EmptyValueTag; -+#if CPU(X86) - u.asBits.payload = reinterpret_cast<int32_t>(ptr); -+#else -+ u.asBits.payload = reinterpret_cast<int64_t>(ptr); -+#endif - #if ENABLE(JSC_ZOMBIES) - ASSERT(!isZombie()); - #endif -@@ -502,7 +506,11 @@ namespace JSC { - u.asBits.tag = CellTag; - else - u.asBits.tag = EmptyValueTag; -+#if CPU(X86) - u.asBits.payload = reinterpret_cast<int32_t>(const_cast<JSCell*>(ptr)); -+#else -+ u.asBits.payload = reinterpret_cast<int64_t>(const_cast<JSCell*>(ptr)); -+#endif - #if ENABLE(JSC_ZOMBIES) - ASSERT(!isZombie()); - #endif --- -2.17.1 - diff --git a/recipes-qt/qt5/qtscript_git.bb b/recipes-qt/qt5/qtscript_git.bb index 03711a65..63f62a43 100644 --- a/recipes-qt/qt5/qtscript_git.bb +++ b/recipes-qt/qt5/qtscript_git.bb @@ -11,7 +11,7 @@ LIC_FILES_CHKSUM = " \ file://LICENSE.LGPL3;md5=e6a600fd5e1d9cbde2d983680233ad02 \ " -SRC_URI += "file://0001-javascriptcore-Use-64-bit-ints.patch" +SRC_URI += "file://0001-3rdparty-javascriptcore-Add-RISC-V-support.patch" # qemuarm build fails with: # /OE/build/oe-core/tmp-glibc/work/armv5te-oe-linux-gnueabi/qtscript/5.4.1+gitAUTOINC+822df36f25-r0/git/src/3rdparty/javascriptcore/JavaScriptCore/assembler/AssemblerBuffer.h: In member function 'void QTJSC::AssemblerBuffer::putInt64Unchecked(int64_t)': diff --git a/recipes-qt/qt5/qtwebengine_git.bb b/recipes-qt/qt5/qtwebengine_git.bb index b01c2ca9..9bd83612 100644 --- a/recipes-qt/qt5/qtwebengine_git.bb +++ b/recipes-qt/qt5/qtwebengine_git.bb @@ -53,12 +53,16 @@ PACKAGECONFIG[libvpx] = "-feature-webengine-system-libvpx,-no-feature-webengine- PACKAGECONFIG[libevent] = "-feature-webengine-system-libevent,-no-feature-webengine-system-libevent,libevent" PACKAGECONFIG[libpng] = "-feature-webengine-system-png,-no-feature-webengine-system-png,libpng" PACKAGECONFIG[harfbuzz] = "-feature-webengine-system-harfbuzz,-no-feature-webengine-system-harfbuzz,harfbuzz" -PACKAGECONFIG[glib] = "-feature-webengine-system-glib,-no-feature-webengine-system-glib,glib" +PACKAGECONFIG[glib] = "-feature-webengine-system-glib,-no-feature-webengine-system-glib,glib-2.0" PACKAGECONFIG[zlib] = "-feature-webengine-system-zlib,-no-feature-webengine-system-zlib,zlib" PACKAGECONFIG[protobuf] = "-feature-webengine-system-protobuf,-no-feature-webengine-system-protobuf,protobuf" PACKAGECONFIG[jasoncpp] = "-feature-webengine-system-jsoncpp,-no-feature-webengine-system-jsoncpp,jasoncpp" PACKAGECONFIG[libxml2] = "-feature-webengine-system-libxml2,-no-feature-webengine-system-libxml2,libxml2" PACKAGECONFIG[minizip] = "-feature-webengine-system-minizip,-no-feature-webengine-system-minizip,minizip" +PACKAGECONFIG[proprietary-codecs] = "-feature-webengine-proprietary-codecs,-no-feature-webengine-proprietary-codecs" +PACKAGECONFIG[pepper-plugins] = "-feature-webengine-pepper-plugins,-no-feature-webengine-pepper-plugins" +PACKAGECONFIG[printing-and-pdf] = "-feature-webengine-printing-and-pdf,-no-feature-webengine-printing-and-pdf" +PACKAGECONFIG[spellchecker] = "-feature-webengine-spellchecker,-no-feature-webengine-spellchecker" EXTRA_QMAKEVARS_CONFIGURE += "${PACKAGECONFIG_CONFARGS}" @@ -120,6 +124,9 @@ PACKAGE_DEBUG_SPLIT_STYLE = "debug-without-src" # for /usr/share/qt5/qtwebengine_resources.pak FILES_${PN} += "${OE_QMAKE_PATH_QT_TRANSLATIONS} ${OE_QMAKE_PATH_QT_DATA}" +# Chromium uses libpci to determine which optimizations/workarounds to apply +RDEPENDS_${PN}_append_x86 = " libpci" + RDEPENDS_${PN}-examples += " \ ${PN}-qmlplugins \ qtquickcontrols-qmlplugins \ diff --git a/recipes-qt/qt5/qtwebkit_git.bb b/recipes-qt/qt5/qtwebkit_git.bb index 9e4617a0..a7dad987 100644 --- a/recipes-qt/qt5/qtwebkit_git.bb +++ b/recipes-qt/qt5/qtwebkit_git.bb @@ -9,7 +9,7 @@ LIC_FILES_CHKSUM = " \ file://Source/JavaScriptCore/parser/Parser.h;endline=21;md5=bd69f72183a7af673863f057576e21ee \ " -DEPENDS += "qtbase qtdeclarative icu ruby-native sqlite3 glib-2.0 libxslt gperf-native" +DEPENDS += "qtbase qtdeclarative icu ruby-native sqlite3 glib-2.0 libxslt gperf-native bison-native" inherit cmake_qt5 perlnative pythonnative diff --git a/recipes-qt/qtchooser/qtchooser/0001-Makefile-install-the-man-dir.patch b/recipes-qt/qtchooser/qtchooser/0001-Makefile-install-the-man-dir.patch deleted file mode 100644 index 8e8e1c69..00000000 --- a/recipes-qt/qtchooser/qtchooser/0001-Makefile-install-the-man-dir.patch +++ /dev/null @@ -1,35 +0,0 @@ -From 3f142e100cc3dd69b816ce79152760c823cb86e9 Mon Sep 17 00:00:00 2001 -From: Li Xin <lixin.fnst@cn.fujitsu.com> -Date: Fri, 29 Apr 2016 12:41:34 +0900 -Subject: [PATCH] Makefile: install the man dir - -upstream-status: backported - -Signed-off-by: Li Xin <lixin.fnst@cn.fujitsu.com> ---- - Makefile | 3 +++ - 1 file changed, 3 insertions(+) - -diff --git a/Makefile b/Makefile -index 20b9100..1fd8cd3 100644 ---- a/Makefile -+++ b/Makefile -@@ -1,5 +1,6 @@ - prefix = /usr - bindir = $(prefix)/bin -+MKDIR = mkdir -p - TOOLS = assistant \ - designer \ - lconvert \ -@@ -56,6 +57,8 @@ install: - case `uname -s` in Darwin) \ - for tool in $(MACTOOLS); do ln -sf qtchooser "$(INSTALL_ROOT)$(bindir)/$$tool"; done \ - ;; esac -+ $(MKDIR) $(INSTALL_ROOT)$(prefix)/share/man/man1 -+ install -m 644 -p doc/qtchooser.1 $(INSTALL_ROOT)$(prefix)/share/man/man1 - - uninstall: - cd src/qtchooser && $(MAKE) uninstall --- -1.8.4.2 - diff --git a/recipes-qt/qtchooser/qtchooser_git.bb b/recipes-qt/qtchooser/qtchooser_git.bb index e745e8ad..06b1ae91 100644 --- a/recipes-qt/qtchooser/qtchooser_git.bb +++ b/recipes-qt/qtchooser/qtchooser_git.bb @@ -1,8 +1,7 @@ DESCRIPTION = "Wrapper to select between Qt development binary versions" HOMEPAGE = "http://macieira.org/qtchooser" LICENSE = "LGPL-2.1 & Digia-Qt-LGPL-Exception-1.1 | GPL-3.0" -SRC_URI = "git://code.qt.io/cgit/qtsdk/qtchooser.git;branch=master \ - file://0001-Makefile-install-the-man-dir.patch" +SRC_URI = "git://code.qt.io/cgit/qtsdk/qtchooser.git" LIC_FILES_CHKSUM = " \ file://LGPL_EXCEPTION.txt;md5=0145c4d1b6f96a661c2c139dfb268fb6 \ @@ -11,7 +10,7 @@ LIC_FILES_CHKSUM = " \ " S = "${WORKDIR}/git" SRCREV = "a1b6736e4f2daf86cd1626004d40ef57db85fbb5" -#PV = "39+git${SRCREV}" +PV = "39+git${SRCPV}" inherit pkgconfig |