From 7cf45cf69dc2013a13b4beb2d84370c2330e4441 Mon Sep 17 00:00:00 2001 From: Martin Jansa Date: Sun, 22 May 2022 08:48:38 +0200 Subject: qt5: upgrade to v5.15.4-lts-lgpl * update to new SRCREVs where available * https://code.qt.io/cgit/qt/qtreleasenotes.git/about/qt/5.15.4/release-note.md Signed-off-by: Martin Jansa --- recipes-qt/qt5/nativesdk-qtbase_git.bb | 2 +- recipes-qt/qt5/qt3d_git.bb | 2 +- recipes-qt/qt5/qtbase-native_git.bb | 2 +- recipes-qt/qt5/qtbase_git.bb | 2 +- recipes-qt/qt5/qtcharts_git.bb | 2 +- recipes-qt/qt5/qtconnectivity_git.bb | 2 +- recipes-qt/qt5/qtdatavis3d_git.bb | 2 +- recipes-qt/qt5/qtdeclarative_git.bb | 2 +- recipes-qt/qt5/qtgamepad_git.bb | 2 +- recipes-qt/qt5/qtgraphicaleffects_git.bb | 2 +- recipes-qt/qt5/qtimageformats_git.bb | 2 +- recipes-qt/qt5/qtlocation_git.bb | 2 +- recipes-qt/qt5/qtlottie_git.bb | 2 +- recipes-qt/qt5/qtmultimedia_git.bb | 2 +- recipes-qt/qt5/qtnetworkauth_git.bb | 2 +- recipes-qt/qt5/qtpurchasing_git.bb | 2 +- recipes-qt/qt5/qtquick3d_git.bb | 2 +- recipes-qt/qt5/qtquickcontrols2_git.bb | 2 +- recipes-qt/qt5/qtquickcontrols_git.bb | 2 +- recipes-qt/qt5/qtquicktimeline_git.bb | 2 +- recipes-qt/qt5/qtremoteobjects_git.bb | 2 +- recipes-qt/qt5/qtscxml_git.bb | 2 +- recipes-qt/qt5/qtsensors_git.bb | 2 +- recipes-qt/qt5/qtserialbus_git.bb | 2 +- recipes-qt/qt5/qtserialport_git.bb | 2 +- ...sed-doubles-to-float-representable-values.patch | 44 ---------------------- recipes-qt/qt5/qtsvg_git.bb | 4 +- recipes-qt/qt5/qttools_git.bb | 2 +- recipes-qt/qt5/qttranslations_git.bb | 2 +- recipes-qt/qt5/qtvirtualkeyboard_git.bb | 2 +- recipes-qt/qt5/qtwayland_git.bb | 2 +- recipes-qt/qt5/qtwebchannel_git.bb | 2 +- recipes-qt/qt5/qtwebglplugin_git.bb | 2 +- recipes-qt/qt5/qtwebsockets_git.bb | 2 +- recipes-qt/qt5/qtwebview_git.bb | 2 +- recipes-qt/qt5/qtx11extras_git.bb | 2 +- recipes-qt/qt5/qtxmlpatterns_git.bb | 2 +- 37 files changed, 36 insertions(+), 82 deletions(-) delete mode 100644 recipes-qt/qt5/qtsvg/0001-Clamp-parsed-doubles-to-float-representable-values.patch (limited to 'recipes-qt/qt5') diff --git a/recipes-qt/qt5/nativesdk-qtbase_git.bb b/recipes-qt/qt5/nativesdk-qtbase_git.bb index ecba833b..47341e71 100644 --- a/recipes-qt/qt5/nativesdk-qtbase_git.bb +++ b/recipes-qt/qt5/nativesdk-qtbase_git.bb @@ -201,4 +201,4 @@ fakeroot do_generate_qt_environment_file() { do_generate_qt_environment_file[umask] = "022" addtask generate_qt_environment_file after do_install before do_package -SRCREV = "c95f96550fc74b00bb0d3a82e7cb6b0e20bc76ac" +SRCREV = "fa9a234c10ad4499fd6b148cd4360be5a1d61ae9" diff --git a/recipes-qt/qt5/qt3d_git.bb b/recipes-qt/qt5/qt3d_git.bb index 20d435eb..da930dd4 100644 --- a/recipes-qt/qt5/qt3d_git.bb +++ b/recipes-qt/qt5/qt3d_git.bb @@ -38,6 +38,6 @@ do_configure:prepend() { ${S}/src/quick3d/imports/input/importsinput.pro } -SRCREV = "0559db47fefd7fb474cd795f94815e6e863234c8" +SRCREV = "92853c6e1aa95dfb7d605959ff44ccc124fbd62c" BBCLASSEXTEND += "native nativesdk" diff --git a/recipes-qt/qt5/qtbase-native_git.bb b/recipes-qt/qt5/qtbase-native_git.bb index b6181310..953bb7c7 100644 --- a/recipes-qt/qt5/qtbase-native_git.bb +++ b/recipes-qt/qt5/qtbase-native_git.bb @@ -145,4 +145,4 @@ do_install() { echo 'set(_qt5_corelib_extra_includes "${_qt5Core_install_prefix}/lib${QT_DIR_NAME}/mkspecs/linux-oe-g++")' > ${D}${libdir}/cmake/Qt5Core/Qt5CoreConfigExtrasMkspecDir.cmake } -SRCREV = "c95f96550fc74b00bb0d3a82e7cb6b0e20bc76ac" +SRCREV = "fa9a234c10ad4499fd6b148cd4360be5a1d61ae9" diff --git a/recipes-qt/qt5/qtbase_git.bb b/recipes-qt/qt5/qtbase_git.bb index b26c062c..783ca9ab 100644 --- a/recipes-qt/qt5/qtbase_git.bb +++ b/recipes-qt/qt5/qtbase_git.bb @@ -308,4 +308,4 @@ sed -i \ $D${OE_QMAKE_PATH_ARCHDATA}/mkspecs/qmodule.pri } -SRCREV = "c95f96550fc74b00bb0d3a82e7cb6b0e20bc76ac" +SRCREV = "fa9a234c10ad4499fd6b148cd4360be5a1d61ae9" diff --git a/recipes-qt/qt5/qtcharts_git.bb b/recipes-qt/qt5/qtcharts_git.bb index 42b8eaa5..4f5d34d2 100644 --- a/recipes-qt/qt5/qtcharts_git.bb +++ b/recipes-qt/qt5/qtcharts_git.bb @@ -8,7 +8,7 @@ LIC_FILES_CHKSUM = " \ DEPENDS += "qtbase qtdeclarative qtmultimedia" -SRCREV = "db9fba7299d904385e25db40c677cc6201d31df0" +SRCREV = "464eeabb4045f6372be3c0425f2c6f9c4d24f54e" # The same issue as in qtbase: # http://errors.yoctoproject.org/Errors/Details/152641/ diff --git a/recipes-qt/qt5/qtconnectivity_git.bb b/recipes-qt/qt5/qtconnectivity_git.bb index 2bcfa398..4d79dbb8 100644 --- a/recipes-qt/qt5/qtconnectivity_git.bb +++ b/recipes-qt/qt5/qtconnectivity_git.bb @@ -19,4 +19,4 @@ PACKAGECONFIG[bluez] = "-feature-bluez,-no-feature-bluez,bluez5" EXTRA_QMAKEVARS_CONFIGURE += "${PACKAGECONFIG_CONFARGS}" -SRCREV = "cb2e0b59c46bfe234b1d43f2fd31f53199f0252c" +SRCREV = "c22a7b05342fc6bba710f9f259cb56f84885b886" diff --git a/recipes-qt/qt5/qtdatavis3d_git.bb b/recipes-qt/qt5/qtdatavis3d_git.bb index 86b18a33..e81473b8 100644 --- a/recipes-qt/qt5/qtdatavis3d_git.bb +++ b/recipes-qt/qt5/qtdatavis3d_git.bb @@ -8,4 +8,4 @@ LIC_FILES_CHKSUM = " \ DEPENDS += "qtbase qtdeclarative qtmultimedia qtxmlpatterns" -SRCREV = "b83f9933f1fa01eb84d04476f809c588f4d49caa" +SRCREV = "3787f647cba0379594157fd771b3d0713a0e88ff" diff --git a/recipes-qt/qt5/qtdeclarative_git.bb b/recipes-qt/qt5/qtdeclarative_git.bb index 34708905..f26571a9 100644 --- a/recipes-qt/qt5/qtdeclarative_git.bb +++ b/recipes-qt/qt5/qtdeclarative_git.bb @@ -55,6 +55,6 @@ do_install:append:class-nativesdk() { rm -rf ${D}${OE_QMAKE_PATH_QML} } -SRCREV = "32b37e20f7d0aebb9f4138229939dd756d4c05ec" +SRCREV = "eca023e1eb19c6d968701595e99f648efcd1c0c7" BBCLASSEXTEND =+ "native nativesdk" diff --git a/recipes-qt/qt5/qtgamepad_git.bb b/recipes-qt/qt5/qtgamepad_git.bb index 86f4c163..62f957bc 100644 --- a/recipes-qt/qt5/qtgamepad_git.bb +++ b/recipes-qt/qt5/qtgamepad_git.bb @@ -16,4 +16,4 @@ PACKAGECONFIG[sdl2] = "-feature-sdl2,-no-feature-sdl2,libsdl2" EXTRA_QMAKEVARS_CONFIGURE += "${PACKAGECONFIG_CONFARGS}" -SRCREV = "549f7a5482f9a2856d6a1ef2434f9ca0b9713b9b" +SRCREV = "6e2c9fe95af305cf7469afd1887dcbc3cb67c1be" diff --git a/recipes-qt/qt5/qtgraphicaleffects_git.bb b/recipes-qt/qt5/qtgraphicaleffects_git.bb index df9e3c3b..fccb5dae 100644 --- a/recipes-qt/qt5/qtgraphicaleffects_git.bb +++ b/recipes-qt/qt5/qtgraphicaleffects_git.bb @@ -18,4 +18,4 @@ RDEPENDS:${PN}-dev = "" # http://errors.yoctoproject.org/Errors/Build/44912/ LDFLAGS:append:x86 = "${@bb.utils.contains('DISTRO_FEATURES', 'ld-is-gold', ' -fuse-ld=bfd ', '', d)}" -SRCREV = "2d4168e142c65411b9258ab48bb1164bd6aa011f" +SRCREV = "5b8120bddcc2b3835e726d3f7cf13810f4a9f130" diff --git a/recipes-qt/qt5/qtimageformats_git.bb b/recipes-qt/qt5/qtimageformats_git.bb index 790c3612..a71b63f7 100644 --- a/recipes-qt/qt5/qtimageformats_git.bb +++ b/recipes-qt/qt5/qtimageformats_git.bb @@ -25,4 +25,4 @@ PACKAGECONFIG[libwebp] = ",CONFIG+=done_config_libwebp,libwebp" EXTRA_QMAKEVARS_PRE += "${PACKAGECONFIG_CONFARGS}" -SRCREV = "3f5d4216e52351a76ba9deae18c7f022c0c8b163" +SRCREV = "a9857aa8d00178d6bf7b711a35705c2c7d1441f0" diff --git a/recipes-qt/qt5/qtlocation_git.bb b/recipes-qt/qt5/qtlocation_git.bb index c7172dad..f46dc27a 100644 --- a/recipes-qt/qt5/qtlocation_git.bb +++ b/recipes-qt/qt5/qtlocation_git.bb @@ -35,7 +35,7 @@ SRC_URI += " \ ${QT_GIT}/qtlocation-mapboxgl.git;name=qtlocation-mapboxgl;branch=${QT_MODULE_BRANCH_MAPBOXGL};protocol=${QT_GIT_PROTOCOL};destsuffix=git/src/3rdparty/mapbox-gl-native \ " -SRCREV_qtlocation = "9909253b0fbf825830a5947a883526ee54fe55af" +SRCREV_qtlocation = "8a1d08112386c165167bc5033d1a507d64110460" SRCREV_qtlocation-mapboxgl = "d3101bbc22edd41c9036ea487d4a71eabd97823d" SRCREV_FORMAT = "qtlocation_qtlocation-mapboxgl" diff --git a/recipes-qt/qt5/qtlottie_git.bb b/recipes-qt/qt5/qtlottie_git.bb index 3321d49a..46987ec2 100644 --- a/recipes-qt/qt5/qtlottie_git.bb +++ b/recipes-qt/qt5/qtlottie_git.bb @@ -9,4 +9,4 @@ LIC_FILES_CHKSUM = " \ DEPENDS += "qtbase qtdeclarative" -SRCREV = "74d5b59155788fff06efa12d3f2de671e2235b5d" +SRCREV = "77137af2aa5468adebfe13f13d87490cf684cffd" diff --git a/recipes-qt/qt5/qtmultimedia_git.bb b/recipes-qt/qt5/qtmultimedia_git.bb index 9c53d17e..ad55583b 100644 --- a/recipes-qt/qt5/qtmultimedia_git.bb +++ b/recipes-qt/qt5/qtmultimedia_git.bb @@ -40,7 +40,7 @@ SRC_URI += "\ # http://errors.yoctoproject.org/Errors/Build/44914/ LDFLAGS:append:x86 = "${@bb.utils.contains('DISTRO_FEATURES', 'ld-is-gold', ' -fuse-ld=bfd ', '', d)}" -SRCREV = "185f37e68e62548e83d16cad3a6cf8850faf4ee4" +SRCREV = "d07f4385c55e5abe36250c3d7f6b130a1bfb75dc" # Temporary work around for Qt5MultimediaConfig.cmake referencing non-existent videoeglvideonode directory do_install:append() { diff --git a/recipes-qt/qt5/qtnetworkauth_git.bb b/recipes-qt/qt5/qtnetworkauth_git.bb index 1710cb39..c20dddac 100644 --- a/recipes-qt/qt5/qtnetworkauth_git.bb +++ b/recipes-qt/qt5/qtnetworkauth_git.bb @@ -9,4 +9,4 @@ require qt5-git.inc DEPENDS += "qtbase" -SRCREV = "43c7f5204fe0a4cc1b3c9e7a34dea4559d2b28b1" +SRCREV = "291f9106a764086f720110895f104c5e9a069d6b" diff --git a/recipes-qt/qt5/qtpurchasing_git.bb b/recipes-qt/qt5/qtpurchasing_git.bb index 587b65de..ccc25fc8 100644 --- a/recipes-qt/qt5/qtpurchasing_git.bb +++ b/recipes-qt/qt5/qtpurchasing_git.bb @@ -10,4 +10,4 @@ LIC_FILES_CHKSUM = " \ DEPENDS += "qtbase qtdeclarative" -SRCREV = "557dece3865641befabd27ca724e2b6ae59b5a53" +SRCREV = "194024fb2944bbca40fcf072cf95644f5ca439cf" diff --git a/recipes-qt/qt5/qtquick3d_git.bb b/recipes-qt/qt5/qtquick3d_git.bb index 85b0c8c5..e3a8e140 100644 --- a/recipes-qt/qt5/qtquick3d_git.bb +++ b/recipes-qt/qt5/qtquick3d_git.bb @@ -21,7 +21,7 @@ FILES:${PN}-qmlplugins += " \ ${OE_QMAKE_PATH_QML}/QtQuick3D/Helpers/meshes/*.mesh \ " -SRCREV_qtquick3d = "9753b6eaf48ae39d528153f08dd9330813a91723" +SRCREV_qtquick3d = "7a8bdd666c8653f80cdee804e679783a461d5f43" SRCREV_assimp = "8f0c6b04b2257a520aaab38421b2e090204b69df" SRCREV_FORMAT = "qtquick3d_assimp" diff --git a/recipes-qt/qt5/qtquickcontrols2_git.bb b/recipes-qt/qt5/qtquickcontrols2_git.bb index 2c06b80d..c7592796 100644 --- a/recipes-qt/qt5/qtquickcontrols2_git.bb +++ b/recipes-qt/qt5/qtquickcontrols2_git.bb @@ -12,4 +12,4 @@ DEPENDS += "qtdeclarative qtdeclarative-native" SRC_URI += "file://0001-Revert-Get-the-scale-of-the-popup-item-when-setting-.patch" -SRCREV = "30cd2468bd94e908a8510e65f982c716f28db52b" +SRCREV = "83cbcc244ac1c1cf65c8b407e0fd905f9d3a41ac" diff --git a/recipes-qt/qt5/qtquickcontrols_git.bb b/recipes-qt/qt5/qtquickcontrols_git.bb index 535f46b9..b0e00e69 100644 --- a/recipes-qt/qt5/qtquickcontrols_git.bb +++ b/recipes-qt/qt5/qtquickcontrols_git.bb @@ -17,4 +17,4 @@ FILES:${PN}-qmlplugins += " \ ${OE_QMAKE_PATH_QML}/QtQuick/Dialogs/qml/icons.ttf \ " -SRCREV = "31b940bd0c696a01137a65f58573696a3fb5181b" +SRCREV = "3f0b75ac45c6377093ddec87a869bd1b8fa11857" diff --git a/recipes-qt/qt5/qtquicktimeline_git.bb b/recipes-qt/qt5/qtquicktimeline_git.bb index 91e57ac4..73cff70b 100644 --- a/recipes-qt/qt5/qtquicktimeline_git.bb +++ b/recipes-qt/qt5/qtquicktimeline_git.bb @@ -10,4 +10,4 @@ LIC_FILES_CHKSUM = " \ DEPENDS = "qtbase qtdeclarative" -SRCREV = "4f06d202d1b6f84b8de2dae4f69295172bb49446" +SRCREV = "06c4975d21c2b043213eb0412becbed240c9baf3" diff --git a/recipes-qt/qt5/qtremoteobjects_git.bb b/recipes-qt/qt5/qtremoteobjects_git.bb index cc108693..d02defc7 100644 --- a/recipes-qt/qt5/qtremoteobjects_git.bb +++ b/recipes-qt/qt5/qtremoteobjects_git.bb @@ -25,6 +25,6 @@ PACKAGECONFIG[tools-only] = "CONFIG+=tools-only" EXTRA_QMAKEVARS_PRE += "${PACKAGECONFIG_CONFARGS}" -SRCREV = "4cc0da8ae4d34d9bc89123cfe483a8931092fcaa" +SRCREV = "d0a3719da2797efd95d90043ad2ba4572a2a8533" BBCLASSEXTEND += "native nativesdk" diff --git a/recipes-qt/qt5/qtscxml_git.bb b/recipes-qt/qt5/qtscxml_git.bb index d4f47fb7..bf272371 100644 --- a/recipes-qt/qt5/qtscxml_git.bb +++ b/recipes-qt/qt5/qtscxml_git.bb @@ -10,7 +10,7 @@ require qt5-git.inc DEPENDS += "qtbase qtdeclarative qtxmlpatterns qtscxml-native" -SRCREV = "49f49bdb84e91c2fa799a29faf53d5ada97d1da8" +SRCREV = "53beea814535e3f27bb2c952856632fba545b1c3" # Patches from https://github.com/meta-qt5/qtscxml/commits/b5.15 # 5.15.meta-qt5.1 diff --git a/recipes-qt/qt5/qtsensors_git.bb b/recipes-qt/qt5/qtsensors_git.bb index 69bb0cc2..efaccf20 100644 --- a/recipes-qt/qt5/qtsensors_git.bb +++ b/recipes-qt/qt5/qtsensors_git.bb @@ -12,4 +12,4 @@ LIC_FILES_CHKSUM = " \ DEPENDS += "qtbase qtdeclarative" -SRCREV = "25a92014e7fa1bd9118379105cfb2dd6ca24c123" +SRCREV = "819dc6dc360b90889b6bf9cc961659803589b2df" diff --git a/recipes-qt/qt5/qtserialbus_git.bb b/recipes-qt/qt5/qtserialbus_git.bb index a2691f1b..cf02113b 100644 --- a/recipes-qt/qt5/qtserialbus_git.bb +++ b/recipes-qt/qt5/qtserialbus_git.bb @@ -11,4 +11,4 @@ LIC_FILES_CHKSUM = " \ DEPENDS += "qtbase qtserialport" -SRCREV = "792909313f7cc056d0538945500069876cd3c2ee" +SRCREV = "d3394c81f10e5d5c40663e88e185335549e4bc12" diff --git a/recipes-qt/qt5/qtserialport_git.bb b/recipes-qt/qt5/qtserialport_git.bb index a5ca3062..d79c8c50 100644 --- a/recipes-qt/qt5/qtserialport_git.bb +++ b/recipes-qt/qt5/qtserialport_git.bb @@ -12,4 +12,4 @@ LIC_FILES_CHKSUM = " \ DEPENDS += "qtbase" -SRCREV = "84ccf4dd454fadd15d20919be3c24fd519947e27" +SRCREV = "a90c9fc5ebce3f7d7120563c12103c605aeb8eea" diff --git a/recipes-qt/qt5/qtsvg/0001-Clamp-parsed-doubles-to-float-representable-values.patch b/recipes-qt/qt5/qtsvg/0001-Clamp-parsed-doubles-to-float-representable-values.patch deleted file mode 100644 index 1b96635c..00000000 --- a/recipes-qt/qt5/qtsvg/0001-Clamp-parsed-doubles-to-float-representable-values.patch +++ /dev/null @@ -1,44 +0,0 @@ -From 861999c07eca77807bb000939406d07bfec8e419 Mon Sep 17 00:00:00 2001 -From: Allan Sandfeld Jensen -Date: Thu, 4 Mar 2021 14:28:48 +0100 -Subject: [PATCH] Clamp parsed doubles to float representable values -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -Parts of our rendering assumes incoming doubles can still be sane -floats. - -Pick-to: 6.1 6.0 5.15 5.12 -Fixes: QTBUG-91507 -Change-Id: I7086a121e1b5ed47695a1251ea90e774dd8f148d -Reviewed-by: Robert Löhning -Reviewed-by: Allan Sandfeld Jensen -Reviewed-by: Mårten Nordheim ---- - src/svg/qsvghandler.cpp | 5 ++++- - 1 file changed, 4 insertions(+), 1 deletion(-) - -diff --git a/src/svg/qsvghandler.cpp b/src/svg/qsvghandler.cpp -index b3d9aaf..9dac05c 100644 ---- a/src/svg/qsvghandler.cpp -+++ b/src/svg/qsvghandler.cpp -@@ -673,7 +673,8 @@ static qreal toDouble(const QChar *&str) - val = -val; - } else { - val = QByteArray::fromRawData(temp, pos).toDouble(); -- if (qFpClassify(val) != FP_NORMAL) -+ // Do not tolerate values too wild to be represented normally by floats -+ if (qFpClassify(float(val)) != FP_NORMAL) - val = 0; - } - return val; -@@ -3046,6 +3047,8 @@ static QSvgStyleProperty *createRadialGradientNode(QSvgNode *node, - ncy = toDouble(cy); - if (!r.isEmpty()) - nr = toDouble(r); -+ if (nr < 0.5) -+ nr = 0.5; - - qreal nfx = ncx; - if (!fx.isEmpty()) diff --git a/recipes-qt/qt5/qtsvg_git.bb b/recipes-qt/qt5/qtsvg_git.bb index 47a17636..e3ab978d 100644 --- a/recipes-qt/qt5/qtsvg_git.bb +++ b/recipes-qt/qt5/qtsvg_git.bb @@ -12,6 +12,4 @@ LIC_FILES_CHKSUM = " \ DEPENDS += "qtbase" -SRC_URI:append = " file://0001-Clamp-parsed-doubles-to-float-representable-values.patch" - -SRCREV = "da19a7140dfd23a42792274ca4f497f20ffd29f4" +SRCREV = "b13c2d7fe8810af13a3f9400ecff4ff7c4c7ab51" diff --git a/recipes-qt/qt5/qttools_git.bb b/recipes-qt/qt5/qttools_git.bb index 49481067..1be3db16 100644 --- a/recipes-qt/qt5/qttools_git.bb +++ b/recipes-qt/qt5/qttools_git.bb @@ -39,7 +39,7 @@ EXTRA_QMAKEVARS_PRE += " \ ${@bb.utils.contains('PACKAGECONFIG', 'qtwebkit', '', 'CONFIG+=noqtwebkit', d)} \ ${@bb.utils.contains('PACKAGECONFIG', 'clang', 'CONFIG+=disable_external_rpath CONFIG+=assistant', 'CONFIG+=noqdoc', d)} \ " -SRCREV = "d488fd08333d53636880c9b2198ef38ef17cf56c" +SRCREV = "7e2102f2ebb2b42e9249bab3327f939204053100" BBCLASSEXTEND = "native nativesdk" diff --git a/recipes-qt/qt5/qttranslations_git.bb b/recipes-qt/qt5/qttranslations_git.bb index 8d919897..6ef215d7 100644 --- a/recipes-qt/qt5/qttranslations_git.bb +++ b/recipes-qt/qt5/qttranslations_git.bb @@ -98,4 +98,4 @@ FILES:${PN}-qthelp = " \ ${OE_QMAKE_PATH_TRANSLATIONS}/qt_help_*.qm \ " -SRCREV = "726e47301f7e0e0a85534e7686f00521de15f1f6" +SRCREV = "8f0756f2c29cc7bb7e9a016612f15779193109ad" diff --git a/recipes-qt/qt5/qtvirtualkeyboard_git.bb b/recipes-qt/qt5/qtvirtualkeyboard_git.bb index 6a48d426..f90e4ad4 100644 --- a/recipes-qt/qt5/qtvirtualkeyboard_git.bb +++ b/recipes-qt/qt5/qtvirtualkeyboard_git.bb @@ -71,4 +71,4 @@ FILES:${PN} += "${OE_QMAKE_PATH_DATA}/qtvirtualkeyboard/lipi_toolkit" DEPENDS += "qtbase qtdeclarative qtmultimedia qtquickcontrols qtsvg qtxmlpatterns qtdeclarative-native" -SRCREV = "5ab286d42421f387d8f2d23b33225ec2469958d7" +SRCREV = "436e9407c5dd2e2aa26d7c277f0f0e614d73b8cc" diff --git a/recipes-qt/qt5/qtwayland_git.bb b/recipes-qt/qt5/qtwayland_git.bb index 4e698318..fc8305a0 100644 --- a/recipes-qt/qt5/qtwayland_git.bb +++ b/recipes-qt/qt5/qtwayland_git.bb @@ -48,7 +48,7 @@ PACKAGECONFIG[wayland-vulkan-server-buffer] = "-feature-wayland-vulkan-server-bu EXTRA_QMAKEVARS_CONFIGURE += "${PACKAGECONFIG_CONFARGS}" -SRCREV = "f9dfeb6e7236711cba303858005693d40e90be90" +SRCREV = "f1e6c8764d187e9c1c642f6b11020ea513822cd1" BBCLASSEXTEND =+ "native nativesdk" diff --git a/recipes-qt/qt5/qtwebchannel_git.bb b/recipes-qt/qt5/qtwebchannel_git.bb index 63294755..454d27ef 100644 --- a/recipes-qt/qt5/qtwebchannel_git.bb +++ b/recipes-qt/qt5/qtwebchannel_git.bb @@ -12,4 +12,4 @@ LIC_FILES_CHKSUM = " \ DEPENDS += "qtdeclarative qtwebsockets" -SRCREV = "30faac50ff3feb0def83a84126d4c0725fdb5953" +SRCREV = "fe29fe07daf7e43fcd6f5fd135b8567d83260fb4" diff --git a/recipes-qt/qt5/qtwebglplugin_git.bb b/recipes-qt/qt5/qtwebglplugin_git.bb index fb46c194..ab1001f6 100644 --- a/recipes-qt/qt5/qtwebglplugin_git.bb +++ b/recipes-qt/qt5/qtwebglplugin_git.bb @@ -18,4 +18,4 @@ do_configure:prepend() { EXTRA_QMAKEVARS_PRE += "${@bb.utils.contains('PACKAGECONFIG', 'qtdeclarative', 'CONFIG+=OE_QTDECLARATIVE_ENABLED', '', d)}" -SRCREV = "4eb3929a15d42efd855d8af3fec1abebc79634c5" +SRCREV = "37f4fdd9aa3315467a6c893059a9ef7270fc2388" diff --git a/recipes-qt/qt5/qtwebsockets_git.bb b/recipes-qt/qt5/qtwebsockets_git.bb index 7ffb8ff9..22792a9b 100644 --- a/recipes-qt/qt5/qtwebsockets_git.bb +++ b/recipes-qt/qt5/qtwebsockets_git.bb @@ -11,4 +11,4 @@ LIC_FILES_CHKSUM = " \ DEPENDS += "qtbase qtdeclarative" -SRCREV = "428f9cb79dc3b649122c63e763a213afb2d9e60f" +SRCREV = "d57f4a2226153848bd2fd0ee6d10f5146b1e8554" diff --git a/recipes-qt/qt5/qtwebview_git.bb b/recipes-qt/qt5/qtwebview_git.bb index da7f9476..08b0218e 100644 --- a/recipes-qt/qt5/qtwebview_git.bb +++ b/recipes-qt/qt5/qtwebview_git.bb @@ -23,4 +23,4 @@ python() { if 'meta-python2' not in d.getVar('BBFILE_COLLECTIONS').split(): raise bb.parse.SkipRecipe('Requires meta-python2 to be present.') } -SRCREV = "00745be5c1d9c6cbe62cfdf4172c3720155a5c43" +SRCREV = "d7f28171b291e6a3d660b847b40cac3c55295471" diff --git a/recipes-qt/qt5/qtx11extras_git.bb b/recipes-qt/qt5/qtx11extras_git.bb index ca4cdf33..54a65ba4 100644 --- a/recipes-qt/qt5/qtx11extras_git.bb +++ b/recipes-qt/qt5/qtx11extras_git.bb @@ -12,4 +12,4 @@ LIC_FILES_CHKSUM = " \ DEPENDS += "qtbase" -SRCREV = "e2146e32f300c854a669dd7e4e05b8606a4e62bf" +SRCREV = "069b45405667c30fa746541d5e3cb328163cfd15" diff --git a/recipes-qt/qt5/qtxmlpatterns_git.bb b/recipes-qt/qt5/qtxmlpatterns_git.bb index 2c25fac6..5e2245c0 100644 --- a/recipes-qt/qt5/qtxmlpatterns_git.bb +++ b/recipes-qt/qt5/qtxmlpatterns_git.bb @@ -25,6 +25,6 @@ do_configure:prepend() { EXTRA_QMAKEVARS_PRE += "${@bb.utils.contains('PACKAGECONFIG', 'qtdeclarative', 'CONFIG+=OE_QTDECLARATIVE_ENABLED', '', d)}" -SRCREV = "4d471ba94cfee1e27efe011ed0c2d4313136412c" +SRCREV = "82a7136a7caece13767c3b2808b2aad9d3d79dd3" BBCLASSEXTEND =+ "native nativesdk" -- cgit v1.2.3 From c432d1488baa5a45079bff65e14e6f6c20d86bed Mon Sep 17 00:00:00 2001 From: Martin Jansa Date: Tue, 24 May 2022 12:02:40 +0200 Subject: qt5-git: bump PV to 5.15.4 * I forgot to do that in previous commit --- recipes-qt/qt5/qt5-git.inc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'recipes-qt/qt5') diff --git a/recipes-qt/qt5/qt5-git.inc b/recipes-qt/qt5/qt5-git.inc index 9e87b8fb..d8d60217 100644 --- a/recipes-qt/qt5/qt5-git.inc +++ b/recipes-qt/qt5/qt5-git.inc @@ -1,5 +1,5 @@ # Copyright (C) 2012-2016 O.S. Systems Software LTDA. -# Copyright (C) 2013-2020 Martin Jansa +# Copyright (C) 2013-2022 Martin Jansa QT_MODULE ?= "${BPN}" QT_MODULE_BRANCH ?= "5.15" @@ -14,4 +14,4 @@ CVE_PRODUCT = "qt" S = "${WORKDIR}/git" -PV = "5.15.3+git${SRCPV}" +PV = "5.15.4+git${SRCPV}" -- cgit v1.2.3 From 918021201021ed95b73eec700a6384d2e93bf942 Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Tue, 24 May 2022 13:57:28 -0700 Subject: qtwayland: Include locale.h for LC_CTYPE define Signed-off-by: Khem Raj Signed-off-by: Martin Jansa --- ...utcontext-Include-missing-header-locale.h.patch | 36 ++++++++++++++++++++++ recipes-qt/qt5/qtwayland_git.bb | 1 + 2 files changed, 37 insertions(+) create mode 100644 recipes-qt/qt5/qtwayland/0001-qwaylandinputcontext-Include-missing-header-locale.h.patch (limited to 'recipes-qt/qt5') diff --git a/recipes-qt/qt5/qtwayland/0001-qwaylandinputcontext-Include-missing-header-locale.h.patch b/recipes-qt/qt5/qtwayland/0001-qwaylandinputcontext-Include-missing-header-locale.h.patch new file mode 100644 index 00000000..9d11c423 --- /dev/null +++ b/recipes-qt/qt5/qtwayland/0001-qwaylandinputcontext-Include-missing-header-locale.h.patch @@ -0,0 +1,36 @@ +From 99f9a859b860b98880859bda847a341f460b9637 Mon Sep 17 00:00:00 2001 +From: Khem Raj +Date: Tue, 24 May 2022 13:54:17 -0700 +Subject: [PATCH] qwaylandinputcontext: Include missing header locale.h for + LC_CTYPE + +This issue is unraveled with musl, but is a general problem + +Fixes +/mnt/b/yoe/master/build/tmp/work/cortexa72-yoe-linux-musl/qtwayland/5.15.4+gitAUTOINC+f1e6c8764d-r0/git/src/client/qwaylandinputcontext.cpp:584:36: error: use of undeclared identifier 'LC_CTYPE' + const char *locale = setlocale(LC_CTYPE, ""); + ^ +/mnt/b/yoe/master/build/tmp/work/cortexa72-yoe-linux-musl/qtwayland/5.15.4+gitAUTOINC+f1e6c8764d-r0/git/src/client/qwaylandinputcontext.cpp:586:28: error: use of undeclared identifier 'LC_CTYPE' + locale = setlocale(LC_CTYPE, nullptr); + ^ +Upstream-Status: Pending +Signed-off-by: Khem Raj +--- + src/client/qwaylandinputcontext.cpp | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/src/client/qwaylandinputcontext.cpp b/src/client/qwaylandinputcontext.cpp +index ef5aa375..d8e55357 100644 +--- a/src/client/qwaylandinputcontext.cpp ++++ b/src/client/qwaylandinputcontext.cpp +@@ -37,6 +37,7 @@ + ** + ****************************************************************************/ + ++#include + + #include "qwaylandinputcontext_p.h" + +-- +2.36.1 + diff --git a/recipes-qt/qt5/qtwayland_git.bb b/recipes-qt/qt5/qtwayland_git.bb index fc8305a0..d2a44621 100644 --- a/recipes-qt/qt5/qtwayland_git.bb +++ b/recipes-qt/qt5/qtwayland_git.bb @@ -20,6 +20,7 @@ LIC_FILES_CHKSUM = " \ SRC_URI += "file://0001-tst_seatv4-Include-array.patch \ file://0001-linux-dmabuf-unstable-v1-Include-missing-array-heade.patch \ file://0001-Fix-vulkan-buffer-formats-for-GLES2.patch \ + file://0001-qwaylandinputcontext-Include-missing-header-locale.h.patch \ " PACKAGECONFIG ?= " \ -- cgit v1.2.3 From 213e62ec7e3dd978adf7072397c65e43b38abd89 Mon Sep 17 00:00:00 2001 From: Martin Jansa Date: Tue, 14 Jun 2022 10:18:47 +0200 Subject: qtwebengine: upgrade to v5.15.10-lts * keep the MODULE_VERSION on 5.15.4 to match the rest of the publicly available 5.15 modules Signed-off-by: Martin Jansa --- .../0001-Force-host-toolchain-configuration.patch | 6 ++-- ...qmake.conf-lower-MODULE_VERSION-to-5.15.2.patch | 34 ---------------------- ...qmake.conf-lower-MODULE_VERSION-to-5.15.4.patch | 34 ++++++++++++++++++++++ ...use-pvalloc-as-it-s-not-available-on-musl.patch | 2 +- .../0004-musl-link-against-libexecinfo.patch | 6 ++-- ...0005-mkspecs-Allow-builds-with-libc-glibc.patch | 6 ++-- ...um-workaround-for-too-long-.rps-file-name.patch | 2 +- .../0002-chromium-fix-build-with-clang.patch | 18 ++++++------ ...0003-chromium-Exclude-CRC32-for-32bit-arm.patch | 2 +- ...-Do-not-try-to-set-the-guessed-values-for.patch | 6 ++-- ...um-fix-build-after-y2038-changes-in-glibc.patch | 2 +- ...x-build-on-32bit-arches-with-64bit-time_t.patch | 2 +- ...ium-Include-cstddef-for-size_t-definition.patch | 2 +- ...ve-CharAllocator-definition-to-a-header-f.patch | 2 +- ...09-chromium-Link-v8-with-libatomic-on-x86.patch | 2 +- ...omium-icu-use-system-library-only-targets.patch | 2 +- ...mium-Remove-TRUE-to-prep-landing-of-icu68.patch | 12 ++++---- .../0012-chromium-skia-Fix-build-with-gcc-12.patch | 2 +- ...sl-sandbox-Define-TEMP_FAILURE_RETRY-if-n.patch | 2 +- ...sl-Avoid-mallinfo-APIs-on-non-glibc-linux.patch | 2 +- ...-chromium-musl-include-fcntl.h-for-loff_t.patch | 2 +- ...sl-use-off64_t-instead-of-the-internal-__.patch | 2 +- ...ium-musl-linux-glibc-make-the-distinction.patch | 2 +- ...sl-Define-res_ninit-and-res_nclose-for-no.patch | 2 +- ...hromium-musl-Do-not-define-__sbrk-on-musl.patch | 2 +- ...um-musl-Adjust-default-pthread-stack-size.patch | 2 +- ...sl-elf_reader.cc-include-sys-reg.h-to-get.patch | 2 +- .../chromium/0022-chromium-musl-pread-pwrite.patch | 2 +- ...sl-initialize-msghdr-in-a-compatible-mann.patch | 2 +- recipes-qt/qt5/qtwebengine_git.bb | 18 ++++++------ 30 files changed, 91 insertions(+), 91 deletions(-) delete mode 100644 recipes-qt/qt5/qtwebengine/0002-qmake.conf-lower-MODULE_VERSION-to-5.15.2.patch create mode 100644 recipes-qt/qt5/qtwebengine/0002-qmake.conf-lower-MODULE_VERSION-to-5.15.4.patch (limited to 'recipes-qt/qt5') 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 556148d9..c6d7a0f5 100644 --- a/recipes-qt/qt5/qtwebengine/0001-Force-host-toolchain-configuration.patch +++ b/recipes-qt/qt5/qtwebengine/0001-Force-host-toolchain-configuration.patch @@ -1,4 +1,4 @@ -From 7a41b9ef89f18b26abf6355f5193d90a38147955 Mon Sep 17 00:00:00 2001 +From 02ebd5b50c208f913213c3da32ed820fa420d8fe Mon Sep 17 00:00:00 2001 From: Samuli Piippo Date: Wed, 15 Mar 2017 13:53:28 +0200 Subject: [PATCH] Force host toolchain configuration @@ -71,7 +71,7 @@ index dd0d3e327..6312c8678 100644 " nm = \"$$which(nm)\" " \ " toolchain_args = { " \ diff --git a/src/buildtools/gn.pro b/src/buildtools/gn.pro -index 033202e6e..a8ca6567b 100644 +index f94694da0..5094574ed 100644 --- a/src/buildtools/gn.pro +++ b/src/buildtools/gn.pro @@ -19,8 +19,8 @@ build_pass|!debug_and_release { @@ -82,6 +82,6 @@ index 033202e6e..a8ca6567b 100644 - --ld \"$$which($$QMAKE_LINK)\" + --cc \"$$which($$CC_host)\" --cxx \"$$which($$CXX_host)\" \ + --ld \"$$which($$CXX_host)\" --ar \"$$which(ar)\" + !isEmpty(QMAKE_AR): gn_gen_args += --ar \"$$which($$first(QMAKE_AR))\" msvc:!clang_cl: gn_gen_args += --use-lto - diff --git a/recipes-qt/qt5/qtwebengine/0002-qmake.conf-lower-MODULE_VERSION-to-5.15.2.patch b/recipes-qt/qt5/qtwebengine/0002-qmake.conf-lower-MODULE_VERSION-to-5.15.2.patch deleted file mode 100644 index 9ddebc2b..00000000 --- a/recipes-qt/qt5/qtwebengine/0002-qmake.conf-lower-MODULE_VERSION-to-5.15.2.patch +++ /dev/null @@ -1,34 +0,0 @@ -From a5b9a5016d985cba60fdcb99bff498b0a2573f2d Mon Sep 17 00:00:00 2001 -From: Martin Jansa -Date: Fri, 12 Mar 2021 15:47:50 +0100 -Subject: [PATCH] qmake.conf: lower MODULE_VERSION to 5.15.2 - -* to avoid incompatibility when searching for qtwebchannel: - -CMake Error at /OE/build/luneos-hardknott/webos-ports/tmp-glibc/work/core2-64-webos-linux/org.webosports.app.browser/0.5.0-14+gitAUTOINC+4b5398142b-r0/recipe-sysroot/usr/lib/cmake/Qt5WebEngineCore/Qt5WebEngineCoreConfig.cmake:116 (find_package): - Could not find a configuration file for package "Qt5WebChannel" that is - compatible with requested version "5.15.4". - - The following configuration files were considered but not accepted: - - /OE/build/luneos-hardknott/webos-ports/tmp-glibc/work/core2-64-webos-linux/org.webosports.app.browser/0.5.0-14+gitAUTOINC+4b5398142b-r0/recipe-sysroot/usr/lib/cmake/Qt5WebChannel/Qt5WebChannelConfig.cmake, version: 5.15.2 - -Call Stack (most recent call first): - /OE/build/luneos-hardknott/webos-ports/tmp-glibc/work/core2-64-webos-linux/org.webosports.app.browser/0.5.0-14+gitAUTOINC+4b5398142b-r0/recipe-sysroot/usr/lib/cmake/Qt5WebEngine/Qt5WebEngineConfig.cmake:116 (find_package) - CMakeLists.txt:19 (find_package) - -Signed-off-by: Martin Jansa ---- - .qmake.conf | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/.qmake.conf b/.qmake.conf -index 1d0279c42..8de72145c 100644 ---- a/.qmake.conf -+++ b/.qmake.conf -@@ -5,4 +5,4 @@ QTWEBENGINE_OUT_ROOT = $$shadowed($$PWD) - load(qt_build_config) - CONFIG += warning_clean - --MODULE_VERSION = 5.15.9 -+MODULE_VERSION = 5.15.2 diff --git a/recipes-qt/qt5/qtwebengine/0002-qmake.conf-lower-MODULE_VERSION-to-5.15.4.patch b/recipes-qt/qt5/qtwebengine/0002-qmake.conf-lower-MODULE_VERSION-to-5.15.4.patch new file mode 100644 index 00000000..71e0eb67 --- /dev/null +++ b/recipes-qt/qt5/qtwebengine/0002-qmake.conf-lower-MODULE_VERSION-to-5.15.4.patch @@ -0,0 +1,34 @@ +From f080d8b761542c942a3ab33a3895c9af7a0ee02a Mon Sep 17 00:00:00 2001 +From: Martin Jansa +Date: Fri, 12 Mar 2021 15:47:50 +0100 +Subject: [PATCH] qmake.conf: lower MODULE_VERSION to 5.15.4 + +* to avoid incompatibility when searching for qtwebchannel: + +CMake Error at /OE/build/luneos-hardknott/webos-ports/tmp-glibc/work/core2-64-webos-linux/org.webosports.app.browser/0.5.0-14+gitAUTOINC+4b5398142b-r0/recipe-sysroot/usr/lib/cmake/Qt5WebEngineCore/Qt5WebEngineCoreConfig.cmake:116 (find_package): + Could not find a configuration file for package "Qt5WebChannel" that is + compatible with requested version "5.15.4". + + The following configuration files were considered but not accepted: + + /OE/build/luneos-hardknott/webos-ports/tmp-glibc/work/core2-64-webos-linux/org.webosports.app.browser/0.5.0-14+gitAUTOINC+4b5398142b-r0/recipe-sysroot/usr/lib/cmake/Qt5WebChannel/Qt5WebChannelConfig.cmake, version: 5.15.2 + +Call Stack (most recent call first): + /OE/build/luneos-hardknott/webos-ports/tmp-glibc/work/core2-64-webos-linux/org.webosports.app.browser/0.5.0-14+gitAUTOINC+4b5398142b-r0/recipe-sysroot/usr/lib/cmake/Qt5WebEngine/Qt5WebEngineConfig.cmake:116 (find_package) + CMakeLists.txt:19 (find_package) + +Signed-off-by: Martin Jansa +--- + .qmake.conf | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/.qmake.conf b/.qmake.conf +index 83823ceee..d5e64505d 100644 +--- a/.qmake.conf ++++ b/.qmake.conf +@@ -5,4 +5,4 @@ QTWEBENGINE_OUT_ROOT = $$shadowed($$PWD) + load(qt_build_config) + CONFIG += warning_clean + +-MODULE_VERSION = 5.15.10 ++MODULE_VERSION = 5.15.4 diff --git a/recipes-qt/qt5/qtwebengine/0003-musl-don-t-use-pvalloc-as-it-s-not-available-on-musl.patch b/recipes-qt/qt5/qtwebengine/0003-musl-don-t-use-pvalloc-as-it-s-not-available-on-musl.patch index 11a2ab50..1d6fc361 100644 --- a/recipes-qt/qt5/qtwebengine/0003-musl-don-t-use-pvalloc-as-it-s-not-available-on-musl.patch +++ b/recipes-qt/qt5/qtwebengine/0003-musl-don-t-use-pvalloc-as-it-s-not-available-on-musl.patch @@ -1,4 +1,4 @@ -From 3a29b3cfd7592518227d72a5b165a4652292a202 Mon Sep 17 00:00:00 2001 +From fda9bebb5f3a0483ac6188c144ae5a135c6baa41 Mon Sep 17 00:00:00 2001 From: Samuli Piippo Date: Tue, 12 Dec 2017 16:06:14 +0200 Subject: [PATCH] musl: don't use pvalloc as it's not available on musl diff --git a/recipes-qt/qt5/qtwebengine/0004-musl-link-against-libexecinfo.patch b/recipes-qt/qt5/qtwebengine/0004-musl-link-against-libexecinfo.patch index 61c6ebf3..a5e66d23 100644 --- a/recipes-qt/qt5/qtwebengine/0004-musl-link-against-libexecinfo.patch +++ b/recipes-qt/qt5/qtwebengine/0004-musl-link-against-libexecinfo.patch @@ -1,4 +1,4 @@ -From 8acd353be20f852e869cdbf8ee58622d31e2040a Mon Sep 17 00:00:00 2001 +From d0170d2466659ce467075313cb08dc72268b0d0b Mon Sep 17 00:00:00 2001 From: Samuli Piippo Date: Thu, 14 Dec 2017 11:28:10 +0200 Subject: [PATCH] musl: link against libexecinfo @@ -10,10 +10,10 @@ Signed-off-by: Samuli Piippo 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/core/core_module.pro b/src/core/core_module.pro -index 520b452f7..d2b29b298 100644 +index 9e087c815..7f518e020 100644 --- a/src/core/core_module.pro +++ b/src/core/core_module.pro -@@ -5,7 +5,7 @@ include($${QTWEBENGINE_ROOT}/src/buildtools/config/linking.pri) +@@ -9,7 +9,7 @@ isUniversal() { api_library_name = qtwebenginecoreapi$$qtPlatformTargetSuffix() api_library_path = $$OUT_PWD/api/$$getConfigDir() diff --git a/recipes-qt/qt5/qtwebengine/0005-mkspecs-Allow-builds-with-libc-glibc.patch b/recipes-qt/qt5/qtwebengine/0005-mkspecs-Allow-builds-with-libc-glibc.patch index 0a566ad7..a233d0a9 100644 --- a/recipes-qt/qt5/qtwebengine/0005-mkspecs-Allow-builds-with-libc-glibc.patch +++ b/recipes-qt/qt5/qtwebengine/0005-mkspecs-Allow-builds-with-libc-glibc.patch @@ -1,4 +1,4 @@ -From 5c95e9d289bdc069ed289a59ed3ac0c0b4f667f8 Mon Sep 17 00:00:00 2001 +From 841a332c97a579db001deb07191349263138013f Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Tue, 12 Nov 2019 19:53:59 -0800 Subject: [PATCH] mkspecs: Allow builds with libc != glibc @@ -10,10 +10,10 @@ Signed-off-by: Khem Raj 2 files changed, 1 insertion(+), 7 deletions(-) diff --git a/src/buildtools/config/support.pri b/src/buildtools/config/support.pri -index 7a07b1b5b..ba6e8e3c9 100644 +index e7f869a15..f9c9c24bf 100644 --- a/src/buildtools/config/support.pri +++ b/src/buildtools/config/support.pri -@@ -195,10 +195,6 @@ defineTest(qtwebengine_checkForHostPkgCfg) { +@@ -191,10 +191,6 @@ defineTest(qtwebengine_checkForHostPkgCfg) { defineTest(qtwebengine_checkForGlibc) { module = $$1 diff --git a/recipes-qt/qt5/qtwebengine/chromium/0001-chromium-workaround-for-too-long-.rps-file-name.patch b/recipes-qt/qt5/qtwebengine/chromium/0001-chromium-workaround-for-too-long-.rps-file-name.patch index d4ccf8f0..d4a355c7 100644 --- a/recipes-qt/qt5/qtwebengine/chromium/0001-chromium-workaround-for-too-long-.rps-file-name.patch +++ b/recipes-qt/qt5/qtwebengine/chromium/0001-chromium-workaround-for-too-long-.rps-file-name.patch @@ -1,4 +1,4 @@ -From 4d04aeec1a8520d5c4bcd5f49f064ea93705d7c4 Mon Sep 17 00:00:00 2001 +From 8eec6045850c5786b18f89b4444c5e2c68b64a31 Mon Sep 17 00:00:00 2001 From: Samuli Piippo Date: Thu, 30 Mar 2017 11:37:24 +0300 Subject: [PATCH] chromium: workaround for too long .rps file name diff --git a/recipes-qt/qt5/qtwebengine/chromium/0002-chromium-fix-build-with-clang.patch b/recipes-qt/qt5/qtwebengine/chromium/0002-chromium-fix-build-with-clang.patch index d8b7624e..e232dbe2 100644 --- a/recipes-qt/qt5/qtwebengine/chromium/0002-chromium-fix-build-with-clang.patch +++ b/recipes-qt/qt5/qtwebengine/chromium/0002-chromium-fix-build-with-clang.patch @@ -1,4 +1,4 @@ -From dec7becd72c1b035a98a86b5915578ca1ff919b4 Mon Sep 17 00:00:00 2001 +From a88d4dfdb0f9d27a0acc8f28167fbb09d913fd75 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 @@ -10,10 +10,10 @@ Signed-off-by: Khem Raj 1 file changed, 2 insertions(+), 25 deletions(-) diff --git a/chromium/build/config/compiler/BUILD.gn b/chromium/build/config/compiler/BUILD.gn -index 6a58d21cf07..c007eab8ec9 100644 +index b511a58c5a8..b628042bc21 100644 --- a/chromium/build/config/compiler/BUILD.gn +++ b/chromium/build/config/compiler/BUILD.gn -@@ -782,8 +782,6 @@ config("compiler_cpu_abi") { +@@ -783,8 +783,6 @@ config("compiler_cpu_abi") { } } else if (current_cpu == "arm") { if (is_clang && !is_android && !is_nacl) { @@ -22,7 +22,7 @@ index 6a58d21cf07..c007eab8ec9 100644 } if (!is_nacl) { cflags += [ -@@ -796,8 +794,6 @@ config("compiler_cpu_abi") { +@@ -797,8 +795,6 @@ config("compiler_cpu_abi") { } } else if (current_cpu == "arm64") { if (is_clang && !is_android && !is_nacl && !is_fuchsia) { @@ -31,7 +31,7 @@ index 6a58d21cf07..c007eab8ec9 100644 } } else if (current_cpu == "mipsel" && !is_nacl) { ldflags += [ "-Wl,--hash-style=sysv" ] -@@ -806,9 +802,6 @@ config("compiler_cpu_abi") { +@@ -807,9 +803,6 @@ config("compiler_cpu_abi") { if (is_android) { cflags += [ "--target=mipsel-linux-android" ] ldflags += [ "--target=mipsel-linux-android" ] @@ -41,7 +41,7 @@ index 6a58d21cf07..c007eab8ec9 100644 } } else { cflags += [ "-EL" ] -@@ -887,10 +880,7 @@ config("compiler_cpu_abi") { +@@ -888,10 +881,7 @@ config("compiler_cpu_abi") { } else if (current_cpu == "mips" && !is_nacl) { ldflags += [ "-Wl,--hash-style=sysv" ] if (custom_toolchain == "") { @@ -53,7 +53,7 @@ index 6a58d21cf07..c007eab8ec9 100644 cflags += [ "-EB" ] ldflags += [ "-EB" ] } -@@ -937,9 +927,6 @@ config("compiler_cpu_abi") { +@@ -938,9 +928,6 @@ config("compiler_cpu_abi") { if (is_android) { cflags += [ "--target=mips64el-linux-android" ] ldflags += [ "--target=mips64el-linux-android" ] @@ -63,7 +63,7 @@ index 6a58d21cf07..c007eab8ec9 100644 } } else { cflags += [ -@@ -996,10 +983,7 @@ config("compiler_cpu_abi") { +@@ -997,10 +984,7 @@ config("compiler_cpu_abi") { } else if (current_cpu == "mips64") { ldflags += [ "-Wl,--hash-style=sysv" ] if (custom_toolchain == "") { @@ -75,7 +75,7 @@ index 6a58d21cf07..c007eab8ec9 100644 cflags += [ "-EB", "-mabi=64", -@@ -1166,13 +1150,6 @@ config("compiler_deterministic") { +@@ -1167,13 +1151,6 @@ config("compiler_deterministic") { } } } diff --git a/recipes-qt/qt5/qtwebengine/chromium/0003-chromium-Exclude-CRC32-for-32bit-arm.patch b/recipes-qt/qt5/qtwebengine/chromium/0003-chromium-Exclude-CRC32-for-32bit-arm.patch index 250ae1ec..8e14d145 100644 --- a/recipes-qt/qt5/qtwebengine/chromium/0003-chromium-Exclude-CRC32-for-32bit-arm.patch +++ b/recipes-qt/qt5/qtwebengine/chromium/0003-chromium-Exclude-CRC32-for-32bit-arm.patch @@ -1,4 +1,4 @@ -From 790063a65e3aa8a043409b2e32b7b46daf4a29f4 Mon Sep 17 00:00:00 2001 +From b2e7a10448d984eb62810ad5c41720d61599cecc 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 diff --git a/recipes-qt/qt5/qtwebengine/chromium/0004-chromium-Do-not-try-to-set-the-guessed-values-for.patch b/recipes-qt/qt5/qtwebengine/chromium/0004-chromium-Do-not-try-to-set-the-guessed-values-for.patch index 78c4645a..7e7fbed2 100644 --- a/recipes-qt/qt5/qtwebengine/chromium/0004-chromium-Do-not-try-to-set-the-guessed-values-for.patch +++ b/recipes-qt/qt5/qtwebengine/chromium/0004-chromium-Do-not-try-to-set-the-guessed-values-for.patch @@ -1,4 +1,4 @@ -From 5daeac1b655e9baa6d3dfe9d9b7af8acfa7b9b88 Mon Sep 17 00:00:00 2001 +From 6b188e734a8cfa68f5c14e46e90fc89cbcb8313c Mon Sep 17 00:00:00 2001 From: Johannes Pointner Date: Fri, 3 May 2019 09:12:38 +0200 Subject: [PATCH] chromium: Do not try to set the guessed values for @@ -20,10 +20,10 @@ Signed-off-by: Johannes Pointner 1 file changed, 9 deletions(-) diff --git a/chromium/build/config/compiler/BUILD.gn b/chromium/build/config/compiler/BUILD.gn -index c007eab8ec9..feb4340f522 100644 +index b628042bc21..0b9476b33af 100644 --- a/chromium/build/config/compiler/BUILD.gn +++ b/chromium/build/config/compiler/BUILD.gn -@@ -783,15 +783,6 @@ config("compiler_cpu_abi") { +@@ -784,15 +784,6 @@ config("compiler_cpu_abi") { } else if (current_cpu == "arm") { if (is_clang && !is_android && !is_nacl) { } diff --git a/recipes-qt/qt5/qtwebengine/chromium/0005-chromium-fix-build-after-y2038-changes-in-glibc.patch b/recipes-qt/qt5/qtwebengine/chromium/0005-chromium-fix-build-after-y2038-changes-in-glibc.patch index fb7b13a3..6170047f 100644 --- a/recipes-qt/qt5/qtwebengine/chromium/0005-chromium-fix-build-after-y2038-changes-in-glibc.patch +++ b/recipes-qt/qt5/qtwebengine/chromium/0005-chromium-fix-build-after-y2038-changes-in-glibc.patch @@ -1,4 +1,4 @@ -From ddaec018169ec178a37082e929fba63fc8990810 Mon Sep 17 00:00:00 2001 +From e142cbdc339bcc73c3f41f512b67ddf7a694337e Mon Sep 17 00:00:00 2001 From: Jiri Slaby Date: Thu, 11 Jul 2019 09:35:13 +0200 Subject: [PATCH] chromium: fix build after y2038 changes in glibc diff --git a/recipes-qt/qt5/qtwebengine/chromium/0006-chromium-Fix-build-on-32bit-arches-with-64bit-time_t.patch b/recipes-qt/qt5/qtwebengine/chromium/0006-chromium-Fix-build-on-32bit-arches-with-64bit-time_t.patch index 4965d532..8f18779c 100644 --- a/recipes-qt/qt5/qtwebengine/chromium/0006-chromium-Fix-build-on-32bit-arches-with-64bit-time_t.patch +++ b/recipes-qt/qt5/qtwebengine/chromium/0006-chromium-Fix-build-on-32bit-arches-with-64bit-time_t.patch @@ -1,4 +1,4 @@ -From f7b5d40dcde77aad8c21ec20ee5bbce374b683d2 Mon Sep 17 00:00:00 2001 +From bcf1d52853fc5e603ff4bca3495f860e81994108 Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Sat, 30 Nov 2019 10:07:43 -0800 Subject: [PATCH] chromium: Fix build on 32bit arches with 64bit time_t diff --git a/recipes-qt/qt5/qtwebengine/chromium/0007-chromium-Include-cstddef-for-size_t-definition.patch b/recipes-qt/qt5/qtwebengine/chromium/0007-chromium-Include-cstddef-for-size_t-definition.patch index d1342673..b6a9d9e6 100644 --- a/recipes-qt/qt5/qtwebengine/chromium/0007-chromium-Include-cstddef-for-size_t-definition.patch +++ b/recipes-qt/qt5/qtwebengine/chromium/0007-chromium-Include-cstddef-for-size_t-definition.patch @@ -1,4 +1,4 @@ -From a15d2e00b6e86ddf976449b60e2305dbe4519221 Mon Sep 17 00:00:00 2001 +From 4b3b7ae386d300f784d44d93c875908e082af154 Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Wed, 25 Dec 2019 15:41:16 -0800 Subject: [PATCH] chromium: Include cstddef for size_t definition diff --git a/recipes-qt/qt5/qtwebengine/chromium/0008-chromium-Move-CharAllocator-definition-to-a-header-f.patch b/recipes-qt/qt5/qtwebengine/chromium/0008-chromium-Move-CharAllocator-definition-to-a-header-f.patch index b3dbf3a4..72dd2056 100644 --- a/recipes-qt/qt5/qtwebengine/chromium/0008-chromium-Move-CharAllocator-definition-to-a-header-f.patch +++ b/recipes-qt/qt5/qtwebengine/chromium/0008-chromium-Move-CharAllocator-definition-to-a-header-f.patch @@ -1,4 +1,4 @@ -From 8a83d56821d3672d3fe2aef03f2c0b7e25bf9318 Mon Sep 17 00:00:00 2001 +From da832c778d013f4217e2d704c27c1d2e19a9364c Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Thu, 2 Jan 2020 17:13:55 -0800 Subject: [PATCH] chromium: Move CharAllocator definition to a header file diff --git a/recipes-qt/qt5/qtwebengine/chromium/0009-chromium-Link-v8-with-libatomic-on-x86.patch b/recipes-qt/qt5/qtwebengine/chromium/0009-chromium-Link-v8-with-libatomic-on-x86.patch index 0e8aba8e..c360999b 100644 --- a/recipes-qt/qt5/qtwebengine/chromium/0009-chromium-Link-v8-with-libatomic-on-x86.patch +++ b/recipes-qt/qt5/qtwebengine/chromium/0009-chromium-Link-v8-with-libatomic-on-x86.patch @@ -1,4 +1,4 @@ -From f7b71dc55c9a1d8d2b955a9c614d201e489e299f Mon Sep 17 00:00:00 2001 +From 7f9421b4609d8a1f9590152fb3976de22e9a1b12 Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Sat, 1 Feb 2020 12:17:23 -0800 Subject: [PATCH] chromium: Link v8 with libatomic on x86 diff --git a/recipes-qt/qt5/qtwebengine/chromium/0010-chromium-icu-use-system-library-only-targets.patch b/recipes-qt/qt5/qtwebengine/chromium/0010-chromium-icu-use-system-library-only-targets.patch index 789dfce5..03856a05 100644 --- a/recipes-qt/qt5/qtwebengine/chromium/0010-chromium-icu-use-system-library-only-targets.patch +++ b/recipes-qt/qt5/qtwebengine/chromium/0010-chromium-icu-use-system-library-only-targets.patch @@ -1,4 +1,4 @@ -From 33aa004f686e3d0e6d9d646b911cf4eee68769d4 Mon Sep 17 00:00:00 2001 +From 8a0c927cdc9705e2a1c29d63c87d32e8cb089510 Mon Sep 17 00:00:00 2001 From: Andrej Valek Date: Fri, 17 Apr 2020 09:43:32 +0200 Subject: [PATCH] chromium: icu: use system library only targets diff --git a/recipes-qt/qt5/qtwebengine/chromium/0011-chromium-Remove-TRUE-to-prep-landing-of-icu68.patch b/recipes-qt/qt5/qtwebengine/chromium/0011-chromium-Remove-TRUE-to-prep-landing-of-icu68.patch index c2a62cb0..a3b35d30 100644 --- a/recipes-qt/qt5/qtwebengine/chromium/0011-chromium-Remove-TRUE-to-prep-landing-of-icu68.patch +++ b/recipes-qt/qt5/qtwebengine/chromium/0011-chromium-Remove-TRUE-to-prep-landing-of-icu68.patch @@ -1,4 +1,4 @@ -From e0b6e087562cd34c93d4a9205ea8e8b7a8a532ee Mon Sep 17 00:00:00 2001 +From 308bddc0bfedb6ab222e3b626ef9bb5234c819b4 Mon Sep 17 00:00:00 2001 From: Frank Tang Date: Tue, 20 Oct 2020 01:09:43 +0000 Subject: [PATCH] chromium: Remove TRUE to prep landing of icu68 @@ -14,7 +14,7 @@ Signed-off-by: Andrej Valek 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/chromium/third_party/libxml/README.chromium b/chromium/third_party/libxml/README.chromium -index f84cc64e1f9..8da443a392c 100644 +index e1b7e1d8065..5cb589f04fd 100644 --- a/chromium/third_party/libxml/README.chromium +++ b/chromium/third_party/libxml/README.chromium @@ -24,6 +24,8 @@ Modifications: @@ -27,10 +27,10 @@ index f84cc64e1f9..8da443a392c 100644 - Delete various unused files, see chromium/roll.py diff --git a/chromium/third_party/libxml/src/encoding.c b/chromium/third_party/libxml/src/encoding.c -index c34aca44663..47be560ede4 100644 +index 730e2532e45..f876e0c02de 100644 --- a/chromium/third_party/libxml/src/encoding.c +++ b/chromium/third_party/libxml/src/encoding.c -@@ -1858,7 +1858,7 @@ xmlIconvWrapper(iconv_t cd, unsigned char *out, int *outlen, +@@ -1882,7 +1882,7 @@ xmlIconvWrapper(iconv_t cd, unsigned char *out, int *outlen, * @outlen: the length of @out * @in: a pointer to an array of input bytes * @inlen: the length of @in @@ -39,7 +39,7 @@ index c34aca44663..47be560ede4 100644 * * Returns 0 if success, or * -1 by lack of space, or -@@ -1898,7 +1898,7 @@ xmlUconvWrapper(uconv_t *cd, int toUnicode, unsigned char *out, int *outlen, +@@ -1922,7 +1922,7 @@ xmlUconvWrapper(uconv_t *cd, int toUnicode, unsigned char *out, int *outlen, *inlen = ucv_in - (const char*) in; *outlen = ucv_out - (char *) out; if (U_SUCCESS(err)) { @@ -48,7 +48,7 @@ index c34aca44663..47be560ede4 100644 if (flush) cd->pivot_source = cd->pivot_target = cd->pivot_buf; return 0; -@@ -2004,7 +2004,7 @@ xmlEncOutputChunk(xmlCharEncodingHandler *handler, unsigned char *out, +@@ -2028,7 +2028,7 @@ xmlEncOutputChunk(xmlCharEncodingHandler *handler, unsigned char *out, #ifdef LIBXML_ICU_ENABLED else if (handler->uconv_out != NULL) { ret = xmlUconvWrapper(handler->uconv_out, 0, out, outlen, in, inlen, diff --git a/recipes-qt/qt5/qtwebengine/chromium/0012-chromium-skia-Fix-build-with-gcc-12.patch b/recipes-qt/qt5/qtwebengine/chromium/0012-chromium-skia-Fix-build-with-gcc-12.patch index b3a0e043..4cb7c6ea 100644 --- a/recipes-qt/qt5/qtwebengine/chromium/0012-chromium-skia-Fix-build-with-gcc-12.patch +++ b/recipes-qt/qt5/qtwebengine/chromium/0012-chromium-skia-Fix-build-with-gcc-12.patch @@ -1,4 +1,4 @@ -From 6bdd69cdfc1e6a695fbe2c4fd6929e79cc7ab3a0 Mon Sep 17 00:00:00 2001 +From 03e9ff9a00ea85e84faeb6267d60fb9ed7c0a598 Mon Sep 17 00:00:00 2001 From: Martin Jansa Date: Mon, 16 May 2022 20:01:49 +0000 Subject: [PATCH] chromium: skia: Fix build with gcc-12 diff --git a/recipes-qt/qt5/qtwebengine/chromium/0013-chromium-musl-sandbox-Define-TEMP_FAILURE_RETRY-if-n.patch b/recipes-qt/qt5/qtwebengine/chromium/0013-chromium-musl-sandbox-Define-TEMP_FAILURE_RETRY-if-n.patch index 5b67b42f..72467953 100644 --- a/recipes-qt/qt5/qtwebengine/chromium/0013-chromium-musl-sandbox-Define-TEMP_FAILURE_RETRY-if-n.patch +++ b/recipes-qt/qt5/qtwebengine/chromium/0013-chromium-musl-sandbox-Define-TEMP_FAILURE_RETRY-if-n.patch @@ -1,4 +1,4 @@ -From 9ae1c50530b47e06ac1ff70f92a10d0eac252f8d Mon Sep 17 00:00:00 2001 +From a7bb1b5b26caa4b3c374c3d3f74f0dfe522d854f Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Fri, 7 Jul 2017 14:01:12 -0700 Subject: [PATCH] chromium: musl: sandbox: Define TEMP_FAILURE_RETRY if not diff --git a/recipes-qt/qt5/qtwebengine/chromium/0014-chromium-musl-Avoid-mallinfo-APIs-on-non-glibc-linux.patch b/recipes-qt/qt5/qtwebengine/chromium/0014-chromium-musl-Avoid-mallinfo-APIs-on-non-glibc-linux.patch index 2e36eb41..69e72db3 100644 --- a/recipes-qt/qt5/qtwebengine/chromium/0014-chromium-musl-Avoid-mallinfo-APIs-on-non-glibc-linux.patch +++ b/recipes-qt/qt5/qtwebengine/chromium/0014-chromium-musl-Avoid-mallinfo-APIs-on-non-glibc-linux.patch @@ -1,4 +1,4 @@ -From 93584b9314338a4ed760df99c7d126d4265983b6 Mon Sep 17 00:00:00 2001 +From e0768318d6289672085b8f8f9a3425178e1475b5 Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Fri, 7 Jul 2017 14:09:06 -0700 Subject: [PATCH] chromium: musl: Avoid mallinfo() APIs on non-glibc/linux diff --git a/recipes-qt/qt5/qtwebengine/chromium/0015-chromium-musl-include-fcntl.h-for-loff_t.patch b/recipes-qt/qt5/qtwebengine/chromium/0015-chromium-musl-include-fcntl.h-for-loff_t.patch index f8f592b8..95699ad3 100644 --- a/recipes-qt/qt5/qtwebengine/chromium/0015-chromium-musl-include-fcntl.h-for-loff_t.patch +++ b/recipes-qt/qt5/qtwebengine/chromium/0015-chromium-musl-include-fcntl.h-for-loff_t.patch @@ -1,4 +1,4 @@ -From 2761847a6457d10e33208ce9863cb516ab8ec06a Mon Sep 17 00:00:00 2001 +From fb0ebec2df9f7fb90d47265db90750a01fa71cbf Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Fri, 7 Jul 2017 14:37:49 -0700 Subject: [PATCH] chromium: musl: include fcntl.h for loff_t diff --git a/recipes-qt/qt5/qtwebengine/chromium/0016-chromium-musl-use-off64_t-instead-of-the-internal-__.patch b/recipes-qt/qt5/qtwebengine/chromium/0016-chromium-musl-use-off64_t-instead-of-the-internal-__.patch index 6551a2b2..3ba7a397 100644 --- a/recipes-qt/qt5/qtwebengine/chromium/0016-chromium-musl-use-off64_t-instead-of-the-internal-__.patch +++ b/recipes-qt/qt5/qtwebengine/chromium/0016-chromium-musl-use-off64_t-instead-of-the-internal-__.patch @@ -1,4 +1,4 @@ -From 1a1041752e85fd9645f9f13d8fc5ccbe40449f60 Mon Sep 17 00:00:00 2001 +From aef1128c27a1975168bb371337bfd59f49873546 Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Fri, 7 Jul 2017 14:38:37 -0700 Subject: [PATCH] chromium: musl: use off64_t instead of the internal __off64_t diff --git a/recipes-qt/qt5/qtwebengine/chromium/0017-chromium-musl-linux-glibc-make-the-distinction.patch b/recipes-qt/qt5/qtwebengine/chromium/0017-chromium-musl-linux-glibc-make-the-distinction.patch index 0b0d2e7b..479cfbff 100644 --- a/recipes-qt/qt5/qtwebengine/chromium/0017-chromium-musl-linux-glibc-make-the-distinction.patch +++ b/recipes-qt/qt5/qtwebengine/chromium/0017-chromium-musl-linux-glibc-make-the-distinction.patch @@ -1,4 +1,4 @@ -From 68d8c1d6c2eb9c90d220ab0cc88568079ba0451b Mon Sep 17 00:00:00 2001 +From bccfc7999135a44fce7473ee8a60333c6d5db746 Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Fri, 7 Jul 2017 14:54:38 -0700 Subject: [PATCH] chromium: musl: linux != glibc, make the distinction diff --git a/recipes-qt/qt5/qtwebengine/chromium/0018-chromium-musl-Define-res_ninit-and-res_nclose-for-no.patch b/recipes-qt/qt5/qtwebengine/chromium/0018-chromium-musl-Define-res_ninit-and-res_nclose-for-no.patch index ecdd9cf5..4e3a1082 100644 --- a/recipes-qt/qt5/qtwebengine/chromium/0018-chromium-musl-Define-res_ninit-and-res_nclose-for-no.patch +++ b/recipes-qt/qt5/qtwebengine/chromium/0018-chromium-musl-Define-res_ninit-and-res_nclose-for-no.patch @@ -1,4 +1,4 @@ -From 989737bab7c896cfd93da0313222e4691ece5b22 Mon Sep 17 00:00:00 2001 +From db3a551e932481d4ccdd315fb05cd24910807136 Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Fri, 7 Jul 2017 15:27:50 -0700 Subject: [PATCH] chromium: musl: Define res_ninit and res_nclose for non-glibc diff --git a/recipes-qt/qt5/qtwebengine/chromium/0019-chromium-musl-Do-not-define-__sbrk-on-musl.patch b/recipes-qt/qt5/qtwebengine/chromium/0019-chromium-musl-Do-not-define-__sbrk-on-musl.patch index a5505b28..8691553b 100644 --- a/recipes-qt/qt5/qtwebengine/chromium/0019-chromium-musl-Do-not-define-__sbrk-on-musl.patch +++ b/recipes-qt/qt5/qtwebengine/chromium/0019-chromium-musl-Do-not-define-__sbrk-on-musl.patch @@ -1,4 +1,4 @@ -From 257669d5a7cd57424f3d0ac54ce0972ce61f0e36 Mon Sep 17 00:00:00 2001 +From 029557f2f50714b2e87aa3c0ad82aaca48f68a50 Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Fri, 7 Jul 2017 15:39:57 -0700 Subject: [PATCH] chromium: musl: Do not define __sbrk on musl diff --git a/recipes-qt/qt5/qtwebengine/chromium/0020-chromium-musl-Adjust-default-pthread-stack-size.patch b/recipes-qt/qt5/qtwebengine/chromium/0020-chromium-musl-Adjust-default-pthread-stack-size.patch index 955c96bf..8edfb13e 100644 --- a/recipes-qt/qt5/qtwebengine/chromium/0020-chromium-musl-Adjust-default-pthread-stack-size.patch +++ b/recipes-qt/qt5/qtwebengine/chromium/0020-chromium-musl-Adjust-default-pthread-stack-size.patch @@ -1,4 +1,4 @@ -From 8b3f28d92d104e392c1d7a404cb40dd4129fda41 Mon Sep 17 00:00:00 2001 +From 194688cb3ddc3d331b3d254b41cb6ae55d55f0f8 Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Fri, 7 Jul 2017 16:41:23 -0700 Subject: [PATCH] chromium: musl: Adjust default pthread stack size diff --git a/recipes-qt/qt5/qtwebengine/chromium/0021-chromium-musl-elf_reader.cc-include-sys-reg.h-to-get.patch b/recipes-qt/qt5/qtwebengine/chromium/0021-chromium-musl-elf_reader.cc-include-sys-reg.h-to-get.patch index 9a9fd845..a0dc403c 100644 --- a/recipes-qt/qt5/qtwebengine/chromium/0021-chromium-musl-elf_reader.cc-include-sys-reg.h-to-get.patch +++ b/recipes-qt/qt5/qtwebengine/chromium/0021-chromium-musl-elf_reader.cc-include-sys-reg.h-to-get.patch @@ -1,4 +1,4 @@ -From 1d7e5266741af842d35d0c60df4969aa48b0b491 Mon Sep 17 00:00:00 2001 +From c151ad89ab323db1730c8b3d77bd72d415c80ca1 Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Tue, 25 Sep 2018 12:59:05 -0700 Subject: [PATCH] chromium: musl: elf_reader.cc: include to get diff --git a/recipes-qt/qt5/qtwebengine/chromium/0022-chromium-musl-pread-pwrite.patch b/recipes-qt/qt5/qtwebengine/chromium/0022-chromium-musl-pread-pwrite.patch index c93748ed..28fb2b61 100644 --- a/recipes-qt/qt5/qtwebengine/chromium/0022-chromium-musl-pread-pwrite.patch +++ b/recipes-qt/qt5/qtwebengine/chromium/0022-chromium-musl-pread-pwrite.patch @@ -1,4 +1,4 @@ -From 0ed5b4a699f75a9a023181e8ad800657fd8b6f25 Mon Sep 17 00:00:00 2001 +From 2ee1af42a550fa258a2061452ff2ad2c30c91f9e Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Sun, 23 Dec 2018 16:58:04 -0800 Subject: [PATCH] chromium: musl: pread pwrite diff --git a/recipes-qt/qt5/qtwebengine/chromium/0023-chromium-musl-initialize-msghdr-in-a-compatible-mann.patch b/recipes-qt/qt5/qtwebengine/chromium/0023-chromium-musl-initialize-msghdr-in-a-compatible-mann.patch index e3bb75eb..8337a956 100644 --- a/recipes-qt/qt5/qtwebengine/chromium/0023-chromium-musl-initialize-msghdr-in-a-compatible-mann.patch +++ b/recipes-qt/qt5/qtwebengine/chromium/0023-chromium-musl-initialize-msghdr-in-a-compatible-mann.patch @@ -1,4 +1,4 @@ -From 93cb0ed94241d3d51dc845d958b2e3a0f7e977fa Mon Sep 17 00:00:00 2001 +From e0b5335ced4cbc78847e63cc98e9c1a78f426c99 Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Sun, 10 May 2020 08:16:01 -0700 Subject: [PATCH] chromium: musl: initialize msghdr in a compatible manner diff --git a/recipes-qt/qt5/qtwebengine_git.bb b/recipes-qt/qt5/qtwebengine_git.bb index 5bb71bf4..aac6701b 100644 --- a/recipes-qt/qt5/qtwebengine_git.bb +++ b/recipes-qt/qt5/qtwebengine_git.bb @@ -148,18 +148,18 @@ RDEPENDS:${PN}-examples += " \ QT_MODULE_BRANCH_CHROMIUM = "87-based" -QT_MODULE_BRANCH = "5.15" -PV = "5.15.8+git${SRCPV}" +QT_MODULE_BRANCH = "5.15.10" +PV = "5.15.10+git${SRCPV}" # Patches from https://github.com/meta-qt5/qtwebengine/commits/b5.15-glibc -# 5.15-glibc.meta-qt5.13 +# 5.15-glibc.meta-qt5.14 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-qmake.conf-lower-MODULE_VERSION-to-5.15.2.patch \ + file://0002-qmake.conf-lower-MODULE_VERSION-to-5.15.4.patch \ " # Patches from https://github.com/meta-qt5/qtwebengine/commits/b5.15 -# 5.15.meta-qt5.13 +# 5.15.meta-qt5.14 SRC_URI:append:libc-musl = "\ file://0003-musl-don-t-use-pvalloc-as-it-s-not-available-on-musl.patch \ file://0004-musl-link-against-libexecinfo.patch \ @@ -167,7 +167,7 @@ SRC_URI:append:libc-musl = "\ " # Patches from https://github.com/meta-qt5/qtwebengine-chromium/commits/87-based-glibc -# 87-based-glibc.meta-qt5.7 +# 87-based-glibc.meta-qt5.8 SRC_URI += " \ file://chromium/0001-chromium-workaround-for-too-long-.rps-file-name.patch;patchdir=src/3rdparty \ file://chromium/0002-chromium-fix-build-with-clang.patch;patchdir=src/3rdparty \ @@ -184,7 +184,7 @@ SRC_URI += " \ " # Patches from https://github.com/meta-qt5/qtwebengine-chromium/commits/87-based -# 87-based.meta-qt5.7 +# 87-based.meta-qt5.8 SRC_URI:append:libc-musl = "\ file://chromium/0013-chromium-musl-sandbox-Define-TEMP_FAILURE_RETRY-if-n.patch;patchdir=src/3rdparty \ file://chromium/0014-chromium-musl-Avoid-mallinfo-APIs-on-non-glibc-linux.patch;patchdir=src/3rdparty \ @@ -199,8 +199,8 @@ SRC_URI:append:libc-musl = "\ file://chromium/0023-chromium-musl-initialize-msghdr-in-a-compatible-mann.patch;patchdir=src/3rdparty \ " -SRCREV_qtwebengine = "73e76f9e86b3fded45be6b232bdebe75e7136e4a" -SRCREV_chromium = "48a205f9e054b5cc3e67df2e25382da9460c0015" +SRCREV_qtwebengine = "c7e716ef1ffd63a8ab1f4dbf879230849eb3b505" +SRCREV_chromium = "caba2fcb0fe8a8d213c4c79d26da3bb88eee61c7" SRCREV = "${SRCREV_qtwebengine}" SRCREV_FORMAT = "qtwebengine_chromium" -- cgit v1.2.3 From 1e0b66913bd5dd24b06b4aceb69e6e1f83e361b5 Mon Sep 17 00:00:00 2001 From: Martin Jansa Date: Tue, 14 Jun 2022 10:21:27 +0200 Subject: qtwebengine: upgrade to latest chromium from 87-based branch * contains useful fix to resolve: https://github.com/meta-qt5/meta-qt5/pull/475 qtwebengine-chromium $ git log --oneline caba2fcb0fe8a8d213c4c79d26da3bb88eee61c7..ecc2bb74f1f7140fc52650042299be18e826b27b ecc2bb74f1f [Backport] CVE-2022-0796: Use after free in Media a7a23ccc69e [Backport] Linux sandbox: ENOSYS for some statx syscalls 7857ff290ab FIXUP: Workaround MSVC2022 ICE in constexpr functions Signed-off-by: Martin Jansa --- recipes-qt/qt5/qtwebengine_git.bb | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'recipes-qt/qt5') diff --git a/recipes-qt/qt5/qtwebengine_git.bb b/recipes-qt/qt5/qtwebengine_git.bb index aac6701b..ab3e1204 100644 --- a/recipes-qt/qt5/qtwebengine_git.bb +++ b/recipes-qt/qt5/qtwebengine_git.bb @@ -167,7 +167,7 @@ SRC_URI:append:libc-musl = "\ " # Patches from https://github.com/meta-qt5/qtwebengine-chromium/commits/87-based-glibc -# 87-based-glibc.meta-qt5.8 +# 87-based-glibc.meta-qt5.9 SRC_URI += " \ file://chromium/0001-chromium-workaround-for-too-long-.rps-file-name.patch;patchdir=src/3rdparty \ file://chromium/0002-chromium-fix-build-with-clang.patch;patchdir=src/3rdparty \ @@ -184,7 +184,7 @@ SRC_URI += " \ " # Patches from https://github.com/meta-qt5/qtwebengine-chromium/commits/87-based -# 87-based.meta-qt5.8 +# 87-based.meta-qt5.9 SRC_URI:append:libc-musl = "\ file://chromium/0013-chromium-musl-sandbox-Define-TEMP_FAILURE_RETRY-if-n.patch;patchdir=src/3rdparty \ file://chromium/0014-chromium-musl-Avoid-mallinfo-APIs-on-non-glibc-linux.patch;patchdir=src/3rdparty \ @@ -200,7 +200,8 @@ SRC_URI:append:libc-musl = "\ " SRCREV_qtwebengine = "c7e716ef1ffd63a8ab1f4dbf879230849eb3b505" -SRCREV_chromium = "caba2fcb0fe8a8d213c4c79d26da3bb88eee61c7" +# this is 3 commits ahead of what submodule in 5.15.10 uses (caba2fcb0fe8a8d213c4c79d26da3bb88eee61c7), but contains useful fix: +SRCREV_chromium = "ecc2bb74f1f7140fc52650042299be18e826b27b" SRCREV = "${SRCREV_qtwebengine}" SRCREV_FORMAT = "qtwebengine_chromium" -- cgit v1.2.3 From 387784b0d7387545ef1d99e39063a109d880082e Mon Sep 17 00:00:00 2001 From: Martin Jansa Date: Tue, 14 Jun 2022 14:45:05 +0200 Subject: qtpdf: upgrade to v5.15.10-lts * sync with qtwebengine recipe * replace 0002-Remove-the-GN-settings-done-for-clang-that-conflict-.patch with whole set of chromium patches from qtwebengine where recipes-qt/qt5/qtwebengine/chromium/0002-chromium-fix-build-with-clang.patch should do the same Signed-off-by: Martin Jansa --- ...-configure.json-remove-python2-dependency.patch | 4 +- ...GN-settings-done-for-clang-that-conflict-.patch | 97 ---------------------- ...gn.pro-do-not-try-to-statically-link-stdc.patch | 6 +- .../qt5/qtpdf/0003-Fix-build-with-clang.patch | 39 +++++++++ recipes-qt/qt5/qtpdf/native-clang.patch | 19 ----- recipes-qt/qt5/qtpdf_git.bb | 52 ++++++++++-- 6 files changed, 87 insertions(+), 130 deletions(-) delete mode 100644 recipes-qt/qt5/qtpdf/0002-Remove-the-GN-settings-done-for-clang-that-conflict-.patch create mode 100644 recipes-qt/qt5/qtpdf/0003-Fix-build-with-clang.patch delete mode 100644 recipes-qt/qt5/qtpdf/native-clang.patch (limited to 'recipes-qt/qt5') diff --git a/recipes-qt/qt5/qtpdf/0001-configure.json-remove-python2-dependency.patch b/recipes-qt/qt5/qtpdf/0001-configure.json-remove-python2-dependency.patch index 75576667..82013943 100644 --- a/recipes-qt/qt5/qtpdf/0001-configure.json-remove-python2-dependency.patch +++ b/recipes-qt/qt5/qtpdf/0001-configure.json-remove-python2-dependency.patch @@ -1,4 +1,4 @@ -From 988d1e3f9c4415c2a59833b74098639d3fe71524 Mon Sep 17 00:00:00 2001 +From 492221e627937ef0063a9da125a6aef847eebcef Mon Sep 17 00:00:00 2001 From: Leif Middelschulte Date: Tue, 8 Feb 2022 14:14:02 +0100 Subject: [PATCH] configure.json: remove python2 dependency @@ -8,7 +8,7 @@ Subject: [PATCH] configure.json: remove python2 dependency 1 file changed, 1 deletion(-) diff --git a/src/buildtools/configure.json b/src/buildtools/configure.json -index 9eb5e8e3..ebe31c21 100644 +index 9eb5e8e33..ebe31c216 100644 --- a/src/buildtools/configure.json +++ b/src/buildtools/configure.json @@ -399,7 +399,6 @@ diff --git a/recipes-qt/qt5/qtpdf/0002-Remove-the-GN-settings-done-for-clang-that-conflict-.patch b/recipes-qt/qt5/qtpdf/0002-Remove-the-GN-settings-done-for-clang-that-conflict-.patch deleted file mode 100644 index b1111d3a..00000000 --- a/recipes-qt/qt5/qtpdf/0002-Remove-the-GN-settings-done-for-clang-that-conflict-.patch +++ /dev/null @@ -1,97 +0,0 @@ -From cab3c06864569577158626e500b2253687fc09ba Mon Sep 17 00:00:00 2001 -From: Khem Raj -Date: Mon, 29 Apr 2019 12:00:19 +0300 -Subject: [PATCH] Remove the GN settings done for clang that conflict with OE - -clang cross compiler that is build with meta-clang has lot of these -settings built-in and specifying them here confuses the compiler - ---target option and -no-canonical-prefixes options result in clang - -finding the headers in target sysroot - -Upstream-Status: Inappropriate [OE-Specific] - -Signed-off-by: Khem Raj -Rebased-by: Maksim Sisov ---- - src/3rdparty/chromium/build/config/compiler/BUILD.gn | 35 ---------------------------------- - 1 file changed, 35 deletions(-) - ---- a/src/3rdparty/chromium/build/config/compiler/BUILD.gn -+++ b/src/3rdparty/chromium/build/config/compiler/BUILD.gn -@@ -781,10 +781,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 += [ - "-march=$arm_arch", -@@ -794,11 +790,6 @@ config("compiler_cpu_abi") { - if (arm_tune != "") { - cflags += [ "-mtune=$arm_tune" ] - } -- } 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" ] - if (custom_toolchain == "") { -@@ -806,9 +797,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" ] -@@ -888,8 +876,6 @@ config("compiler_cpu_abi") { - ldflags += [ "-Wl,--hash-style=sysv" ] - if (custom_toolchain == "") { - if (is_clang) { -- cflags += [ "--target=mips-linux-gnu" ] -- ldflags += [ "--target=mips-linux-gnu" ] - } else { - cflags += [ "-EB" ] - ldflags += [ "-EB" ] -@@ -937,9 +923,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 += [ -@@ -997,8 +980,6 @@ config("compiler_cpu_abi") { - ldflags += [ "-Wl,--hash-style=sysv" ] - if (custom_toolchain == "") { - if (is_clang) { -- cflags += [ "--target=mips64-linux-gnuabi64" ] -- ldflags += [ "--target=mips64-linux-gnuabi64" ] - } else { - cflags += [ - "-EB", -@@ -1166,13 +1147,6 @@ config("compiler_deterministic") { - } - } - } -- -- # 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 && !(use_qt && use_libcxx)) { -- cflags += [ "-no-canonical-prefixes" ] -- } - } - - config("clang_revision") { diff --git a/recipes-qt/qt5/qtpdf/0002-gn.pro-do-not-try-to-statically-link-stdc.patch b/recipes-qt/qt5/qtpdf/0002-gn.pro-do-not-try-to-statically-link-stdc.patch index 87d26ac0..ae033d92 100644 --- a/recipes-qt/qt5/qtpdf/0002-gn.pro-do-not-try-to-statically-link-stdc.patch +++ b/recipes-qt/qt5/qtpdf/0002-gn.pro-do-not-try-to-statically-link-stdc.patch @@ -1,4 +1,4 @@ -From 4d2f525ccf3255dd4a0e774d3db0533ae4aba98f Mon Sep 17 00:00:00 2001 +From 38a26f8fa1fba94c621e2eeb2428d47a4640e6fa Mon Sep 17 00:00:00 2001 From: Leif Middelschulte Date: Tue, 8 Feb 2022 16:28:14 +0100 Subject: [PATCH] gn.pro: do not try to statically link stdc++ @@ -8,7 +8,7 @@ Subject: [PATCH] gn.pro: do not try to statically link stdc++ 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/buildtools/gn.pro b/src/buildtools/gn.pro -index a8ca6567..9632f0ef 100644 +index 5094574ed..7b8365157 100644 --- a/src/buildtools/gn.pro +++ b/src/buildtools/gn.pro @@ -20,7 +20,8 @@ build_pass|!debug_and_release { @@ -18,6 +18,6 @@ index a8ca6567..9632f0ef 100644 - --ld \"$$which($$CXX_host)\" --ar \"$$which(ar)\" + --ld \"$$which($$CXX_host)\" --ar \"$$which(ar)\" \ + --no-static-libstdc++ + !isEmpty(QMAKE_AR): gn_gen_args += --ar \"$$which($$first(QMAKE_AR))\" msvc:!clang_cl: gn_gen_args += --use-lto - diff --git a/recipes-qt/qt5/qtpdf/0003-Fix-build-with-clang.patch b/recipes-qt/qt5/qtpdf/0003-Fix-build-with-clang.patch new file mode 100644 index 00000000..ea5e828c --- /dev/null +++ b/recipes-qt/qt5/qtpdf/0003-Fix-build-with-clang.patch @@ -0,0 +1,39 @@ +From a769d4c4cab7168d5e92b28790cf383985e5c177 Mon Sep 17 00:00:00 2001 +From: Khem Raj +Date: Sat, 26 Feb 2022 18:15:28 -0800 +Subject: [PATCH] Fix build with clang + +use GNU runtime when building native tools like gn +when using native clang compiler + +Fixes +| FAILED: gn +| /mnt/b/yoe/master/build/tmp/work/core2-64-yoe-linux/qtpdf/5.15.8+gitAUTOINC+73e76f9e86_48a205f9e0-r0/recipe-sysroot-native/usr/bin/clang++ -O3 -fdata-sections -ffunction-sections -Wl,--gc-sections -Wl,-stri +p-all -Wl,--as-needed -pthread -o gn -Wl,--start-group tools/gn/gn_main.o base.a gn_lib.a -Wl,--end-group -ldl +| /mnt/b/yoe/master/build/tmp/hosttools/ld: cannot find /usr/lib/clang/14.0.0/lib/linux/libclang_rt.builtins-x86_64.a: No such file or directory + +Fix building with clang from meta-clang + +Clang defaults to llvm runtime and this patch is needed +for building the host tools, since its using native runtime + +Upstream-Status: Inappropriate [OE-Specific] +Signed-off-by: Khem Raj +Signed-off-by: Martin Jansa +--- + src/buildtools/gn.pro | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/buildtools/gn.pro b/src/buildtools/gn.pro +index 7b8365157..51574e0fd 100644 +--- a/src/buildtools/gn.pro ++++ b/src/buildtools/gn.pro +@@ -20,7 +20,7 @@ build_pass|!debug_and_release { + + gn_gen_args = --no-last-commit-position --out-path $$out_path \ + --cc \"$$which($$CC_host)\" --cxx \"$$which($$CXX_host)\" \ +- --ld \"$$which($$CXX_host)\" --ar \"$$which(ar)\" \ ++ --ld \"$$which($$CXX_host) -rtlib=libgcc -unwindlib=libgcc\" --ar \"$$which(ar)\" \ + --no-static-libstdc++ + !isEmpty(QMAKE_AR): gn_gen_args += --ar \"$$which($$first(QMAKE_AR))\" + diff --git a/recipes-qt/qt5/qtpdf/native-clang.patch b/recipes-qt/qt5/qtpdf/native-clang.patch deleted file mode 100644 index 5ef534ca..00000000 --- a/recipes-qt/qt5/qtpdf/native-clang.patch +++ /dev/null @@ -1,19 +0,0 @@ -Fix building with clang from meta-clang - -Clang defaults to llvm runtime and this patch is needed -for building the host tools, since its using native runtime - -Upstream-Status: Inappropriate [OE-Specific] -Signed-off-by: Khem Raj - ---- a/src/buildtools/gn.pro -+++ b/src/buildtools/gn.pro -@@ -20,7 +20,7 @@ build_pass|!debug_and_release { - - gn_gen_args = --no-last-commit-position --out-path $$out_path \ - --cc \"$$which($$CC_host)\" --cxx \"$$which($$CXX_host)\" \ -- --ld \"$$which($$CXX_host)\" --ar \"$$which(ar)\" \ -+ --ld \"$$which($$CXX_host) -rtlib=libgcc -unwindlib=libgcc\" --ar \"$$which(ar)\" \ - --no-static-libstdc++ - - msvc:!clang_cl: gn_gen_args += --use-lto diff --git a/recipes-qt/qt5/qtpdf_git.bb b/recipes-qt/qt5/qtpdf_git.bb index 0e9e4850..d7a19cb7 100644 --- a/recipes-qt/qt5/qtpdf_git.bb +++ b/recipes-qt/qt5/qtpdf_git.bb @@ -128,8 +128,8 @@ RDEPENDS:${PN}-examples += " \ QT_MODULE_BRANCH_CHROMIUM = "87-based" -QT_MODULE_BRANCH = "5.15" -PV = "5.15.8+git${SRCPV}" +QT_MODULE_BRANCH = "5.15.10" +PV = "5.15.10+git${SRCPV}" # Uses the same repository and couple patches as qtwebengine, but qtwebengine # still depends on python2 @@ -137,25 +137,56 @@ QT_MODULE = "qtwebengine" FILESEXTRAPATHS =. "${FILE_DIRNAME}/qtwebengine:" # Patches from https://github.com/meta-qt5/qtwebengine/commits/b5.15-glibc -# 5.15-glibc.meta-qt5.13 +# 5.15-glibc.meta-qt5.14 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-qmake.conf-lower-MODULE_VERSION-to-5.15.2.patch \ - file://0002-Remove-the-GN-settings-done-for-clang-that-conflict-.patch \ + file://0002-qmake.conf-lower-MODULE_VERSION-to-5.15.4.patch \ " # Patches from https://github.com/meta-qt5/qtwebengine/commits/b5.15 -# 5.15.meta-qt5.13 +# 5.15.meta-qt5.14 SRC_URI:append:libc-musl = "\ file://0003-musl-don-t-use-pvalloc-as-it-s-not-available-on-musl.patch \ file://0004-musl-link-against-libexecinfo.patch \ file://0005-mkspecs-Allow-builds-with-libc-glibc.patch \ " -SRC_URI:append:runtime-llvm = " file://native-clang.patch " +# Patches from https://github.com/meta-qt5/qtwebengine-chromium/commits/87-based-glibc +# 87-based-glibc.meta-qt5.9 +SRC_URI += " \ + file://chromium/0001-chromium-workaround-for-too-long-.rps-file-name.patch;patchdir=src/3rdparty \ + file://chromium/0002-chromium-fix-build-with-clang.patch;patchdir=src/3rdparty \ + file://chromium/0003-chromium-Exclude-CRC32-for-32bit-arm.patch;patchdir=src/3rdparty \ + file://chromium/0004-chromium-Do-not-try-to-set-the-guessed-values-for.patch;patchdir=src/3rdparty \ + file://chromium/0005-chromium-fix-build-after-y2038-changes-in-glibc.patch;patchdir=src/3rdparty \ + file://chromium/0006-chromium-Fix-build-on-32bit-arches-with-64bit-time_t.patch;patchdir=src/3rdparty \ + file://chromium/0007-chromium-Include-cstddef-for-size_t-definition.patch;patchdir=src/3rdparty \ + file://chromium/0008-chromium-Move-CharAllocator-definition-to-a-header-f.patch;patchdir=src/3rdparty \ + file://chromium/0009-chromium-Link-v8-with-libatomic-on-x86.patch;patchdir=src/3rdparty \ + file://chromium/0010-chromium-icu-use-system-library-only-targets.patch;patchdir=src/3rdparty \ + file://chromium/0011-chromium-Remove-TRUE-to-prep-landing-of-icu68.patch;patchdir=src/3rdparty \ + file://chromium/0012-chromium-skia-Fix-build-with-gcc-12.patch;patchdir=src/3rdparty \ +" + +# Patches from https://github.com/meta-qt5/qtwebengine-chromium/commits/87-based +# 87-based.meta-qt5.9 +SRC_URI:append:libc-musl = "\ + file://chromium/0013-chromium-musl-sandbox-Define-TEMP_FAILURE_RETRY-if-n.patch;patchdir=src/3rdparty \ + file://chromium/0014-chromium-musl-Avoid-mallinfo-APIs-on-non-glibc-linux.patch;patchdir=src/3rdparty \ + file://chromium/0015-chromium-musl-include-fcntl.h-for-loff_t.patch;patchdir=src/3rdparty \ + file://chromium/0016-chromium-musl-use-off64_t-instead-of-the-internal-__.patch;patchdir=src/3rdparty \ + file://chromium/0017-chromium-musl-linux-glibc-make-the-distinction.patch;patchdir=src/3rdparty \ + file://chromium/0018-chromium-musl-Define-res_ninit-and-res_nclose-for-no.patch;patchdir=src/3rdparty \ + file://chromium/0019-chromium-musl-Do-not-define-__sbrk-on-musl.patch;patchdir=src/3rdparty \ + file://chromium/0020-chromium-musl-Adjust-default-pthread-stack-size.patch;patchdir=src/3rdparty \ + file://chromium/0021-chromium-musl-elf_reader.cc-include-sys-reg.h-to-get.patch;patchdir=src/3rdparty \ + file://chromium/0022-chromium-musl-pread-pwrite.patch;patchdir=src/3rdparty \ + file://chromium/0023-chromium-musl-initialize-msghdr-in-a-compatible-mann.patch;patchdir=src/3rdparty \ +" -SRCREV_qtwebengine = "73e76f9e86b3fded45be6b232bdebe75e7136e4a" -SRCREV_chromium = "48a205f9e054b5cc3e67df2e25382da9460c0015" +SRCREV_qtwebengine = "c7e716ef1ffd63a8ab1f4dbf879230849eb3b505" +# this is 3 commits ahead of what submodule in 5.15.10 uses (caba2fcb0fe8a8d213c4c79d26da3bb88eee61c7), but contains useful fix: +SRCREV_chromium = "ecc2bb74f1f7140fc52650042299be18e826b27b" SRCREV = "${SRCREV_qtwebengine}" SRCREV_FORMAT = "qtwebengine_chromium" @@ -171,10 +202,13 @@ INSANE_SKIP:${PN} += "textrel" # First patch skips "python2" dependency checks for the pdf module # Second patch repairs a failing build of the `gn` buildtool due to missing (host) libstdc++ +# Patches from https://github.com/meta-qt5/qtwebengine/commits/b5.15-qtpdf +# 5.15-qtpdf.meta-qt5.1 SRC_URI += " \ file://0001-configure.json-remove-python2-dependency.patch \ file://0002-gn.pro-do-not-try-to-statically-link-stdc.patch \ " +SRC_URI:append:runtime-llvm = " file://0003-Fix-build-with-clang.patch" # These flags below go more into detail than qtwebengine's documentation PACKAGECONFIG[no-core] = "-no-build-qtwebengine-core,," -- cgit v1.2.3