diff options
Diffstat (limited to 'recipes-qt/qt5/qtwebengine_git.bb')
| -rw-r--r-- | recipes-qt/qt5/qtwebengine_git.bb | 15 |
1 files changed, 12 insertions, 3 deletions
diff --git a/recipes-qt/qt5/qtwebengine_git.bb b/recipes-qt/qt5/qtwebengine_git.bb index 0262d9bd..36561214 100644 --- a/recipes-qt/qt5/qtwebengine_git.bb +++ b/recipes-qt/qt5/qtwebengine_git.bb | |||
| @@ -79,10 +79,17 @@ COMPATIBLE_MACHINE_aarch64 = "(.*)" | |||
| 79 | 79 | ||
| 80 | inherit qmake5 | 80 | inherit qmake5 |
| 81 | inherit gettext | 81 | inherit gettext |
| 82 | inherit pythonnative | ||
| 83 | inherit perlnative | 82 | inherit perlnative |
| 84 | inherit features_check | 83 | inherit features_check |
| 85 | 84 | ||
| 85 | inherit ${@bb.utils.contains("BBFILE_COLLECTIONS", "meta-python2", "pythonnative", "", d)} | ||
| 86 | |||
| 87 | python() { | ||
| 88 | if 'meta-python2' not in d.getVar('BBFILE_COLLECTIONS').split(): | ||
| 89 | raise bb.parse.SkipRecipe('Requires meta-python2 to be present.') | ||
| 90 | } | ||
| 91 | |||
| 92 | |||
| 86 | # Static builds of QtWebEngine aren't supported. | 93 | # Static builds of QtWebEngine aren't supported. |
| 87 | CONFLICT_DISTRO_FEATURES = "qt5-static" | 94 | CONFLICT_DISTRO_FEATURES = "qt5-static" |
| 88 | 95 | ||
| @@ -138,7 +145,7 @@ RDEPENDS_${PN}-examples += " \ | |||
| 138 | QT_MODULE_BRANCH_CHROMIUM = "77-based" | 145 | QT_MODULE_BRANCH_CHROMIUM = "77-based" |
| 139 | 146 | ||
| 140 | # Patches from https://github.com/meta-qt5/qtwebengine/commits/b5.14 | 147 | # Patches from https://github.com/meta-qt5/qtwebengine/commits/b5.14 |
| 141 | # 5.14.meta-qt5.1 | 148 | # 5.14.meta-qt5.2 |
| 142 | SRC_URI += " \ | 149 | SRC_URI += " \ |
| 143 | ${QT_GIT}/qtwebengine-chromium.git;name=chromium;branch=${QT_MODULE_BRANCH_CHROMIUM};protocol=${QT_GIT_PROTOCOL};destsuffix=git/src/3rdparty \ | 150 | ${QT_GIT}/qtwebengine-chromium.git;name=chromium;branch=${QT_MODULE_BRANCH_CHROMIUM};protocol=${QT_GIT_PROTOCOL};destsuffix=git/src/3rdparty \ |
| 144 | file://0001-Force-host-toolchain-configuration.patch \ | 151 | file://0001-Force-host-toolchain-configuration.patch \ |
| @@ -150,7 +157,7 @@ SRC_URI_append_libc-musl = "\ | |||
| 150 | " | 157 | " |
| 151 | 158 | ||
| 152 | # Patches from https://github.com/meta-qt5/qtwebengine-chromium/commits/77-based | 159 | # Patches from https://github.com/meta-qt5/qtwebengine-chromium/commits/77-based |
| 153 | # 77-based.meta-qt5.1 | 160 | # 77-based.meta-qt5.2 |
| 154 | SRC_URI += " \ | 161 | SRC_URI += " \ |
| 155 | file://chromium/0001-chromium-workaround-for-too-long-.rps-file-name.patch;patchdir=src/3rdparty \ | 162 | file://chromium/0001-chromium-workaround-for-too-long-.rps-file-name.patch;patchdir=src/3rdparty \ |
| 156 | file://chromium/0002-chromium-stack-pointer-clobber.patch;patchdir=src/3rdparty \ | 163 | file://chromium/0002-chromium-stack-pointer-clobber.patch;patchdir=src/3rdparty \ |
| @@ -162,6 +169,8 @@ SRC_URI += " \ | |||
| 162 | file://chromium/0008-chromium-Fix-build-on-32bit-arches-with-64bit-time_t.patch;patchdir=src/3rdparty \ | 169 | file://chromium/0008-chromium-Fix-build-on-32bit-arches-with-64bit-time_t.patch;patchdir=src/3rdparty \ |
| 163 | file://chromium/0009-chromium-Include-cstddef-for-size_t-definition.patch;patchdir=src/3rdparty \ | 170 | file://chromium/0009-chromium-Include-cstddef-for-size_t-definition.patch;patchdir=src/3rdparty \ |
| 164 | file://chromium/0010-chromium-Move-CharAllocator-definition-to-a-header-f.patch;patchdir=src/3rdparty \ | 171 | file://chromium/0010-chromium-Move-CharAllocator-definition-to-a-header-f.patch;patchdir=src/3rdparty \ |
| 172 | file://chromium/0011-chromium-Include-cstddef-and-cstdint.patch;patchdir=src/3rdparty \ | ||
| 173 | file://chromium/0012-chromium-Link-v8-with-libatomic-on-x86.patch;patchdir=src/3rdparty \ | ||
| 165 | " | 174 | " |
| 166 | 175 | ||
| 167 | SRC_URI_append_libc-musl = "\ | 176 | SRC_URI_append_libc-musl = "\ |
