From 0ccb5c05fdc2aa29e1b73a0afdc053b86ee6d1ff Mon Sep 17 00:00:00 2001 From: Bart Ribbers Date: Wed, 3 Feb 2021 12:51:53 +0100 Subject: [PATCH] temp/*: add qmlplugindump workaround (MR 1921) Seems we missed these when forking Plasma and now the armv7 builders are failing on it [ci:skip-build] Won't succeed anyway as the packages haven't been uploaded to the repos yet, so pmbootstrap will try to build the entirety of Plasma and fail because it takes too long [ci:skip-vercheck] No need to bump pkgrel --- temp/kde-cli-tools/APKBUILD | 10 ++++++++++ temp/khotkeys/APKBUILD | 10 ++++++++++ temp/kinfocenter/APKBUILD | 10 ++++++++++ temp/kwin/APKBUILD | 10 ++++++++++ temp/mauikit/APKBUILD | 10 ++++++++++ temp/plasma-browser-integration/APKBUILD | 10 ++++++++++ temp/plasma-desktop/APKBUILD | 10 ++++++++++ temp/plasma-nm/APKBUILD | 10 ++++++++++ temp/plasma-pa/APKBUILD | 10 ++++++++++ temp/plasma-phone-components/APKBUILD | 10 ++++++++++ temp/plasma-workspace/APKBUILD | 10 ++++++++++ temp/powerdevil/APKBUILD | 10 ++++++++++ temp/sddm-kcm/APKBUILD | 10 ++++++++++ temp/systemsettings/APKBUILD | 10 ++++++++++ 14 files changed, 140 insertions(+) diff --git a/temp/kde-cli-tools/APKBUILD b/temp/kde-cli-tools/APKBUILD index 44c4406d1..91a5c54ef 100644 --- a/temp/kde-cli-tools/APKBUILD +++ b/temp/kde-cli-tools/APKBUILD @@ -41,6 +41,16 @@ options="!check" # Broken # Workaround a circular dependency https://gitlab.alpinelinux.org/alpine/aports/-/issues/11785 install_if="plasma-workspace" +prepare() { + default_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 + fi +} + build() { cmake -B build \ -DCMAKE_BUILD_TYPE=None \ diff --git a/temp/khotkeys/APKBUILD b/temp/khotkeys/APKBUILD index 572016703..1821cdfef 100644 --- a/temp/khotkeys/APKBUILD +++ b/temp/khotkeys/APKBUILD @@ -33,6 +33,16 @@ source="https://download.kde.org/$_rel/plasma/$pkgver/khotkeys-$pkgver.tar.xz" subpackages="$pkgname-doc $pkgname-lang $pkgname-dev" options="!check" # No tests +prepare() { + default_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 + fi +} + build() { cmake -B build \ -DCMAKE_BUILD_TYPE=None \ diff --git a/temp/kinfocenter/APKBUILD b/temp/kinfocenter/APKBUILD index 245dab374..e62875b78 100644 --- a/temp/kinfocenter/APKBUILD +++ b/temp/kinfocenter/APKBUILD @@ -42,6 +42,16 @@ esac source="https://download.kde.org/$_rel/plasma/$pkgver/kinfocenter-$pkgver.tar.xz" subpackages="$pkgname-doc $pkgname-lang" +prepare() { + default_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 + fi +} + build() { cmake -B build \ -DCMAKE_BUILD_TYPE=None \ diff --git a/temp/kwin/APKBUILD b/temp/kwin/APKBUILD index 0b6888e89..63f78f2db 100644 --- a/temp/kwin/APKBUILD +++ b/temp/kwin/APKBUILD @@ -83,6 +83,16 @@ source="https://download.kde.org/$_rel/plasma/$pkgver/kwin-$pkgver.tar.xz subpackages="$pkgname-dev $pkgname-doc $pkgname-lang" options="!check" # Broken +prepare() { + default_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 + fi +} + build() { cmake -B build \ -DCMAKE_BUILD_TYPE=None \ diff --git a/temp/mauikit/APKBUILD b/temp/mauikit/APKBUILD index 1a2cf7965..1714c1f54 100644 --- a/temp/mauikit/APKBUILD +++ b/temp/mauikit/APKBUILD @@ -35,6 +35,16 @@ source="https://invent.kde.org/maui/mauikit/-/archive/v$pkgver/mauikit-v$pkgver. subpackages="$pkgname-dev" builddir="$srcdir/$pkgname-v$pkgver" +prepare() { + default_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 + fi +} + build() { cmake -B build \ -DCMAKE_BUILD_TYPE=None \ diff --git a/temp/plasma-browser-integration/APKBUILD b/temp/plasma-browser-integration/APKBUILD index 8bb799315..57c8c5055 100644 --- a/temp/plasma-browser-integration/APKBUILD +++ b/temp/plasma-browser-integration/APKBUILD @@ -31,6 +31,16 @@ esac source="https://download.kde.org/$_rel/plasma/$pkgver/plasma-browser-integration-$pkgver.tar.xz" subpackages="$pkgname-lang" +prepare() { + default_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 + fi +} + build() { cmake -B build \ -DCMAKE_BUILD_TYPE=None \ diff --git a/temp/plasma-desktop/APKBUILD b/temp/plasma-desktop/APKBUILD index 0a83202f8..ecb1e8e42 100644 --- a/temp/plasma-desktop/APKBUILD +++ b/temp/plasma-desktop/APKBUILD @@ -68,6 +68,16 @@ source="https://download.kde.org/$_rel/plasma/$pkgver/plasma-desktop-$pkgver.tar subpackages="$pkgname-doc $pkgname-lang knetattach" options="!check" # Requires running dbus +prepare() { + default_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 + fi +} + build() { cmake -B build \ -DCMAKE_BUILD_TYPE=None \ diff --git a/temp/plasma-nm/APKBUILD b/temp/plasma-nm/APKBUILD index 0ccca41e7..7e2ac10bc 100644 --- a/temp/plasma-nm/APKBUILD +++ b/temp/plasma-nm/APKBUILD @@ -42,6 +42,16 @@ esac source="https://download.kde.org/$_rel/plasma/$pkgver/plasma-nm-$pkgver.tar.xz" subpackages="$pkgname-lang $pkgname-mobile" +prepare() { + default_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 + fi +} + build() { cmake -B build \ -DCMAKE_BUILD_TYPE=None \ diff --git a/temp/plasma-pa/APKBUILD b/temp/plasma-pa/APKBUILD index 3090981e8..4c0d67b96 100644 --- a/temp/plasma-pa/APKBUILD +++ b/temp/plasma-pa/APKBUILD @@ -32,6 +32,16 @@ esac source="https://download.kde.org/$_rel/plasma/$pkgver/plasma-pa-$pkgver.tar.xz" subpackages="$pkgname-doc $pkgname-lang" +prepare() { + default_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 + fi +} + build() { cmake -B build \ -DCMAKE_BUILD_TYPE=None \ diff --git a/temp/plasma-phone-components/APKBUILD b/temp/plasma-phone-components/APKBUILD index 35178f33e..72d2ebc19 100644 --- a/temp/plasma-phone-components/APKBUILD +++ b/temp/plasma-phone-components/APKBUILD @@ -59,6 +59,16 @@ source="https://download.kde.org/$_rel/plasma/$pkgver/plasma-phone-components-$p subpackages="$pkgname-lang" options="!check" # No tests +prepare() { + default_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 + fi +} + build() { cmake -B build \ -DCMAKE_BUILD_TYPE=None \ diff --git a/temp/plasma-workspace/APKBUILD b/temp/plasma-workspace/APKBUILD index 41271491d..b8e0f486b 100644 --- a/temp/plasma-workspace/APKBUILD +++ b/temp/plasma-workspace/APKBUILD @@ -81,6 +81,16 @@ source="https://download.kde.org/$_rel/plasma/$pkgver/plasma-workspace-$pkgver.t subpackages="$pkgname-dev $pkgname-libs $pkgname-doc $pkgname-lang" replaces="plasma-desktop<5.20" +prepare() { + default_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 + fi +} + build() { cmake -B build \ -DCMAKE_BUILD_TYPE=None \ diff --git a/temp/powerdevil/APKBUILD b/temp/powerdevil/APKBUILD index f4fc18373..8837d0126 100644 --- a/temp/powerdevil/APKBUILD +++ b/temp/powerdevil/APKBUILD @@ -44,6 +44,16 @@ esac source="https://download.kde.org/$_rel/plasma/$pkgver/powerdevil-$pkgver.tar.xz" subpackages="$pkgname-dev $pkgname-libs $pkgname-doc $pkgname-lang" +prepare() { + default_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 + fi +} + build() { cmake -B build \ -DCMAKE_BUILD_TYPE=None \ diff --git a/temp/sddm-kcm/APKBUILD b/temp/sddm-kcm/APKBUILD index bbf630960..977b5faf6 100644 --- a/temp/sddm-kcm/APKBUILD +++ b/temp/sddm-kcm/APKBUILD @@ -39,6 +39,16 @@ esac source="https://download.kde.org/$_rel/plasma/$pkgver/sddm-kcm-$pkgver.tar.xz" subpackages="$pkgname-lang" +prepare() { + default_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 + fi +} + build() { cmake -B build \ -DCMAKE_BUILD_TYPE=None \ diff --git a/temp/systemsettings/APKBUILD b/temp/systemsettings/APKBUILD index 806ab6ca9..b11e47546 100644 --- a/temp/systemsettings/APKBUILD +++ b/temp/systemsettings/APKBUILD @@ -43,6 +43,16 @@ esac source="https://download.kde.org/$_rel/plasma/$pkgver/systemsettings-$pkgver.tar.xz" subpackages="$pkgname-doc $pkgname-lang" +prepare() { + default_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 + fi +} + build() { cmake -B build \ -DCMAKE_BUILD_TYPE=None \