diff --git a/recipes-kde/porting-aids-tier3/kjsembed/kjsembed-native.bb b/recipes-kde/porting-aids-tier3/kjsembed/kjsembed-native.bb deleted file mode 100644 index de74a5fd..00000000 --- a/recipes-kde/porting-aids-tier3/kjsembed/kjsembed-native.bb +++ /dev/null @@ -1,5 +0,0 @@ -require ${BPN}.inc - -inherit native - -DEPENDS += "qttools-native qtsvg-native" diff --git a/recipes-kde/porting-aids-tier3/kjsembed/kjsembed.bb b/recipes-kde/porting-aids-tier3/kjsembed/kjsembed.bb index 6ea334c5..23a31cde 100644 --- a/recipes-kde/porting-aids-tier3/kjsembed/kjsembed.bb +++ b/recipes-kde/porting-aids-tier3/kjsembed/kjsembed.bb @@ -1,12 +1,23 @@ -require ${BPN}.inc +SUMMARY = "Embedded JS" +LICENSE = "LGPLv2.1" +LIC_FILES_CHKSUM = " \ + file://COPYING.LIB;md5=2d5025d4aa3495befef8f17206a5b0a1 \ +" -inherit cmake-lib +require ../../kf5-version.inc -DEPENDS += "${BPN}-native qtsvg qttools" +inherit kde cmake-lib + +SRCREV = "72645d0ca8942b2550377567fe861183de8ab038" + +DEPENDS += "qtsvg qttools kjs ki18n kdoctools" # cross libs / headers CMAKE_HIDE_ERROR[1] = "KF5JsEmbed, -S${libdir}/lib, -S${STAGING_LIBDIR}/lib" CMAKE_HIDE_ERROR[2] = "KF5JsEmbed, -S${includedir}, -S${STAGING_INCDIR}" -# native executables -CMAKE_HIDE_ERROR[3] = "KF5JsEmbed, -S${bindir}, -S${STAGING_BINDIR_NATIVE}" +# HACK for kjscmd5: to avoid more native qt5 extensions we simply link to icemaker +# created by kjs-native which is in the dependency chain by kjs. kjs-native has +# only few dependencies and nothing needs kjscmd5 to build. The only reason to +# do this hack is to make cmake checks happy. +CMAKE_HIDE_ERROR[3] = "KF5JsEmbed, -S${bindir}/kjscmd5, -S${STAGING_BINDIR_NATIVE}/icemaker" diff --git a/recipes-kde/porting-aids-tier3/kjsembed/kjsembed.inc b/recipes-kde/porting-aids-tier3/kjsembed/kjsembed.inc deleted file mode 100644 index 8a01356f..00000000 --- a/recipes-kde/porting-aids-tier3/kjsembed/kjsembed.inc +++ /dev/null @@ -1,13 +0,0 @@ -SUMMARY = "Embedded JS" -LICENSE = "LGPLv2.1" -LIC_FILES_CHKSUM = " \ - file://COPYING.LIB;md5=2d5025d4aa3495befef8f17206a5b0a1 \ -" - -inherit kde - -# kde stuff takes care of native recipes -DEPENDS += "kjs ki18n kdoctools" - -SRCREV = "361d5434b9ff286d8b4d7fab2cc2f2b77289496f" -PV = "5.5.0"