Kirkstone compatible

classes/qmake2.bbclass

@@ -3,7 +3,7 @@
 #
 inherit qmake_base
 
-DEPENDS_prepend = "qt4-tools-native "
+DEPENDS:prepend = "qt4-tools-native "
 
 export QMAKESPEC = "${STAGING_DATADIR}/qt4/mkspecs/${TARGET_OS}-oe-g++"
 export OE_QMAKE_QT_CONFIG = "${STAGING_DATADIR}/qt4/mkspecs/qconfig.pri"

classes/qt4e.bbclass

@@ -1,5 +1,5 @@
 QT4EDEPENDS ?= "qt4-embedded "
-DEPENDS_prepend = "${QT4EDEPENDS}"
+DEPENDS:prepend = "${QT4EDEPENDS}"
 
 inherit qmake2
 

classes/qt4x11.bbclass

@@ -1,5 +1,5 @@
 QT4DEPENDS ?= "qt4-x11 "
-DEPENDS_prepend = "${QT4DEPENDS}"
+DEPENDS:prepend = "${QT4DEPENDS}"
 
 # depends on qt4-x11
 REQUIRED_DISTRO_FEATURES += "x11"

conf/layer.conf

@@ -8,4 +8,4 @@ BBFILE_COLLECTIONS += "qt4-layer"
 BBFILE_PATTERN_qt4-layer = "^${LAYERDIR}/"
 BBFILE_PRIORITY_qt4-layer = "6"
 
-LAYERSERIES_COMPAT_qt4-layer = "thud warrior zeus dunfell"
+LAYERSERIES_COMPAT_qt4-layer = "thud warrior zeus dunfell kirkstone"

recipes-qt4/meta/meta-toolchain-qt.inc

@@ -6,7 +6,7 @@ require recipes-core/meta/meta-toolchain.bb
 
 QT_TOOLS_PREFIX = "$OECORE_NATIVE_SYSROOT${bindir_nativesdk}"
 
-create_sdk_files_append() {
+create_sdk_files:append() {
     mkdir -p ${SDK_OUTPUT}${SDKPATHNATIVE}/environment-setup.d/
     script=${SDK_OUTPUT}${SDKPATHNATIVE}/environment-setup.d/${QT_DIR_NAME}.sh
 

recipes-qt4/packagegroups/nativesdk-packagegroup-qt-toolchain-host.inc

@@ -3,4 +3,4 @@ require recipes-core/packagegroups/nativesdk-packagegroup-sdk-host.bb
 DESCRIPTION = "Host packages for Qt Embedded SDK"
 LICENSE = "MIT"
 
-RDEPENDS_${PN} += "nativesdk-qt4-tools"
+RDEPENDS:${PN} += "nativesdk-qt4-tools"

recipes-qt4/packagegroups/packagegroup-core-qt.bb

@@ -18,5 +18,5 @@ PACKAGES = "${PN}-demoapps"
 
 QTDEMOS ?= "quicky qmmp fotowall"
 
-SUMMARY_${PN}-demoapps = "Qt demo applications"
-RDEPENDS_${PN}-demoapps = "${QTDEMOS}"
+SUMMARY:${PN}-demoapps = "Qt demo applications"
+RDEPENDS:${PN}-demoapps = "${QTDEMOS}"

recipes-qt4/packagegroups/packagegroup-core-qt4e.bb

@@ -9,7 +9,7 @@ inherit packagegroup
 
 TOUCH = ' ${@bb.utils.contains("MACHINE_FEATURES", "touchscreen", "tslib tslib-calibrate tslib-tests qt4-embedded-plugin-mousedriver-tslib", "",d)}'
 
-RDEPENDS_${PN} = " \
+RDEPENDS:${PN} = " \
 	qt4-embedded \
 	libqt-embedded3support4 \
 	libqt-embeddedclucene4 \
@@ -43,7 +43,7 @@ RDEPENDS_${PN} = " \
         qt4-embedded-assistant \
 "
 
-RRECOMMENDS_${PN} = " \
+RRECOMMENDS:${PN} = " \
 	libqt-embeddedxmlpatterns4 \
 	qt4-embedded-plugin-phonon-backend-gstreamer \
 	${TOUCH} \

recipes-qt4/packagegroups/packagegroup-qt-toolchain-target.bb

@@ -8,7 +8,7 @@ inherit features_check
 # depends on qt4-x11-free
 REQUIRED_DISTRO_FEATURES = "x11"
 
-RDEPENDS_${PN} += " \
+RDEPENDS:${PN} += " \
         qt4-x11-free-dev \
         ${@bb.utils.contains('DISTRO_FEATURES', 'opengl', 'libqtopengl4-dev', '', d)} \
         ${@bb.utils.contains('DISTRO_FEATURES', 'openvg', 'libqtopenvg4-dev', '', d)} \

recipes-qt4/packagegroups/packagegroup-qt-toolchain-target.inc

@@ -7,7 +7,7 @@ inherit packagegroup
 
 PACKAGEGROUP_DISABLE_COMPLEMENTARY = "1"
 
-RDEPENDS_${PN} += " \
+RDEPENDS:${PN} += " \
         packagegroup-core-standalone-sdk-target \
         qt4${QTLIBPREFIX}-mkspecs \
         libqt${QTLIBPREFIX}multimedia4-dev \
@@ -34,6 +34,6 @@ RDEPENDS_${PN} += " \
         expat-dev \
         "
 
-RRECOMMENDS_${PN} += " \
+RRECOMMENDS:${PN} += " \
         libqt${QTLIBPREFIX}phonon4-dev \
         "

recipes-qt4/qt-apps/fotowall_0.9.bb

@@ -26,4 +26,4 @@ do_install() {
 }
 
 # Ensure we have some plugins for some useful image formats
-RRECOMMENDS_${PN} += "qt4-plugin-imageformat-gif qt4-plugin-imageformat-jpeg qt4-plugin-imageformat-tiff"
+RRECOMMENDS:${PN} += "qt4-plugin-imageformat-gif qt4-plugin-imageformat-jpeg qt4-plugin-imageformat-tiff"

recipes-qt4/qt-apps/qmmp_0.8.6.bb

@@ -52,7 +52,7 @@ do_configure() {
 
 PACKAGES_DYNAMIC += "^qmmp-plugin-.* "
 
-python populate_packages_prepend () {
+python populate_packages:prepend () {
     qmmp_libdir = d.expand('${libdir}/qmmp')
     gd = d.expand('${D}/${libdir}/qmmp')
     plug_dirs = os.listdir(gd)
@@ -62,16 +62,16 @@ python populate_packages_prepend () {
         do_split_packages(d, g_plug_dir, '^lib(.*)\.so$', 'qmmp-plugin-' + plug_dir.lower() + '-%s', 'Qmmp ' + plug_dir  + ' plugin for %s')
 }
 
-FILES_${PN} = "\
+FILES:${PN} = "\
                 ${bindir}/qmmp \
                 ${libdir}/lib*${SOLIBS} \
                 ${datadir}/icons/* \
                 ${datadir}/qmmp/images/* \
                 ${datadir}/applications/* \
                 "
 
-FILES_${PN}-dbg += "\
+FILES:${PN}-dbg += "\
                 ${libdir}/qmmp/*/.debug/* \
                "
 
-RDEPENDS_${PN} += "taglib alsa-lib libmad curl libicui18n"
+RDEPENDS:${PN} += "taglib alsa-lib libmad curl libicui18n"

recipes-qt4/qt4-graphics-system/qt4-graphics-system_1.0.bb

@@ -20,6 +20,6 @@ do_install () {
 	echo "export QT_GRAPHICSSYSTEM=${QT_GRAPHICS_SYSTEM}" > $cfg_file
 }
 
-RDEPENDS_${PN} = "${@_get_extra_rdepends(d)}"
+RDEPENDS:${PN} = "${@_get_extra_rdepends(d)}"
 
 PACKAGE_ARCH = "${MACHINE_ARCH}"

recipes-qt4/qt4/qt4-4.8.7.inc

@@ -54,19 +54,19 @@ CXXFLAGS += "-Wno-deprecated -DUCHAR_TYPE=wchar_t"
 # disable webkit for mips64 n32 temporarily that fails to compile,
 # qt upstream defect:
 # https://bugreports.qt-project.org/browse/QTBUG-39224
-QT_CONFIG_FLAGS_append_mips64n32 = " -no-webkit"
+QT_CONFIG_FLAGS:append_mips64n32 = " -no-webkit"
 
 # disable webkit for aarch64 temporarily that fails to compile
-QT_CONFIG_FLAGS_append_aarch64 = " -no-webkit"
+QT_CONFIG_FLAGS:append_aarch64 = " -no-webkit"
 
-FILES_${QT_BASE_NAME}-tools_append     = " ${bindir}/qml ${bindir}/qmlplugindump"
-FILES_${QT_BASE_NAME}-tools-dbg_append = " ${bindir}/.debug/qml ${bindir}/.debug/qmlplugindump"
+FILES_${QT_BASE_NAME}-tools:append     = " ${bindir}/qml ${bindir}/qmlplugindump"
+FILES_${QT_BASE_NAME}-tools-dbg:append = " ${bindir}/.debug/qml ${bindir}/.debug/qmlplugindump"
 
-PACKAGES_append = " ${QT_BASE_NAME}-tests-dbg ${QT_BASE_NAME}-tests"
+PACKAGES:append = " ${QT_BASE_NAME}-tests-dbg ${QT_BASE_NAME}-tests"
 FILES_${QT_BASE_NAME}-tests-dbg        = "${prefix}/tests/qt4/*/.debug"
 FILES_${QT_BASE_NAME}-tests            = "${prefix}/tests/qt4/*"
 
-do_configure_prepend() {
+do_configure:prepend() {
     sed -i 's:qtPrepareTool(LRELEASE, lrelease):LRELEASE = ${OE_QMAKE_LRELEASE}:g' \
         ${S}/translations/translations.pro
 

recipes-qt4/qt4/qt4-embedded.inc

@@ -31,7 +31,7 @@ QT_CONFIG_FLAGS += "${QT_EMBEDDED_FLAGS} ${QT_EMBEDDED_EXTRA_FLAGS} ${QT_EMBEDDE
 
 require qt4.inc
 
-do_install_append() {
+do_install:append() {
     install -d ${D}/${libdir}/fonts
     touch ${D}/${libdir}/fonts/fontdir
 
@@ -42,8 +42,8 @@ do_install_append() {
 # We put the qte profile into it's own package as we don't want to install all qt stuff
 # with depending on the global package qt4-embedded
 PACKAGES += " ${PN}-conf"
-FILES_${PN}-conf += " ${sysconfdir}/profile.d/qte.sh"
-RRECOMMENDS_${PN} += " ${PN}-conf"
+FILES:${PN}-conf += " ${sysconfdir}/profile.d/qte.sh"
+RRECOMMENDS:${PN} += " ${PN}-conf"
 
 OTHER_PACKAGES += "\
              ${QT_BASE_NAME}-fonts \

recipes-qt4/qt4/qt4-embedded_4.8.7.bb

@@ -1,7 +1,7 @@
 require qt4-${PV}.inc
 require qt4-embedded.inc
 
-QT_CONFIG_FLAGS_append_arm = "${@bb.utils.contains("TUNE_FEATURES", "neon", "", " -no-neon" ,d)}"
+QT_CONFIG_FLAGS:append_arm = "${@bb.utils.contains("TUNE_FEATURES", "neon", "", " -no-neon" ,d)}"
 
 QT_CONFIG_FLAGS += " \
  -exceptions \

recipes-qt4/qt4/qt4-native.inc

@@ -47,7 +47,10 @@ EXTRA_OECONF = "-prefix ${prefix} \
                 -examplesdir ${bindir}/qt4/examples \
                 -demosdir ${bindir}/qt4/demos \
                 -L ${STAGING_LIBDIR_NATIVE} \
+                -ldbus-1 \
                 -I ${STAGING_INCDIR_NATIVE} \
+                -I ${STAGING_INCDIR_NATIVE}/dbus-1.0 \
+                -I ${STAGING_LIBDIR_NATIVE}/dbus-1.0/include \
                 -qt-libjpeg -system-zlib \
                 -no-libjpeg -no-libpng -no-libmng -no-libtiff \
                 -no-accessibility \
@@ -59,7 +62,7 @@ EXTRA_OECONF = "-prefix ${prefix} \
                 -exceptions -xmlpatterns \
                 -qt3support \
                 -no-pch \
-                -no-fast -silent -no-rpath"
+                -no-fast -silent -no-rpath -dbus -qdbus"
 
 # yank default -e, otherwise we get the following error:
 # moc_qbuffer.cpp: No such file or directory

recipes-qt4/qt4/qt4-x11-free.inc

@@ -22,7 +22,7 @@ QT_DISTRO_FLAGS ?= "${QT_KDE_FLAGS}"
 
 inherit qt4x11
 
-do_install_append() {
+do_install:append() {
   # fix pkgconfig, libtool and prl files
   sed -i -e 's#I/usr/include#Iincludedir}#g' \ 
     -e 's#Iin#I${in#g' \

recipes-qt4/qt4/qt4-x11-free_4.8.7.bb

@@ -1,7 +1,7 @@
 require qt4-x11-free.inc
 require qt4-${PV}.inc
 
-QT_CONFIG_FLAGS_append_arm = "${@bb.utils.contains("TUNE_FEATURES", "neon", "", " -no-neon" ,d)}"
+QT_CONFIG_FLAGS:append_arm = "${@bb.utils.contains("TUNE_FEATURES", "neon", "", " -no-neon" ,d)}"
 
 QT_CONFIG_FLAGS += " \
  -no-embedded \

recipes-qt4/qt4/qt4.inc

@@ -128,14 +128,14 @@ PACKAGES += " \
 
 PACKAGES_DYNAMIC += "^${QT_BASE_NAME}-plugin-.* ^${QT_BASE_NAME}-translation-.* ^${QT_BASE_NAME}-phrasebook-.*"
 
-ALLOW_EMPTY_${PN} = "1"
-FILES_${PN}     = ""
-FILES_${PN}-dev = "${includedir}/${QT_DIR_NAME}/Qt/*"
+ALLOW_EMPTY:${PN} = "1"
+FILES:${PN}     = ""
+FILES:${PN}-dev = "${includedir}/${QT_DIR_NAME}/Qt/*"
 FILES_${QT_BASE_NAME}-demos-doc = "${docdir}/${QT_DIR_NAME}/qch/qt.qch"
-RRECOMMENDS_${PN} = "${LIB_PACKAGES} ${OTHER_PACKAGES}"
-RRECOMMENDS_${PN}-dev = "${DEV_PACKAGES}"
-RRECOMMENDS_${PN}-dbg = "${DBG_PACKAGES}"
-RRECOMMENDS_${QT_BASE_LIB}core4_append_libc-glibc = " glibc-gconv-utf-16"
+RRECOMMENDS:${PN} = "${LIB_PACKAGES} ${OTHER_PACKAGES}"
+RRECOMMENDS:${PN}-dev = "${DEV_PACKAGES}"
+RRECOMMENDS:${PN}-dbg = "${DBG_PACKAGES}"
+RRECOMMENDS_${QT_BASE_LIB}core4:append_libc-glibc = " glibc-gconv-utf-16"
 RRECOMMENDS_${QT_BASE_NAME}-demos += " \
             ${QT_BASE_NAME}-examples \
             ${QT_BASE_NAME}-plugin-sqldriver-sqlite \
@@ -202,6 +202,7 @@ do_configure() {
 
 	if [ ! -e bin/qmake ]; then
 		ln -sf ${STAGING_BINDIR_NATIVE}/qmake2 bin/qmake
+#		ln -sf ${STAGING_BINDIR_NATIVE}/moc bin/moc
 	fi
 
 	if [ ! -e mkspecs/${TARGET_OS}-oe-g++ ]; then
@@ -273,7 +274,7 @@ do_compile() {
     cd ${S}
 }
 
-python populate_packages_prepend() {
+python populate_packages:prepend() {
     translation_dir = d.expand('${datadir}/${QT_DIR_NAME}/translations/')
     translation_name = d.expand('${QT_BASE_NAME}-translation-%s')
     do_split_packages(d, translation_dir, '^(assistant|designer|linguist|qt|qtconfig|qvfb|qtscript)_(.*)\.qm$', translation_name, '${PN} translation for %s', extra_depends='' )

recipes-qt4/recipes-libs/qwt.inc

@@ -11,7 +11,7 @@ SRC_URI = "${SOURCEFORGE_MIRROR}/qwt/qwt-${PV}.tar.bz2;name=qwt \
 
 S = "${WORKDIR}/qwt-${PV}"
 
-do_configure_prepend() {
+do_configure:prepend() {
     sed -i -e 's:RELEASE_SUFFIX      = :RELEASE_SUFFIX      = ${QT_LIBINFIX}:' *.pri
     sed -i -e 's:qtAddLibrary(qwt:qtAddLibrary(qwt)${QT_LIBINFIX}:g' *.prf
     sed -e 's/# QWT_CONFIG     += QwtExamples/QWT_CONFIG     += QwtExamples/g' -i qwtconfig.pri
@@ -33,8 +33,8 @@ do_install() {
     mv ${D}${prefix}/plugins ${D}${libdir}/${QT_DIR_NAME}
 }
 
-PACKAGES_prepend = "${PN}-examples ${PN}-features ${PN}-plugins "
-FILES_${PN}-examples = "${bindir}/*"
-FILES_${PN}-features = "${prefix}/features"
-FILES_${PN}-plugins = "${libdir}/${QT_DIR_NAME}/plugins/designer/*.so"
-FILES_${PN}-dbg += "${libdir}/${QT_DIR_NAME}/plugins/designer/.debug"
+PACKAGES:prepend = "${PN}-examples ${PN}-features ${PN}-plugins "
+FILES:${PN}-examples = "${bindir}/*"
+FILES:${PN}-features = "${prefix}/features"
+FILES:${PN}-plugins = "${libdir}/${QT_DIR_NAME}/plugins/designer/*.so"
+FILES:${PN}-dbg += "${libdir}/${QT_DIR_NAME}/plugins/designer/.debug"

recipes-qt4/recipes-libs/qwt_6.0.1.bb

@@ -7,7 +7,7 @@ PR = "r1"
 SRC_URI[qwt.md5sum] = "ace68558eab873e2da7e641179c4ef0c"
 SRC_URI[qwt.sha256sum] = "3fe19dd5962d705632fc2ef616b009299de6cf1e702538296924dbfdc8003cb2"
 
-RPROVIDES_${PN}-dev = "libqwt-dev"
+RPROVIDES:${PN}-dev = "libqwt-dev"
 
-INSANE_SKIP_${PN} += "already-stripped"
+INSANE_SKIP:${PN} += "already-stripped"
 

recipes-qt4/recipes-python/python-pyqt_4.12.bb

@@ -18,13 +18,13 @@ S = "${WORKDIR}/PyQt4_gpl_x11-${PV}"
 
 PARALLEL_MAKE = ""
 
-inherit qmake2 pythonnative python-dir features_check
+inherit qmake2 python3native python3-dir features_check
 # depends on qt4-x11-free
 REQUIRED_DISTRO_FEATURES = "x11"
 
 DISABLED_FEATURES = "PyQt_Desktop_OpenGL PyQt_Accessibility PyQt_SessionManager PyQt_OpenSSL"
 
-DISABLED_FEATURES_append_arm = " PyQt_qreal_double"
+DISABLED_FEATURES:append_arm = " PyQt_qreal_double"
 
 PYQT_MODULES = "QtCore QtGui QtDeclarative QtNetwork QtSvg QtWebKit"
 PYQT_MODULES_aarch64 = "QtCore QtGui QtDeclarative QtNetwork QtSvg"
@@ -48,8 +48,8 @@ do_install() {
      oe_runmake install
 }
 
-RDEPENDS_${PN} = "python-core python-sip"
+RDEPENDS:${PN} = "python-core python-sip"
 
-FILES_${PN} += "${libdir}/${PYTHON_DIR}/site-packages ${datadir}/sip/PyQt4/"
-FILES_${PN}-dbg += "${libdir}/${PYTHON_DIR}/site-packages/*/.debug/"
+FILES:${PN} += "${libdir}/${PYTHON_DIR}/site-packages ${datadir}/sip/PyQt4/"
+FILES:${PN}-dbg += "${libdir}/${PYTHON_DIR}/site-packages/*/.debug/"