From 28c64079db1e03a39864e81132489252772ca0dc Mon Sep 17 00:00:00 2001 From: Oliver Smith Date: Fri, 11 Sep 2020 15:40:04 +0200 Subject: [PATCH] kde/*: add qmlplugindump workaround (MR 1570) [ci:skip-vercheck]: should not affect the resulting binary package [ci:ignore-count] --- kde/alligator/APKBUILD | 10 ++++++++++ kde/itinerary/APKBUILD | 10 ++++++++++ kde/kclock/APKBUILD | 2 +- kde/kirigami-addons/APKBUILD | 10 ++++++++++ kde/koko/APKBUILD | 6 ++++++ kde/kpeoplesink/APKBUILD | 10 ++++++++++ kde/kpublictransport/APKBUILD | 10 ++++++++++ kde/ktrip/APKBUILD | 10 ++++++++++ kde/plasma-camera/APKBUILD | 10 ++++++++++ kde/plasma-dialer/APKBUILD | 10 ++++++++++ kde/plasma-phonebook/APKBUILD | 10 ++++++++++ kde/plasma-settings/APKBUILD | 10 ++++++++++ kde/plasma-videoplayer/APKBUILD | 10 ++++++++++ kde/plasmatube/APKBUILD | 10 ++++++++++ kde/qmlkonsole/APKBUILD | 10 ++++++++++ kde/qrca/APKBUILD | 10 ++++++++++ kde/spacebar/APKBUILD | 10 ++++++++++ kde/trainer/APKBUILD | 10 ++++++++++ 18 files changed, 167 insertions(+), 1 deletion(-) diff --git a/kde/alligator/APKBUILD b/kde/alligator/APKBUILD index 9d53355b8..1bb8105e8 100644 --- a/kde/alligator/APKBUILD +++ b/kde/alligator/APKBUILD @@ -13,6 +13,16 @@ source="https://invent.kde.org/plasma-mobile/alligator/-/archive/$_commit/alliga options="!check" # No tests builddir="$srcdir/$pkgname-$_commit" +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/kde/itinerary/APKBUILD b/kde/itinerary/APKBUILD index c3b0056af..d15c12a90 100644 --- a/kde/itinerary/APKBUILD +++ b/kde/itinerary/APKBUILD @@ -17,6 +17,16 @@ source="$pkgname-$_commit.tar.gz::https://github.com/KDE/itinerary/archive/$_com builddir="$srcdir/$pkgname-$_commit" options="!check" # Tests require newest version of kitinerary +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/kde/kclock/APKBUILD b/kde/kclock/APKBUILD index 4525ed8e2..3e44bfb55 100644 --- a/kde/kclock/APKBUILD +++ b/kde/kclock/APKBUILD @@ -33,7 +33,7 @@ builddir="$srcdir/$pkgname-$_commit" prepare() { default_prepare - # qmlplugindump fails for armv7+qemu (bpo#74). This is purely for + # 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 diff --git a/kde/kirigami-addons/APKBUILD b/kde/kirigami-addons/APKBUILD index c6216db3e..e7a4bae3d 100644 --- a/kde/kirigami-addons/APKBUILD +++ b/kde/kirigami-addons/APKBUILD @@ -12,6 +12,16 @@ makedepends="extra-cmake-modules qt5-qtquickcontrols2-dev ki18n-dev" source="https://invent.kde.org/libraries/kirigami-addons/-/archive/$_commit/kirigami-addons-$_commit.tar.gz" builddir="$srcdir/$pkgname-$_commit" +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/kde/koko/APKBUILD b/kde/koko/APKBUILD index de1112471..efce33dca 100644 --- a/kde/koko/APKBUILD +++ b/kde/koko/APKBUILD @@ -22,6 +22,12 @@ prepare() { mv "$srcdir"/geonames-$_geonames_pkgver/cities1000.zip src/ mv "$srcdir"/geonames-$_geonames_pkgver/admin1CodesASCII.txt src/ mv "$srcdir"/geonames-$_geonames_pkgver/admin2Codes.txt src/ + + # 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() { diff --git a/kde/kpeoplesink/APKBUILD b/kde/kpeoplesink/APKBUILD index cf8ee141f..649a6a3c7 100644 --- a/kde/kpeoplesink/APKBUILD +++ b/kde/kpeoplesink/APKBUILD @@ -12,6 +12,16 @@ source="https://invent.kde.org/pim/kpeoplesink/-/archive/$_commit/kpeoplesink-$_ options="!check" # Broken tests builddir="$srcdir/$pkgname-$_commit" +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/kde/kpublictransport/APKBUILD b/kde/kpublictransport/APKBUILD index 4f1064dbd..a2f7e2fb9 100644 --- a/kde/kpublictransport/APKBUILD +++ b/kde/kpublictransport/APKBUILD @@ -13,6 +13,16 @@ source="$pkgname-$_commit.tar.gz::https://github.com/kde/kpublictransport/archiv subpackages="$pkgname-dev" builddir="$srcdir/$pkgname-$_commit" +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/kde/ktrip/APKBUILD b/kde/ktrip/APKBUILD index efd8a236b..c61bbd454 100644 --- a/kde/ktrip/APKBUILD +++ b/kde/ktrip/APKBUILD @@ -13,6 +13,16 @@ source="https://invent.kde.org/utilities/ktrip/-/archive/$_commit/ktrip-$_commit options="!check" # No tests builddir="$srcdir/$pkgname-$_commit" +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/kde/plasma-camera/APKBUILD b/kde/plasma-camera/APKBUILD index 71d798eda..fd31ff840 100644 --- a/kde/plasma-camera/APKBUILD +++ b/kde/plasma-camera/APKBUILD @@ -26,6 +26,16 @@ makedepends=" source="https://invent.kde.org/plasma-mobile/plasma-camera/-/archive/$_commit/plasma-camera-$_commit.tar.gz" builddir="$srcdir/$pkgname-$_commit" +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/kde/plasma-dialer/APKBUILD b/kde/plasma-dialer/APKBUILD index f3439734c..631a8ff2d 100644 --- a/kde/plasma-dialer/APKBUILD +++ b/kde/plasma-dialer/APKBUILD @@ -25,6 +25,16 @@ source="https://invent.kde.org/plasma-mobile/plasma-dialer/-/archive/$_commit/pl options="!check" # No tests builddir="$srcdir/$pkgname-$_commit" +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/kde/plasma-phonebook/APKBUILD b/kde/plasma-phonebook/APKBUILD index 01403b9ca..dbd57d4b2 100644 --- a/kde/plasma-phonebook/APKBUILD +++ b/kde/plasma-phonebook/APKBUILD @@ -13,6 +13,16 @@ source="https://invent.kde.org/kde/plasma-phonebook/-/archive/$_commit/plasma-ph options="!check" # No tests builddir="$srcdir/$pkgname-$_commit" +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/kde/plasma-settings/APKBUILD b/kde/plasma-settings/APKBUILD index 0fd58ede6..26dcb0b2c 100644 --- a/kde/plasma-settings/APKBUILD +++ b/kde/plasma-settings/APKBUILD @@ -32,6 +32,16 @@ source="https://invent.kde.org/plasma-mobile/plasma-settings/-/archive/$_commit/ options="!check" # No tests builddir="$srcdir/$pkgname-$_commit" +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/kde/plasma-videoplayer/APKBUILD b/kde/plasma-videoplayer/APKBUILD index 57580ad70..965a79677 100644 --- a/kde/plasma-videoplayer/APKBUILD +++ b/kde/plasma-videoplayer/APKBUILD @@ -13,6 +13,16 @@ source="https://invent.kde.org/jbbgameich/videoplayer/-/archive/$_commit/videopl options="!check" # No tests builddir="$srcdir/$_pkgname-$_commit" +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/kde/plasmatube/APKBUILD b/kde/plasmatube/APKBUILD index b677454a3..fb1deb82c 100644 --- a/kde/plasmatube/APKBUILD +++ b/kde/plasmatube/APKBUILD @@ -14,6 +14,16 @@ source="https://invent.kde.org/lnj/plasmatube/-/archive/$_commit/plasmatube-$_co options="!check" # No tests builddir="$srcdir/$pkgname-$_commit" +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/kde/qmlkonsole/APKBUILD b/kde/qmlkonsole/APKBUILD index 71779fbe0..29ba3d2ff 100644 --- a/kde/qmlkonsole/APKBUILD +++ b/kde/qmlkonsole/APKBUILD @@ -13,6 +13,16 @@ source="https://invent.kde.org/plasma-mobile/qmlkonsole/-/archive/$_commit/qmlko options="!check" # No tests builddir="$srcdir/$pkgname-$_commit" +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/kde/qrca/APKBUILD b/kde/qrca/APKBUILD index 721896308..caf5437cb 100644 --- a/kde/qrca/APKBUILD +++ b/kde/qrca/APKBUILD @@ -12,6 +12,16 @@ makedepends="extra-cmake-modules qt5-qtbase-dev qt5-qtdeclarative-dev qt5-qtsvg- source="https://invent.kde.org/kde/qrca/-/archive/$_commit/qrca-$_commit.tar.gz" builddir="$srcdir/$pkgname-$_commit" +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/kde/spacebar/APKBUILD b/kde/spacebar/APKBUILD index e6b644000..17a12ee12 100644 --- a/kde/spacebar/APKBUILD +++ b/kde/spacebar/APKBUILD @@ -13,6 +13,16 @@ source="https://github.com/kde/spacebar/archive/$_commit/spacebar-$_commit.tar.g options="!check" # No tests builddir="$srcdir/$pkgname-$_commit" +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/kde/trainer/APKBUILD b/kde/trainer/APKBUILD index a3a2cba26..2d64938b0 100644 --- a/kde/trainer/APKBUILD +++ b/kde/trainer/APKBUILD @@ -14,6 +14,16 @@ source="https://invent.kde.org/plasma-mobile/trainer/-/archive/$_commit/trainer- options="!check" # Broken tests https://invent.kde.org/plasma-mobile/trainer/-/issues/1 builddir="$srcdir/$pkgname-$_commit" +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 \