diff options
Diffstat (limited to 'recipes-qt/qt5/qtwebengine_git.bb')
-rw-r--r-- | recipes-qt/qt5/qtwebengine_git.bb | 25 |
1 files changed, 12 insertions, 13 deletions
diff --git a/recipes-qt/qt5/qtwebengine_git.bb b/recipes-qt/qt5/qtwebengine_git.bb index db089c14..1d1763d0 100644 --- a/recipes-qt/qt5/qtwebengine_git.bb +++ b/recipes-qt/qt5/qtwebengine_git.bb | |||
@@ -121,10 +121,10 @@ RDEPENDS_${PN}-examples += " \ | |||
121 | qtdeclarative-qmlplugins \ | 121 | qtdeclarative-qmlplugins \ |
122 | " | 122 | " |
123 | 123 | ||
124 | QT_MODULE_BRANCH_CHROMIUM = "61-based" | 124 | QT_MODULE_BRANCH_CHROMIUM = "63-based" |
125 | 125 | ||
126 | # Patches from https://github.com/meta-qt5/qtwebengine/commits/b5.10 | 126 | # Patches from https://github.com/meta-qt5/qtwebengine/commits/b5.11 |
127 | # 5.10.meta-qt5.2 | 127 | # 5.11.meta-qt5.1 |
128 | SRC_URI += " \ | 128 | SRC_URI += " \ |
129 | ${QT_GIT}/qtwebengine-chromium.git;name=chromium;branch=${QT_MODULE_BRANCH_CHROMIUM};protocol=${QT_GIT_PROTOCOL};destsuffix=git/src/3rdparty \ | 129 | ${QT_GIT}/qtwebengine-chromium.git;name=chromium;branch=${QT_MODULE_BRANCH_CHROMIUM};protocol=${QT_GIT_PROTOCOL};destsuffix=git/src/3rdparty \ |
130 | file://0001-WebEngine-qquickwebengineview_p_p.h-add-include-QCol.patch \ | 130 | file://0001-WebEngine-qquickwebengineview_p_p.h-add-include-QCol.patch \ |
@@ -136,8 +136,8 @@ SRC_URI_append_libc-musl = "\ | |||
136 | file://0005-musl-link-against-libexecinfo.patch \ | 136 | file://0005-musl-link-against-libexecinfo.patch \ |
137 | " | 137 | " |
138 | 138 | ||
139 | # Patches from https://github.com/meta-qt5/qtwebengine-chromium/commits/61-based | 139 | # Patches from https://github.com/meta-qt5/qtwebengine-chromium/commits/63-based |
140 | # 61-based.meta-qt5.2 | 140 | # 63-based.meta-qt5.1 |
141 | SRC_URI += " \ | 141 | SRC_URI += " \ |
142 | file://0001-chromium-Force-host-toolchain-configuration.patch;patchdir=src/3rdparty \ | 142 | file://0001-chromium-Force-host-toolchain-configuration.patch;patchdir=src/3rdparty \ |
143 | file://0002-chromium-workaround-for-too-long-.rps-file-name.patch;patchdir=src/3rdparty \ | 143 | file://0002-chromium-workaround-for-too-long-.rps-file-name.patch;patchdir=src/3rdparty \ |
@@ -151,16 +151,15 @@ SRC_URI_append_libc-musl = "\ | |||
151 | file://0007-chromium-musl-linux-glibc-make-the-distinction.patch;patchdir=src/3rdparty \ | 151 | file://0007-chromium-musl-linux-glibc-make-the-distinction.patch;patchdir=src/3rdparty \ |
152 | file://0008-chromium-musl-allocator-Do-not-include-glibc_weak_sy.patch;patchdir=src/3rdparty \ | 152 | file://0008-chromium-musl-allocator-Do-not-include-glibc_weak_sy.patch;patchdir=src/3rdparty \ |
153 | file://0009-chromium-musl-Use-correct-member-name-__si_fields-fr.patch;patchdir=src/3rdparty \ | 153 | file://0009-chromium-musl-Use-correct-member-name-__si_fields-fr.patch;patchdir=src/3rdparty \ |
154 | file://0010-chromium-musl-Match-syscalls-to-match-musl.patch;patchdir=src/3rdparty \ | 154 | file://0010-chromium-musl-Define-res_ninit-and-res_nclose-for-no.patch;patchdir=src/3rdparty \ |
155 | file://0011-chromium-musl-Define-res_ninit-and-res_nclose-for-no.patch;patchdir=src/3rdparty \ | 155 | file://0011-chromium-musl-Do-not-define-__sbrk-on-musl.patch;patchdir=src/3rdparty \ |
156 | file://0012-chromium-musl-Do-not-define-__sbrk-on-musl.patch;patchdir=src/3rdparty \ | 156 | file://0012-chromium-musl-Adjust-default-pthread-stack-size.patch;patchdir=src/3rdparty \ |
157 | file://0013-chromium-musl-Adjust-default-pthread-stack-size.patch;patchdir=src/3rdparty \ | 157 | file://0013-chromium-musl-include-asm-generic-ioctl.h-for-TCGETS.patch;patchdir=src/3rdparty \ |
158 | file://0014-chromium-musl-include-asm-generic-ioctl.h-for-TCGETS.patch;patchdir=src/3rdparty \ | 158 | file://0014-chromium-musl-tcmalloc-Use-off64_t-insread-of-__off6.patch;patchdir=src/3rdparty \ |
159 | file://0015-chromium-musl-tcmalloc-Use-off64_t-insread-of-__off6.patch;patchdir=src/3rdparty \ | ||
160 | " | 159 | " |
161 | 160 | ||
162 | SRCREV_qtwebengine = "9dc8dff7a8f4d58f71d816375d49f8829f06aae5" | 161 | SRCREV_qtwebengine = "732d09331c1e4efa51501aae9bcd6924eecdd5c3" |
163 | SRCREV_chromium = "c858cc76099db0af82a264b3c6f921a287cfcb42" | 162 | SRCREV_chromium = "3fa04d22883e42bd987e4f83d394a1040b410024" |
164 | SRCREV = "${SRCREV_qtwebengine}" | 163 | SRCREV = "${SRCREV_qtwebengine}" |
165 | 164 | ||
166 | SRCREV_FORMAT = "qtwebengine_chromium" | 165 | SRCREV_FORMAT = "qtwebengine_chromium" |