From ee7c296202dafb7a76a817b0cd7ba9690428deaf Mon Sep 17 00:00:00 2001
From: Volker Krause <vkrause@kde.org>
Date: Sat, 29 Jul 2017 17:30:00 +0200
Subject: [PATCH] Make ECM a dependency for all frameworks

Summary:
Also, add a temporary workaround for ECM requiring lrelease/lconvert host
tools if the KF5 sources include translations (which they do when using
tags). We of course need to fix that eventually, but right now that just
prevents anything from building.

Reviewers: cordlandwehr

Reviewed By: cordlandwehr

Subscribers: #frameworks

Tags: #frameworks

Differential Revision: https://phabricator.kde.org/D6976
---
 classes/cmake_kf5.bbclass      | 9 ++++++++-
 recipes-kf5/tier1/karchive.inc | 2 +-
 2 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/classes/cmake_kf5.bbclass b/classes/cmake_kf5.bbclass
index 2fe914a..7e9f11b 100644
--- a/classes/cmake_kf5.bbclass
+++ b/classes/cmake_kf5.bbclass
@@ -2,7 +2,14 @@ inherit cmake_qt5
 
 EXTRA_OECMAKE += " \
     -DOE_KF5_PATH_HOST_ROOT=${STAGING_DIR_HOST}"
-    
+
+DEPENDS += "ecm"
+
+# FIXME: using tags gives us translations, translations require lrelease/lconvert host tools, the ecm recipe can't deal with that yet...
+do_configure_prepend() {
+    rm -rf ${S}/po
+}
+
 # This function is rather offensive right now, but it seems to work
 do_install_prepend() {
     if [ "0" -ne $(find . -name \*.cmake | grep _usr | wc -l) ]; then
diff --git a/recipes-kf5/tier1/karchive.inc b/recipes-kf5/tier1/karchive.inc
index a0d2962..48aa3df 100644
--- a/recipes-kf5/tier1/karchive.inc
+++ b/recipes-kf5/tier1/karchive.inc
@@ -5,7 +5,7 @@ LIC_FILES_CHKSUM = "file://COPYING.LIB;md5=2d5025d4aa3495befef8f17206a5b0a1 \
     "
 PR = "r0"
 
-DEPENDS = "ecm zlib bzip2 xz qtbase"
+DEPENDS = "zlib bzip2 xz qtbase"
 
 SRC_URI = "git://anongit.kde.org/karchive;protocol=git"
 S = "${WORKDIR}/git"