aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--recipes-qt/qt5/nativesdk-qtbase_git.bb2
-rw-r--r--recipes-qt/qt5/qtbase-native_git.bb2
-rw-r--r--recipes-qt/qt5/qtbase_git.bb2
-rw-r--r--recipes-qt/qt5/qtdeclarative_git.bb2
-rw-r--r--recipes-qt/qt5/qtpdf_git.bb5
-rw-r--r--recipes-qt/qt5/qtquickcontrols_git.bb2
-rw-r--r--recipes-qt/qt5/qtremoteobjects_git.bb2
-rw-r--r--recipes-qt/qt5/qttools_git.bb2
-rw-r--r--recipes-qt/qt5/qtwebengine/chromium/0011-chromium-Remove-TRUE-to-prep-landing-of-icu68.patch59
-rw-r--r--recipes-qt/qt5/qtwebengine_git.bb5
10 files changed, 11 insertions, 72 deletions
diff --git a/recipes-qt/qt5/nativesdk-qtbase_git.bb b/recipes-qt/qt5/nativesdk-qtbase_git.bb
index f08620d2..6368dd50 100644
--- a/recipes-qt/qt5/nativesdk-qtbase_git.bb
+++ b/recipes-qt/qt5/nativesdk-qtbase_git.bb
@@ -202,4 +202,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 = "d4078e9c67d973360026437ad6a8fabc250b7a5e"
+SRCREV = "cc641080d4f3803f2d9683c2a9181fee7c4bd12a"
diff --git a/recipes-qt/qt5/qtbase-native_git.bb b/recipes-qt/qt5/qtbase-native_git.bb
index 324e2d87..f026ed07 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 = "d4078e9c67d973360026437ad6a8fabc250b7a5e"
+SRCREV = "cc641080d4f3803f2d9683c2a9181fee7c4bd12a"
diff --git a/recipes-qt/qt5/qtbase_git.bb b/recipes-qt/qt5/qtbase_git.bb
index 6f07271d..36befe60 100644
--- a/recipes-qt/qt5/qtbase_git.bb
+++ b/recipes-qt/qt5/qtbase_git.bb
@@ -309,4 +309,4 @@ sed -i \
$D${OE_QMAKE_PATH_ARCHDATA}/mkspecs/qmodule.pri
}
-SRCREV = "d4078e9c67d973360026437ad6a8fabc250b7a5e"
+SRCREV = "cc641080d4f3803f2d9683c2a9181fee7c4bd12a"
diff --git a/recipes-qt/qt5/qtdeclarative_git.bb b/recipes-qt/qt5/qtdeclarative_git.bb
index 80779af5..d2de34ea 100644
--- a/recipes-qt/qt5/qtdeclarative_git.bb
+++ b/recipes-qt/qt5/qtdeclarative_git.bb
@@ -53,6 +53,6 @@ do_install:append:class-nativesdk() {
rm -rf ${D}${OE_QMAKE_PATH_QML}
}
-SRCREV = "8fdcbd60e4d520fbfd4683cb6fe2350144ef2ca9"
+SRCREV = "6dc7fa90efa592dc555008b0e8d666c72801f31d"
BBCLASSEXTEND =+ "native nativesdk"
diff --git a/recipes-qt/qt5/qtpdf_git.bb b/recipes-qt/qt5/qtpdf_git.bb
index c7b1edc9..57ce841b 100644
--- a/recipes-qt/qt5/qtpdf_git.bb
+++ b/recipes-qt/qt5/qtpdf_git.bb
@@ -160,7 +160,6 @@ SRC_URI += " \
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 \
file://chromium/0013-Remove-unsetting-_FILE_OFFSET_BITS.patch;patchdir=src/3rdparty \
"
@@ -181,8 +180,8 @@ SRC_URI:append:libc-musl = "\
file://chromium/0023-chromium-musl-initialize-msghdr-in-a-compatible-mann.patch;patchdir=src/3rdparty \
"
-SRCREV_qtwebengine = "38e0df6c6e5a1186b68df9b3d6f4cafbb211f2da"
-SRCREV_chromium = "e0fd3a5d3ce79d43dee6e0bad16a71123d9a14b3"
+SRCREV_qtwebengine = "ee9794c7263b8b5cb85cd9648c68687e08805aca"
+SRCREV_chromium = "87897ba0a5f5676633c6d44e002c5a7f306a91d7"
SRCREV = "${SRCREV_qtwebengine}"
SRCREV_FORMAT = "qtwebengine_chromium"
diff --git a/recipes-qt/qt5/qtquickcontrols_git.bb b/recipes-qt/qt5/qtquickcontrols_git.bb
index 83937f09..07919f97 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 = "8a882a9e478481b0b86bf7a290d6e8621ef5664b"
+SRCREV = "225b9e40d7a1983f4129fb5b4e8e5285d78ce3d3"
diff --git a/recipes-qt/qt5/qtremoteobjects_git.bb b/recipes-qt/qt5/qtremoteobjects_git.bb
index 950fe037..af0c77c6 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 = "0f6f7cfceadd05d9ed677fbfdb7a6a8cc2249b50"
+SRCREV = "abe946bea086c55bf7747954b7d5ee3ed8dbefac"
BBCLASSEXTEND += "native nativesdk"
diff --git a/recipes-qt/qt5/qttools_git.bb b/recipes-qt/qt5/qttools_git.bb
index 723970d8..2f7197a6 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 = "b2f8190d41be858045fd41963a3f1acde8b1adab"
+SRCREV = "8134b35f2f199b0d704f84b76ad910e1425997c7"
BBCLASSEXTEND = "native nativesdk"
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
deleted file mode 100644
index a3b35d30..00000000
--- a/recipes-qt/qt5/qtwebengine/chromium/0011-chromium-Remove-TRUE-to-prep-landing-of-icu68.patch
+++ /dev/null
@@ -1,59 +0,0 @@
-From 308bddc0bfedb6ab222e3b626ef9bb5234c819b4 Mon Sep 17 00:00:00 2001
-From: Frank Tang <ftang@chromium.org>
-Date: Tue, 20 Oct 2020 01:09:43 +0000
-Subject: [PATCH] chromium: Remove TRUE to prep landing of icu68
-
-ICU 68, to work with C++20, remove the #define of TRUE
-since the usage in libxml is as an int, use 1 instead.
-
-Upstream-Status: Backport [https://github.com/chromium/chromium/commit/e8aa87fa88f55e76ce08794690665ce30caa3183]
-Signed-off-by: Andrej Valek <andrej.valek@siemens.com>
----
- chromium/third_party/libxml/README.chromium | 2 ++
- chromium/third_party/libxml/src/encoding.c | 6 +++---
- 2 files changed, 5 insertions(+), 3 deletions(-)
-
-diff --git a/chromium/third_party/libxml/README.chromium b/chromium/third_party/libxml/README.chromium
-index e1b7e1d8065..5cb589f04fd 100644
---- a/chromium/third_party/libxml/README.chromium
-+++ b/chromium/third_party/libxml/README.chromium
-@@ -24,6 +24,8 @@ Modifications:
- non-recursive broke a few web platform tests.
- - add-fuzz-target.patch: Prevents autoreconf from failing on mac due to a
- missing makefile for fuzz.
-+- chromium-issue-1138555.patch: Change TRUE to 1 for ICU68 which remove the
-+ #define of TRUE.
- - Add helper classes in the chromium/ subdirectory.
- - 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 730e2532e45..f876e0c02de 100644
---- a/chromium/third_party/libxml/src/encoding.c
-+++ b/chromium/third_party/libxml/src/encoding.c
-@@ -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
-- * @flush: if true, indicates end of input
-+ * @flush: if 1, indicates end of input
- *
- * Returns 0 if success, or
- * -1 by lack of space, or
-@@ -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)) {
-- /* reset pivot buf if this is the last call for input (flush==TRUE) */
-+ /* reset pivot buf if this is the last call for input (flush==1) */
- if (flush)
- cd->pivot_source = cd->pivot_target = cd->pivot_buf;
- return 0;
-@@ -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,
-- TRUE);
-+ 1);
- }
- #endif /* LIBXML_ICU_ENABLED */
- else {
diff --git a/recipes-qt/qt5/qtwebengine_git.bb b/recipes-qt/qt5/qtwebengine_git.bb
index 44673fa6..1370215f 100644
--- a/recipes-qt/qt5/qtwebengine_git.bb
+++ b/recipes-qt/qt5/qtwebengine_git.bb
@@ -178,7 +178,6 @@ SRC_URI += " \
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-Add-missing-include-for-C-strncpy.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 \
file://chromium/0013-Remove-unsetting-_FILE_OFFSET_BITS.patch;patchdir=src/3rdparty \
"
@@ -199,8 +198,8 @@ SRC_URI:append:libc-musl = "\
file://chromium/0023-chromium-musl-initialize-msghdr-in-a-compatible-mann.patch;patchdir=src/3rdparty \
"
-SRCREV_qtwebengine = "abb854d1cf5da50ab20c9f261c71f4c99743515c"
-SRCREV_chromium = "e0fd3a5d3ce79d43dee6e0bad16a71123d9a14b3"
+SRCREV_qtwebengine = "ee9794c7263b8b5cb85cd9648c68687e08805aca"
+SRCREV_chromium = "87897ba0a5f5676633c6d44e002c5a7f306a91d7"
SRCREV = "${SRCREV_qtwebengine}"
SRCREV_FORMAT = "qtwebengine_chromium"
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-22 10:39:44 +0000