From f5a657d1dc3df4f56bb120a3fdf50037c13afc0c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andreas=20M=C3=BCller?= Date: Wed, 25 Feb 2015 22:22:29 +0100 Subject: [PATCH] kcoreaddons: inherit mime.bbclass instead of depending shared-mime-info MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Andreas Müller --- recipes-kde/kf5/tier1/kcoreaddons/kcoreaddons-native.bb | 2 -- recipes-kde/kf5/tier1/kcoreaddons/kcoreaddons.bb | 2 +- recipes-kde/kf5/tier1/kcoreaddons/kcoreaddons.inc | 2 +- 3 files changed, 2 insertions(+), 4 deletions(-) diff --git a/recipes-kde/kf5/tier1/kcoreaddons/kcoreaddons-native.bb b/recipes-kde/kf5/tier1/kcoreaddons/kcoreaddons-native.bb index 01e3d5b4..05b64f31 100644 --- a/recipes-kde/kf5/tier1/kcoreaddons/kcoreaddons-native.bb +++ b/recipes-kde/kf5/tier1/kcoreaddons/kcoreaddons-native.bb @@ -1,5 +1,3 @@ require ${BPN}.inc inherit native - -DEPENDS += "shared-mime-info-native" diff --git a/recipes-kde/kf5/tier1/kcoreaddons/kcoreaddons.bb b/recipes-kde/kf5/tier1/kcoreaddons/kcoreaddons.bb index ed3dde44..a6764aa3 100644 --- a/recipes-kde/kf5/tier1/kcoreaddons/kcoreaddons.bb +++ b/recipes-kde/kf5/tier1/kcoreaddons/kcoreaddons.bb @@ -2,7 +2,7 @@ require ${BPN}.inc inherit cmake-lib -DEPENDS += "${BPN}-native shared-mime-info" +DEPENDS += "${BPN}-native" # cross libs / headers CMAKE_HIDE_ERROR[1] = "KF5CoreAddons, -S${libdir}/lib, -S${STAGING_LIBDIR}/lib" diff --git a/recipes-kde/kf5/tier1/kcoreaddons/kcoreaddons.inc b/recipes-kde/kf5/tier1/kcoreaddons/kcoreaddons.inc index d4c6e1d6..ebc80186 100644 --- a/recipes-kde/kf5/tier1/kcoreaddons/kcoreaddons.inc +++ b/recipes-kde/kf5/tier1/kcoreaddons/kcoreaddons.inc @@ -4,7 +4,7 @@ LIC_FILES_CHKSUM = " \ file://COPYING.LIB;md5=2d5025d4aa3495befef8f17206a5b0a1 \ " -inherit kde-kf5 +inherit kde-kf5 mime PV = "${KF5_VERSION}" SRC_URI[md5sum] = "7347d864de95d4b5df03bba93ed22ad5"