From cca64d3c29e4e24144fe4cf378f25aa65f97ce38 Mon Sep 17 00:00:00 2001 From: Oliver Smith Date: Mon, 7 Sep 2020 16:09:32 +0200 Subject: [PATCH] kde/kclock: disable qmlplugindump for armv7 (MR 1554) qmlplugindump is failing when it runs with qemu user mode emulation for armv7 on builds.sr.ht. Disable it to unblock our binary repository. The information retrieved by qmlplugindump is purely for packager knowledge and does not affect the runtime of kclock. Related: MR 9 Fixes: build.postmarketos.org#74 --- kde/kclock/APKBUILD | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/kde/kclock/APKBUILD b/kde/kclock/APKBUILD index 8c0c5b901..14f5ab8c1 100644 --- a/kde/kclock/APKBUILD +++ b/kde/kclock/APKBUILD @@ -1,7 +1,7 @@ # Maintainer: Bart Ribbers pkgname=kclock pkgver=0_git20200618 -pkgrel=1 +pkgrel=2 _commit="608247addaf4e6666c9985c82eb0b73aa6840310" pkgdesc="Clock app for Plasma Mobile" url="https://invent.kde.org/plasma-mobile/kclock" @@ -13,6 +13,16 @@ source="https://invent.kde.org/plasma-mobile/kclock/-/archive/$_commit/kclock-$_ options="!check" # No tests builddir="$srcdir/$pkgname-$_commit" +prepare() { + default_prepare + + # qmlplugindump fails for armv7+qemu (bpo#74). 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 + fi +} + build() { cmake -B build \ -DCMAKE_BUILD_TYPE=None \