From bb5731fc5aa3d2c14a93bece7ff832780323b56a Mon Sep 17 00:00:00 2001 From: Oliver Smith Date: Wed, 3 Feb 2021 14:58:18 +0100 Subject: [PATCH] temp/kwin: armv7: remove all ecm_find_qmlmodule The build is still failing, probably because ecm_find_qmlmodule is not only present in the main CMakeLists.txt, but also in others. $ git grep ecm_find_qmlmodule CMakeLists.txt:ecm_find_qmlmodule(QtQuick 2.3) CMakeLists.txt:ecm_find_qmlmodule(QtQuick.Controls 1.2) CMakeLists.txt:ecm_find_qmlmodule(QtQuick.Layouts 1.3) CMakeLists.txt:ecm_find_qmlmodule(QtQuick.Window 2.1) CMakeLists.txt:ecm_find_qmlmodule(QtMultimedia 5.0) CMakeLists.txt:ecm_find_qmlmodule(org.kde.kquickcontrolsaddons 2.0) CMakeLists.txt:ecm_find_qmlmodule(org.kde.plasma.core 2.0) CMakeLists.txt:ecm_find_qmlmodule(org.kde.plasma.components 2.0) kcmkwin/kwindesktop/CMakeLists.txt:ecm_find_qmlmodule(org.kde.plasma.core 2.0) kcmkwin/kwineffects/CMakeLists.txt:ecm_find_qmlmodule(org.kde.plasma.core 2.0) [ci:skip-build]: don't try to build all depends, takes too long [ci:skip-vercheck]: unblocking arm build, no need to bump pkgrel --- temp/kwin/APKBUILD | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/temp/kwin/APKBUILD b/temp/kwin/APKBUILD index 63f78f2db..54e7fbbca 100644 --- a/temp/kwin/APKBUILD +++ b/temp/kwin/APKBUILD @@ -89,7 +89,10 @@ prepare() { # qmlplugindump fails for armv7+qemu (pmb#1970). This is purely for # packager knowledge and doesn't affect runtime, so we can disable it. if [ "$CARCH" = "armv7" ]; then - sed -i "s/ecm_find_qmlmodule/# ecm_find_qmlmodule/g" CMakeLists.txt + for i in $(find -name CMakeLists.txt); do + echo "Disabling ecm_find_qmlmodule in: $i" + sed -i "s/ecm_find_qmlmodule/# ecm_find_qmlmodule/g" "$i" + done fi }