From b8b1b99c6d2e2c41585c59b7fd607fd1f55b56ef Mon Sep 17 00:00:00 2001 From: Volker Krause Date: Sat, 29 Jul 2017 18:38:17 +0200 Subject: [PATCH] Make tier 1 frameworks build Summary: Besides dependency and file list updates, this mainly removes the implicit assumption that the requested Git revision is in the master branch. That is not true for frameworks with translations, as those are committed to unnamed branches before tagging. Reviewers: cordlandwehr Reviewed By: cordlandwehr Differential Revision: https://phabricator.kde.org/D6978 --- recipes-kf5/tier1/kcodecs.inc | 4 ++-- recipes-kf5/tier1/kcoreaddons.inc | 3 ++- recipes-kf5/tier1/kdbusaddons.inc | 2 +- recipes-kf5/tier1/kdnssd.inc | 2 +- recipes-kf5/tier1/ki18n.inc | 10 +++++++--- recipes-kf5/tier1/kidletime.inc | 2 +- recipes-kf5/tier1/kitemviews.inc | 2 +- recipes-kf5/tier1/kwidgetsaddons.inc | 4 ++-- recipes-kf5/tier1/kwindowsystem.inc | 6 +++++- recipes-kf5/tier1/solid.inc | 2 +- 10 files changed, 23 insertions(+), 14 deletions(-) diff --git a/recipes-kf5/tier1/kcodecs.inc b/recipes-kf5/tier1/kcodecs.inc index ea00337..72648bf 100644 --- a/recipes-kf5/tier1/kcodecs.inc +++ b/recipes-kf5/tier1/kcodecs.inc @@ -5,9 +5,9 @@ LIC_FILES_CHKSUM = "file://COPYING.LIB;md5=2d5025d4aa3495befef8f17206a5b0a1 \ " PR = "r0" -DEPENDS = "qtbase" +DEPENDS = "qtbase gperf-native" -SRC_URI = "git://anongit.kde.org/kcodecs" +SRC_URI = "git://anongit.kde.org/kcodecs;nobranch=1" S = "${WORKDIR}/git" inherit cmake_kf5 diff --git a/recipes-kf5/tier1/kcoreaddons.inc b/recipes-kf5/tier1/kcoreaddons.inc index 76bb9e3..683b3d2 100644 --- a/recipes-kf5/tier1/kcoreaddons.inc +++ b/recipes-kf5/tier1/kcoreaddons.inc @@ -7,7 +7,7 @@ PR = "r0" DEPENDS = "qtbase" -SRC_URI = "git://anongit.kde.org/kcoreaddons" +SRC_URI = "git://anongit.kde.org/kcoreaddons;nobranch=1" S = "${WORKDIR}/git" inherit cmake_kf5 @@ -19,4 +19,5 @@ FILES_${PN}-dev += " \ FILES_${PN} += " \ /usr/share/mime/packages/kde5.xml \ + /usr/share/kf5/licenses/* \ " diff --git a/recipes-kf5/tier1/kdbusaddons.inc b/recipes-kf5/tier1/kdbusaddons.inc index c018910..cf4a851 100644 --- a/recipes-kf5/tier1/kdbusaddons.inc +++ b/recipes-kf5/tier1/kdbusaddons.inc @@ -7,7 +7,7 @@ PR = "r0" DEPENDS = "qtbase" -SRC_URI = "git://anongit.kde.org/kdbusaddons" +SRC_URI = "git://anongit.kde.org/kdbusaddons;nobranch=1" S = "${WORKDIR}/git" inherit cmake_kf5 diff --git a/recipes-kf5/tier1/kdnssd.inc b/recipes-kf5/tier1/kdnssd.inc index 3378ff5..72fac5c 100644 --- a/recipes-kf5/tier1/kdnssd.inc +++ b/recipes-kf5/tier1/kdnssd.inc @@ -7,7 +7,7 @@ PR = "r0" DEPENDS = "qtbase" -SRC_URI = "git://anongit.kde.org/kdnssd" +SRC_URI = "git://anongit.kde.org/kdnssd;nobranch=1" S = "${WORKDIR}/git" inherit cmake_kf5 diff --git a/recipes-kf5/tier1/ki18n.inc b/recipes-kf5/tier1/ki18n.inc index c051191..26d863b 100644 --- a/recipes-kf5/tier1/ki18n.inc +++ b/recipes-kf5/tier1/ki18n.inc @@ -5,16 +5,20 @@ LIC_FILES_CHKSUM = "file://COPYING.LIB;md5=2d5025d4aa3495befef8f17206a5b0a1 \ " PR = "r0" -DEPENDS = "qtbase qtscript" +DEPENDS = "qtbase qtscript gettext-native" -SRC_URI = "git://anongit.kde.org/ki18n" +SRC_URI = "git://anongit.kde.org/ki18n;nobranch=1" S = "${WORKDIR}/git" inherit cmake_kf5 -inherit perlnative +inherit python3native + +# autotests add an extra dependency on QtQml +EXTRA_OECMAKE += " -DBUILD_TESTING=OFF" FILES_${PN}-dev += " \ ${libdir}/cmake/KF5I18n/*.cmake \ + ${libdir}/cmake/KF5I18n/*.py \ ${prefix}/mkspecs/modules/qt_KI18n.pri \ " diff --git a/recipes-kf5/tier1/kidletime.inc b/recipes-kf5/tier1/kidletime.inc index 587c0c1..3ecc4cd 100644 --- a/recipes-kf5/tier1/kidletime.inc +++ b/recipes-kf5/tier1/kidletime.inc @@ -5,7 +5,7 @@ LIC_FILES_CHKSUM = "file://COPYING.LIB;md5=2d5025d4aa3495befef8f17206a5b0a1 \ " PR = "r0" -DEPENDS = "qtbase" +DEPENDS = "qtbase qtx11extras" SRC_URI = "git://anongit.kde.org/kidletime" S = "${WORKDIR}/git" diff --git a/recipes-kf5/tier1/kitemviews.inc b/recipes-kf5/tier1/kitemviews.inc index c5fa040..76a4bd6 100644 --- a/recipes-kf5/tier1/kitemviews.inc +++ b/recipes-kf5/tier1/kitemviews.inc @@ -7,7 +7,7 @@ PR = "r0" DEPENDS = "qtbase" -SRC_URI = "git://anongit.kde.org/kitemviews" +SRC_URI = "git://anongit.kde.org/kitemviews;nobranch=1" S = "${WORKDIR}/git" inherit cmake_kf5 diff --git a/recipes-kf5/tier1/kwidgetsaddons.inc b/recipes-kf5/tier1/kwidgetsaddons.inc index 5bc0a56..7b6b1e9 100644 --- a/recipes-kf5/tier1/kwidgetsaddons.inc +++ b/recipes-kf5/tier1/kwidgetsaddons.inc @@ -7,7 +7,7 @@ PR = "r0" DEPENDS = "qtbase" -SRC_URI = "git://anongit.kde.org/kwidgetsaddons" +SRC_URI = "git://anongit.kde.org/kwidgetsaddons;nobranch=1" S = "${WORKDIR}/git" inherit cmake_kf5 @@ -19,4 +19,4 @@ FILES_${PN}-dev += " \ FILES_${PN} += " \ /usr/share/kf5/kcharselect/kcharselect-data \ -" \ No newline at end of file +" diff --git a/recipes-kf5/tier1/kwindowsystem.inc b/recipes-kf5/tier1/kwindowsystem.inc index 217f8db..ce70f87 100644 --- a/recipes-kf5/tier1/kwindowsystem.inc +++ b/recipes-kf5/tier1/kwindowsystem.inc @@ -7,11 +7,15 @@ PR = "r0" DEPENDS = "qtbase" -SRC_URI = "git://anongit.kde.org/kwindowsystem" +SRC_URI = "git://anongit.kde.org/kwindowsystem;nobranch=1" S = "${WORKDIR}/git" inherit cmake_kf5 +FILES_${PN} += " \ + ${libdir}/plugins/kf5/org.kde.kwindowsystem.platforms/* \ +" + FILES_${PN}-dev += " \ ${libdir}/cmake/KF5WindowSystem/*.cmake \ ${prefix}/mkspecs/modules/qt_KWindowSystem.pri \ diff --git a/recipes-kf5/tier1/solid.inc b/recipes-kf5/tier1/solid.inc index abb131f..a87d999 100644 --- a/recipes-kf5/tier1/solid.inc +++ b/recipes-kf5/tier1/solid.inc @@ -7,7 +7,7 @@ PR = "r0" DEPENDS = "qtbase" -SRC_URI = "git://anongit.kde.org/solid" +SRC_URI = "git://anongit.kde.org/solid;nobranch=1" S = "${WORKDIR}/git" inherit cmake_kf5