basesystem-jjsandbox/ToshikazuOhiwa/master-jj

recipes

1 files changed, 13 insertions, 11 deletions

diff --git a/external/meta-qt5/recipes-qt/qt5/qt5-creator_git.bb b/external/meta-qt5/recipes-qt/qt5/qt5-creator_git.bb
index 6a8887ed..3c3420ca 100644
--- a/external/meta-qt5/recipes-qt/qt5/qt5-creator_git.bb
+++ b/external/meta-qt5/recipes-qt/qt5/qt5-creator_git.bb
@@ -12,23 +12,22 @@ LIC_FILES_CHKSUM = " \
     file://LICENSE.GPL3-EXCEPT;md5=763d8c535a234d9a3fb682c7ecb6c073 \
 "
 
-inherit qmake5
+inherit qmake5 mime-xdg
 
-DEPENDS = "qtbase qtscript qtwebkit qtxmlpatterns qtx11extras qtdeclarative qttools qttools-native qtsvg chrpath-replacement-native"
+DEPENDS += "qtbase qtscript qtxmlpatterns qtx11extras qtdeclarative qttools qttools-native qtsvg chrpath-replacement-native zlib"
 DEPENDS_append_toolchain-clang = " clang llvm-common"
 DEPENDS_append_libc-musl = " libexecinfo"
 
-SRCREV = "8768e39d3c8e74e583eca3897cc6de53a99c3dde"
-PV = "4.7.1+git${SRCPV}"
+SRCREV = "8181363fa90eb651591bf71e1a840e1c998429f4"
+PV = "4.9.2+git${SRCPV}"
 
-# Patches from https://github.com/meta-qt5/qtcreator/commits/b4.7.1
-# 4.7.1.meta-qt5.1
+# Patches from https://github.com/meta-qt5/qtcreator/commits/b4.9.2
+# 4.9.2.meta-qt5.1
 SRC_URI = " \
-    git://code.qt.io/qt-creator/qt-creator.git;branch=4.7 \
-    file://0002-botan.pro-pass-QMAKE_AR.patch \
-    file://0001-botan-Always-define-BOTAN_ARCH_SWITCH-when-cross-bui.patch \
+    git://code.qt.io/qt-creator/qt-creator.git;branch=4.9 \
+    file://0001-clangformat-AllowShortIfStatementsOnASingleLine-is-n.patch \
 "
-SRC_URI_append_libc-musl = " file://0003-Link-with-libexecinfo-on-musl.patch"
+SRC_URI_append_libc-musl = " file://0001-Link-with-libexecinfo-on-musl.patch"
 
 S = "${WORKDIR}/git"
 
@@ -36,6 +35,9 @@ EXTRA_QMAKEVARS_PRE += "IDE_LIBRARY_BASENAME=${baselib}${QT_DIR_NAME}"
 
 EXTRANATIVEPATH += "chrpath-native"
 
+COMPATIBLE_HOST_toolchain-clang_riscv32 = "null"
+COMPATIBLE_HOST_toolchain-clang_riscv64 = "null"
+
 do_configure_append() {
     # Find native tools
     sed -i 's:${STAGING_BINDIR}.*/qdoc:${OE_QMAKE_PATH_EXTERNAL_HOST_BINS}/qdoc:g' ${B}/Makefile
@@ -67,7 +69,7 @@ FILES_${PN}-dev += " \
     ${libdir}${QT_DIR_NAME}/qtcreator/*${SOLIBSDEV} \
 "
 
-RDEPENDS_${PN} += "perl python"
+RDEPENDS_${PN} += "perl python3"
 RCONFLICTS_${PN} = "qt-creator"
 
 # To give best user experience out of the box..