From 05b3e648ec3508f4f73eeb094bdb82440519c56c Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Sat, 18 Apr 2020 15:27:00 -0700 Subject: qtwebkit: Switch to 5.212 branch Drop py3 support patch as its no longer needed on this branch This is more uptodate branch and has needed fixes to work with Qt 5.15 Signed-off-by: Khem Raj --- recipes-qt/qt5/qtwebkit_git.bb | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'recipes-qt/qt5/qtwebkit_git.bb') diff --git a/recipes-qt/qt5/qtwebkit_git.bb b/recipes-qt/qt5/qtwebkit_git.bb index 4655d9fd..a52ae76e 100644 --- a/recipes-qt/qt5/qtwebkit_git.bb +++ b/recipes-qt/qt5/qtwebkit_git.bb @@ -12,7 +12,6 @@ DEPENDS += "qtbase qtdeclarative icu ruby-native sqlite3 glib-2.0 libxslt gperf- # Patches from https://github.com/meta-qt5/qtwebkit/commits/b5.13 # 5.13.meta-qt5.1 SRC_URI += "\ - file://0001-Port-build-to-python3.patch \ file://0002-Do-not-skip-build-for-cross-compile.patch \ file://0003-Fix-build-with-non-glibc-libc-on-musl.patch \ file://0004-Fix-build-bug-for-armv32-BE.patch \ @@ -81,6 +80,6 @@ PACKAGECONFIG[hyphen] = "-DUSE_LIBHYPHEN=ON,-DUSE_LIBHYPHEN=OFF,hyphen" # remove default ${PN}-examples* set in qt5.inc, because they conflicts with ${PN} from separate webkit-examples recipe PACKAGES_remove = "${PN}-examples" -QT_MODULE_BRANCH = "dev" +QT_MODULE_BRANCH = "5.212" -SRCREV = "ab1bd15209abaf7effc51dbc2f272c5681af7223" +SRCREV = "10cd6a106e1c461c774ca166a67b8c835c755ef7" -- cgit v1.2.3