From a639d3fd415c175f995e5e5b818cd5c34c2e24f8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andreas=20M=C3=BCller?= Date: Thu, 29 Jan 2015 09:47:34 +0100 Subject: [PATCH] use cental version for kf5 tier2 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Andreas Müller --- recipes-kde/framework-tier2/kauth/kauth.inc | 3 ++- .../kcompletion/{kcompletion_5.7.0.bb => kcompletion.bb} | 2 ++ .../framework-tier2/kcrash/{kcrash_5.7.0.bb => kcrash.bb} | 2 ++ recipes-kde/framework-tier2/kdoctools/kdoctools.inc | 3 ++- .../kjobwidgets/{kjobwidgets_5.7.0.bb => kjobwidgets.bb} | 2 ++ .../kpackage/{kpackage_5.7.0.bb => kpackage.bb} | 2 ++ recipes-kde/framework-tier2/kpty/{kpty_5.7.0.bb => kpty.bb} | 2 ++ .../{kunitconversion_5.7.0.bb => kunitconversion.bb} | 2 ++ 8 files changed, 16 insertions(+), 2 deletions(-) rename recipes-kde/framework-tier2/kcompletion/{kcompletion_5.7.0.bb => kcompletion.bb} (93%) rename recipes-kde/framework-tier2/kcrash/{kcrash_5.7.0.bb => kcrash.bb} (93%) rename recipes-kde/framework-tier2/kjobwidgets/{kjobwidgets_5.7.0.bb => kjobwidgets.bb} (94%) rename recipes-kde/framework-tier2/kpackage/{kpackage_5.7.0.bb => kpackage.bb} (95%) rename recipes-kde/framework-tier2/kpty/{kpty_5.7.0.bb => kpty.bb} (93%) rename recipes-kde/framework-tier2/kunitconversion/{kunitconversion_5.7.0.bb => kunitconversion.bb} (93%) diff --git a/recipes-kde/framework-tier2/kauth/kauth.inc b/recipes-kde/framework-tier2/kauth/kauth.inc index 50a0d0ec..7430cd0e 100644 --- a/recipes-kde/framework-tier2/kauth/kauth.inc +++ b/recipes-kde/framework-tier2/kauth/kauth.inc @@ -4,6 +4,8 @@ LIC_FILES_CHKSUM = " \ file://COPYING.LIB;md5=2d5025d4aa3495befef8f17206a5b0a1 \ " +require ../../kf5-version.inc + inherit kde SRC_URI += " \ @@ -11,6 +13,5 @@ SRC_URI += " \ file://0002-align-installation-location-for-helpers.patch \ " SRCREV = "9f162d6ef8cc5b5d468b9ba2092684b9b256e089" -PV = "5.7.0" EXTRA_OECMAKE += "-DAUTOTESTS=OFF" diff --git a/recipes-kde/framework-tier2/kcompletion/kcompletion_5.7.0.bb b/recipes-kde/framework-tier2/kcompletion/kcompletion.bb similarity index 93% rename from recipes-kde/framework-tier2/kcompletion/kcompletion_5.7.0.bb rename to recipes-kde/framework-tier2/kcompletion/kcompletion.bb index 3003a51f..d734d5e8 100644 --- a/recipes-kde/framework-tier2/kcompletion/kcompletion_5.7.0.bb +++ b/recipes-kde/framework-tier2/kcompletion/kcompletion.bb @@ -4,6 +4,8 @@ LIC_FILES_CHKSUM = " \ file://COPYING.LIB;md5=2d5025d4aa3495befef8f17206a5b0a1 \ " +require ../../kf5-version.inc + inherit kde cmake-lib DEPENDS += "kconfig kwidgetsaddons" diff --git a/recipes-kde/framework-tier2/kcrash/kcrash_5.7.0.bb b/recipes-kde/framework-tier2/kcrash/kcrash.bb similarity index 93% rename from recipes-kde/framework-tier2/kcrash/kcrash_5.7.0.bb rename to recipes-kde/framework-tier2/kcrash/kcrash.bb index eb4ec026..8445ced4 100644 --- a/recipes-kde/framework-tier2/kcrash/kcrash_5.7.0.bb +++ b/recipes-kde/framework-tier2/kcrash/kcrash.bb @@ -4,6 +4,8 @@ LIC_FILES_CHKSUM = " \ file://COPYING.LIB;md5=2d5025d4aa3495befef8f17206a5b0a1 \ " +require ../../kf5-version.inc + inherit kde cmake-lib DEPENDS += "kcoreaddons kwindowsystem" diff --git a/recipes-kde/framework-tier2/kdoctools/kdoctools.inc b/recipes-kde/framework-tier2/kdoctools/kdoctools.inc index d45d4b5c..10161ae5 100644 --- a/recipes-kde/framework-tier2/kdoctools/kdoctools.inc +++ b/recipes-kde/framework-tier2/kdoctools/kdoctools.inc @@ -5,6 +5,8 @@ LIC_FILES_CHKSUM = " \ file://LICENSE;md5=d975629b732b61cb58f9595c6baa9379 \ " +require ../../kf5-version.inc + inherit kde # allarch recipes can go here @@ -17,7 +19,6 @@ OECMAKE_EXTRA_ROOT_PATH = "${STAGING_DIR}/${MACHINE}" EXTRA_OECMAKE += "-DOE_ROOT_PATH_PREFIX=${STAGING_DIR}/${MACHINE}/usr" SRCREV = "93b844cdcfde640acfb231429c1c685de2c3cc4f" -PV = "5.7.0" SRC_URI += " \ file://0001-Add-cmdline-param-to-help-find-xsl.patch \ diff --git a/recipes-kde/framework-tier2/kjobwidgets/kjobwidgets_5.7.0.bb b/recipes-kde/framework-tier2/kjobwidgets/kjobwidgets.bb similarity index 94% rename from recipes-kde/framework-tier2/kjobwidgets/kjobwidgets_5.7.0.bb rename to recipes-kde/framework-tier2/kjobwidgets/kjobwidgets.bb index cbf95e83..197b5f3c 100644 --- a/recipes-kde/framework-tier2/kjobwidgets/kjobwidgets_5.7.0.bb +++ b/recipes-kde/framework-tier2/kjobwidgets/kjobwidgets.bb @@ -4,6 +4,8 @@ LIC_FILES_CHKSUM = " \ file://COPYING.LIB;md5=2d5025d4aa3495befef8f17206a5b0a1 \ " +require ../../kf5-version.inc + inherit kde cmake-lib DEPENDS += "kcoreaddons kwidgetsaddons ${@bb.utils.contains("DISTRO_FEATURES", "x11", "qtx11extras", "", d)}" diff --git a/recipes-kde/framework-tier2/kpackage/kpackage_5.7.0.bb b/recipes-kde/framework-tier2/kpackage/kpackage.bb similarity index 95% rename from recipes-kde/framework-tier2/kpackage/kpackage_5.7.0.bb rename to recipes-kde/framework-tier2/kpackage/kpackage.bb index 525ce737..beb32c57 100644 --- a/recipes-kde/framework-tier2/kpackage/kpackage_5.7.0.bb +++ b/recipes-kde/framework-tier2/kpackage/kpackage.bb @@ -5,6 +5,8 @@ LIC_FILES_CHKSUM = " \ file://COPYING.LIB;md5=2d5025d4aa3495befef8f17206a5b0a1 \ " +require ../../kf5-version.inc + inherit kde cmake-lib DEPENDS += "karchive ki18n kcoreaddons kconfig kdoctools" diff --git a/recipes-kde/framework-tier2/kpty/kpty_5.7.0.bb b/recipes-kde/framework-tier2/kpty/kpty.bb similarity index 93% rename from recipes-kde/framework-tier2/kpty/kpty_5.7.0.bb rename to recipes-kde/framework-tier2/kpty/kpty.bb index f853cc72..9c1c3d1f 100644 --- a/recipes-kde/framework-tier2/kpty/kpty_5.7.0.bb +++ b/recipes-kde/framework-tier2/kpty/kpty.bb @@ -5,6 +5,8 @@ LIC_FILES_CHKSUM = " \ file://COPYING.LIB;md5=2d5025d4aa3495befef8f17206a5b0a1 \ " +require ../../kf5-version.inc + inherit kde cmake-lib DEPENDS += "kcoreaddons ki18n" diff --git a/recipes-kde/framework-tier2/kunitconversion/kunitconversion_5.7.0.bb b/recipes-kde/framework-tier2/kunitconversion/kunitconversion.bb similarity index 93% rename from recipes-kde/framework-tier2/kunitconversion/kunitconversion_5.7.0.bb rename to recipes-kde/framework-tier2/kunitconversion/kunitconversion.bb index c96140e6..4c50f2e2 100644 --- a/recipes-kde/framework-tier2/kunitconversion/kunitconversion_5.7.0.bb +++ b/recipes-kde/framework-tier2/kunitconversion/kunitconversion.bb @@ -4,6 +4,8 @@ LIC_FILES_CHKSUM = " \ file://COPYING.LIB;md5=2d5025d4aa3495befef8f17206a5b0a1 \ " +require ../../kf5-version.inc + inherit kde cmake-lib DEPENDS += "ki18n"