summaryrefslogtreecommitdiffstats
path: root/recipes-qt/qt5/qtwebengine/0004-mkspecs-Allow-builds-with-libc-glibc.patch
Commit message (Collapse)AuthorAgeFilesLines
* Merge remote-tracking branch 'qt/upstream/master' into 5.15Mikko Gronoff2020-07-141-1/+1
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The updated pyqt5 recipe removed from build as it had incorrect checksum & SRC_URI seems to be inaccessible (it is a snapshot build that seems to get overwritten by the next build, meaning the package version defined in pyqt5 recipe title is accessible only a short while). Vulkan PACKAGECONFIG already included in our layer, removed the duplicate entry. * upstream/master: 1650757f python3-pyqt5: Update to 5.15 version e8a44772 ogl-runtime: update to v2.7.0 098b9aca qt5-creator_git: add x11 and opengl to REQUIRED_DISTRO_FEATURES fbbd24d9 qtwayland: conditional to support PACKAGECONFIG wayland-egl 62bb2ca6 qtbase: Add vulkan to PACKAGECONFIGs b4340317 qt5: upgrade to 5.15.0 Conflicts: recipes-qt/qt5/nativesdk-qtbase_git.bb recipes-qt/qt5/qt3d_git.bb recipes-qt/qt5/qt5-git.inc recipes-qt/qt5/qtbase-native_git.bb recipes-qt/qt5/qtbase/0012-mkspecs-common-gcc-base.conf-Use-I-instead-of-isyste.patch recipes-qt/qt5/qtbase/0017-input-Make-use-of-timeval-portable-for-64bit-time_t.patch recipes-qt/qt5/qtbase_git.bb recipes-qt/qt5/qtcharts_git.bb recipes-qt/qt5/qtcoap_git.bb recipes-qt/qt5/qtconnectivity_git.bb recipes-qt/qt5/qtdatavis3d_git.bb recipes-qt/qt5/qtdeclarative/0002-Use-python3-explicitly.patch recipes-qt/qt5/qtdeclarative_git.bb recipes-qt/qt5/qtgamepad_git.bb recipes-qt/qt5/qtgraphicaleffects_git.bb recipes-qt/qt5/qtimageformats_git.bb recipes-qt/qt5/qtknx_git.bb recipes-qt/qt5/qtlocation_git.bb recipes-qt/qt5/qtlottie_git.bb recipes-qt/qt5/qtmqtt_git.bb recipes-qt/qt5/qtmultimedia_git.bb recipes-qt/qt5/qtnetworkauth_git.bb recipes-qt/qt5/qtopcua_git.bb recipes-qt/qt5/qtpurchasing_git.bb recipes-qt/qt5/qtquick3d_git.bb recipes-qt/qt5/qtquickcontrols2_git.bb recipes-qt/qt5/qtquickcontrols_git.bb recipes-qt/qt5/qtquicktimeline_git.bb recipes-qt/qt5/qtremoteobjects_git.bb recipes-qt/qt5/qtscript_git.bb recipes-qt/qt5/qtscxml_git.bb recipes-qt/qt5/qtsensors_git.bb recipes-qt/qt5/qtserialbus_git.bb recipes-qt/qt5/qtserialport_git.bb recipes-qt/qt5/qtsvg_git.bb recipes-qt/qt5/qttools_git.bb recipes-qt/qt5/qttranslations_git.bb recipes-qt/qt5/qtvirtualkeyboard_git.bb recipes-qt/qt5/qtwayland_git.bb recipes-qt/qt5/qtwebchannel_git.bb recipes-qt/qt5/qtwebengine/0004-mkspecs-Allow-builds-with-libc-glibc.patch recipes-qt/qt5/qtwebengine_git.bb recipes-qt/qt5/qtwebglplugin_git.bb recipes-qt/qt5/qtwebsockets_git.bb recipes-qt/qt5/qtwebview_git.bb recipes-qt/qt5/qtx11extras_git.bb recipes-qt/qt5/qtxmlpatterns_git.bb Change-Id: I35e5db6b4f122290c2ff0c011d68636edde8e861
| * qt5: upgrade to 5.15.0Martin Jansa2020-05-271-1/+1
| | | | | | | | | | | | | | | | | | * https://www.qt.io/blog/qt-5.15-released * continue to use latest revision in 5.15 (and 80-based) branch for qtwebengine, because we were already using newer than v5.15.0 revision and some of those fixes are needed for master (e.g. for build with gcc-10) Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
* | qt5: update submodulesdevMikko Gronoff2020-06-091-12/+34
|/ | | | | | | | Update to latest content in Qt 5.15 branch. Task-number: QTBUG-84150 Change-Id: I929553df6d0d32277d7e7c5bde2c242d811c29af Reviewed-by: Samuli Piippo <samuli.piippo@qt.io>
* qt5: upgrade to 5.15 rc1Martin Jansa2020-05-111-1/+1
| | | | | | * use latest revisions in 5.15 branches Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
* qt5: upgrade to 5.15 beta4Martin Jansa2020-04-211-1/+1
| | | | Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
* qtwebengine: update patches for beta2Martin Jansa2020-04-031-0/+26
| | | | Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
* qtwebengine: Fix build with ninja >= 1.10.0Andreas Müller2020-03-131-26/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * For now just skip version check. Looked into: ninja came from meta-oe to oe-core with: commit fc3aef67a95a90e9a485c6b0e93db8cdeab5d3ab Author: Khem Raj <raj.khem@gmail.com> Date: Thu Jul 27 21:52:12 2017 -0700 ninja: Add recipe llvm is using it, therefore move it from meta-oe Signed-off-by: Khem Raj <raj.khem@gmail.com> That was in rocko release cycle. So the assumption we have a ninja decent enough should be acceptable. * and since the upgrade to ninja-1.10.0 in: commit d1cd957cea29f3ab111ae752bc9ad75a1324c255 Author: Upgrade Helper <auh@auh.yoctoproject.org> Date: Fri Feb 21 14:45:35 2020 -0800 ninja: upgrade 1.9.0 -> 1.10.0 Signed-off-by: Khem Raj <raj.khem@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org> the do_configure task fails with: | ERROR: Feature 'webengine-system-ninja' was enabled, but the pre-condition 'tests.webengine-ninja' failed. * Looked into qtwebengine current dev branch: There is no solution yet. So as soon as upstream offers a better solution most likely this patch will not apply any more and has to be removed then. Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
* qt5: upgrade to 5.14.1Martin Jansa2020-01-271-1/+1
| | | | Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
* qtwebengine: refresh the patches and upload them to meta-qt5 forks on github ↵Martin Jansa2020-01-111-19/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | for maintenance * fixes 0004-mkspecs-Allow-builds-with-libc-glibc.patch which didn't apply at all, because the modified mkspecs/features/configure.prf was dropped completely in: commit 047d61f188aae3fe3ebc689900b8a5c9fb6e901d Author: Michal Klocek michal.klocek@qt.io Date: Fri Aug 9 17:40:29 2019 +0200 Add webengine-core feature The same chunk can be found in src/buildtools/config/support.pri, so I've updated the .patch accordingly, but haven't tried the build with musl yet. * fixes 0023-chromium-Move-CharAllocator-definition-to-a-header-f.patch to apply ERROR: qtwebengine-5.14.0+gitAUTOINC+d366f1d5d3_939daf833f-r0 do_patch: Command Error: 'quilt --quiltrc /OE/build/oe-core/tmp-glibc/work/core2-64-oe-linux/qtwebengine/5.14.0+gitAUTOINC+d366f1d5d3_939daf833f-r0/recipe-sysroot-native/etc/quiltrc push' exited with 0 Output: Applying patch 0023-chromium-Move-CharAllocator-definition-to-a-header-f.patch patching file chromium/cc/base/list_container_helper.cc Hunk #1 FAILED at 13. 1 out of 1 hunk FAILED -- rejects in file chromium/cc/base/list_container_helper.cc patching file chromium/cc/base/list_container_helper.h Hunk #1 FAILED at 8. Hunk #2 succeeded at 174 with fuzz 1. 1 out of 2 hunks FAILED -- rejects in file chromium/cc/base/list_container_helper.h Patch 0023-chromium-Move-CharAllocator-definition-to-a-header-f.patch does not apply (enforce with -f) ERROR: Logfile of failure stored in: /OE/build/oe-core/tmp-glibc/work/core2-64-oe-linux/qtwebengine/5.14.0+gitAUTOINC+d366f1d5d3_939daf833f-r0/temp/log.do_patch.21067 NOTE: recipe qtwebengine-5.14.0+gitAUTOINC+d366f1d5d3_939daf833f-r0: task do_patch: Failed ERROR: Task (/OE/build/oe-core/meta-qt5/recipes-qt/qt5/qtwebengine_git.bb:do_patch) failed with exit code '1' * build is still going (it will be a while on my slow builder) Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
* qtwebengine: Fix musl buildKhem Raj2019-11-201-0/+29
Currently, musl build fails to generate .pc ( packageconfig ) files because qmake has logic to detect glibc, which obviously will be failing for musl, and as a result it does not generate all needed files which then fails during do_install like below | sed: can't read /mnt/b/yoe/build/tmp/work/core2-32-yoe-linux-musl/qtwebengine/5.13.2+gitAUTOINC+556576b55f_843d70ac87-r0/image/usr/lib/pkgconfig/Qt5WebEngineCore.pc: No such file or directory Signed-off-by: Khem Raj <raj.khem@gmail.com>