From 273797a76767304b3a7fcd24057bedc4958708f8 Mon Sep 17 00:00:00 2001 From: Oliver Smith <ollieparanoid@postmarketos.org> Date: Thu, 30 Jul 2020 18:02:20 +0200 Subject: [PATCH] Revert "*/*: disable armv7 for plasma programs" The circular dependency has been resolved, and the binary packages have been pushed to Alpine#s repsitory. This reverts commit 35015139f36f091229f715ef821964b3911e0b6c. [ci:skip-build] [ci:skip-vercheck] Related: https://gitlab.alpinelinux.org/alpine/aports/-/merge_requests/10757 --- kde/alligator/APKBUILD | 2 +- kde/itinerary/APKBUILD | 2 +- kde/kclock/APKBUILD | 2 +- kde/kirigami-addons/APKBUILD | 2 +- kde/koko/APKBUILD | 2 +- kde/kpeoplesink/APKBUILD | 2 +- kde/kpublictransport/APKBUILD | 2 +- kde/ktrip/APKBUILD | 2 +- kde/plasma-camera/APKBUILD | 2 +- kde/plasma-dialer/APKBUILD | 2 +- kde/plasma-phonebook/APKBUILD | 2 +- kde/plasma-settings/APKBUILD | 2 +- kde/plasma-videoplayer/APKBUILD | 2 +- kde/plasmatube/APKBUILD | 2 +- kde/qmlkonsole/APKBUILD | 2 +- kde/qrca/APKBUILD | 2 +- kde/spacebar/APKBUILD | 2 +- kde/trainer/APKBUILD | 2 +- kde/voicememo/APKBUILD | 2 +- main/postmarketos-ondev/APKBUILD | 2 +- main/postmarketos-ui-plasma-desktop/APKBUILD | 2 +- main/postmarketos-ui-plasma-mobile/APKBUILD | 2 +- temp/calamares/APKBUILD | 2 +- temp/plasma-nano/APKBUILD | 2 +- temp/plasma-phone-components/APKBUILD | 2 +- 25 files changed, 25 insertions(+), 25 deletions(-) diff --git a/kde/alligator/APKBUILD b/kde/alligator/APKBUILD index 2c89e57a487..9d53355b839 100644 --- a/kde/alligator/APKBUILD +++ b/kde/alligator/APKBUILD @@ -5,7 +5,7 @@ pkgrel=0 _commit="5d8865a8f19824625847b14c1fd49c45df5b34f6" pkgdesc="A convergent RSS/Atom feed reader" url="https://invent.kde.org/tfella/alligator/" -arch="all !armhf !armv7" # armhf: pmaports#75, armv7: build.postmarketos.org#72 +arch="all !armhf" license="LicenseRef-KDE-Accepted-GPL" depends="kirigami2 qt5-qtbase-sqlite" makedepends="extra-cmake-modules qt5-qtbase-dev qt5-qtquickcontrols2-dev kcoreaddons-dev syndication-dev kconfig-dev ki18n-dev" diff --git a/kde/itinerary/APKBUILD b/kde/itinerary/APKBUILD index 448396a8de2..458b7132996 100644 --- a/kde/itinerary/APKBUILD +++ b/kde/itinerary/APKBUILD @@ -5,7 +5,7 @@ _commit="54303b62bf6f4ec0cf1ccc2967364f96104bc68a" pkgrel=0 pkgdesc="Application to assist with usage of Travel Reservations" url="https://github.com/KDE/itinerary" -arch="all !armhf !armv7" # armhf: pmaports#75, armv7: build.postmarketos.org#72 +arch="all !armhf" license="LGPL-2.0-or-later" depends="prison" makedepends="extra-cmake-modules qt5-qtbase-dev qt5-qtquickcontrols2-dev diff --git a/kde/kclock/APKBUILD b/kde/kclock/APKBUILD index cde0d98266a..e7149f38bea 100644 --- a/kde/kclock/APKBUILD +++ b/kde/kclock/APKBUILD @@ -5,7 +5,7 @@ pkgrel=0 _commit="608247addaf4e6666c9985c82eb0b73aa6840310" pkgdesc="Clock app for Plasma Mobile" url="https://invent.kde.org/plasma-mobile/koko" -arch="all !armhf !armv7" # armhf: pmaports#75, armv7: build.postmarketos.org#72 +arch="all !armhf" # armhf blocked by qt5-qtdeclarative license="LicenseRef-KDE-Accepted-GPL" depends="kirigami2 kirigami-addons" makedepends="extra-cmake-modules qt5-qtbase-dev qt5-qtdeclarative-dev qt5-qtsvg-dev qt5-qtquickcontrols2-dev kconfig-dev kirigami2-dev ki18n-dev kcoreaddons-dev kconfig-dev knotifications-dev kdbusaddons-dev" diff --git a/kde/kirigami-addons/APKBUILD b/kde/kirigami-addons/APKBUILD index 6fa793c1968..c6216db3e4a 100644 --- a/kde/kirigami-addons/APKBUILD +++ b/kde/kirigami-addons/APKBUILD @@ -5,7 +5,7 @@ pkgrel=0 _commit="a445f089cbecdc257a3ec67ddcbeb88acdb83349" pkgdesc="Add-ons for the Kirigami framework" url="https://invent.kde.org/libraries/kirigami-addons" -arch="all !armhf !armv7" # armhf: pmaports#75, armv7: build.postmarketos.org#72 +arch="all !armhf" # armhf blocked by qt5-qtdeclarative license="LGPL-2.0-or-later AND GPL-2.0-or-later" depends="kirigami2" makedepends="extra-cmake-modules qt5-qtquickcontrols2-dev ki18n-dev" diff --git a/kde/koko/APKBUILD b/kde/koko/APKBUILD index fb9e15aac40..de111247189 100644 --- a/kde/koko/APKBUILD +++ b/kde/koko/APKBUILD @@ -6,7 +6,7 @@ _commit="9f3a802fd86466f0cd4a4de5c7bf3725fc31f4e7" _geonames_pkgver=2020.06.25 pkgdesc="Image gallery application for Plasma Mobile" url="https://invent.kde.org/plasma-mobile/koko" -arch="all !armhf !armv7" # armhf: pmaports#75, armv7: build.postmarketos.org#72 +arch="all !armhf" # armhf blocked by qt5-qtdeclarative license="LGPL-2.0-or-later AND LGPL-2.1-only AND LGPL-3.0-only AND LicenseRef-KDE-Accepted-GPL" depends="kirigami2 kdeclarative purpose qt5-qtbase-sqlite" makedepends="extra-cmake-modules qt5-qtbase-dev qt5-qtdeclarative-dev qt5-qtlocation-dev ki18n-dev kdeclarative-dev kconfig-dev kio-dev kguiaddons-dev kcoreaddons-dev knotifications-dev exiv2-dev" diff --git a/kde/kpeoplesink/APKBUILD b/kde/kpeoplesink/APKBUILD index f7496261859..256a327beea 100644 --- a/kde/kpeoplesink/APKBUILD +++ b/kde/kpeoplesink/APKBUILD @@ -5,7 +5,7 @@ pkgrel=0 _commit="ee59e02f8c7f3b44511a432f7ddc38b9f0b89b62" pkgdesc="Expose Sink contacts to KPeople" url="https://invent.kde.org/pim/kpeoplesink" -arch="all !armhf !armv7" # armhf: pmaports#75, armv7: build.postmarketos.org#72 +arch="all !armhf" # armhf blocked by qt5-qtdeclarative license="LGPL-2.1-or-later" makedepends="extra-cmake-modules qt5-qtbase-dev kcoreaddons-dev kpeople-dev kcontacts-dev sink-dev kaccounts-integration-dev" source="https://invent.kde.org/pim/kpeoplesink/-/archive/$_commit/kpeoplesink-$_commit.tar.gz" diff --git a/kde/kpublictransport/APKBUILD b/kde/kpublictransport/APKBUILD index 1fd69deca02..e7852704d9f 100644 --- a/kde/kpublictransport/APKBUILD +++ b/kde/kpublictransport/APKBUILD @@ -4,7 +4,7 @@ pkgver=0_git20200327 pkgrel=0 _commit="5c6f65553d87e84ae5ebbf1c6aecdb96cb68ac6d" pkgdesc="Library to assist with accessing public transport timetables and other information" -arch="all !armhf !armv7" # armhf: pmaports#75, armv7: build.postmarketos.org#72 +arch="all !armhf" url="https://github.com/kde/kpublictransport" license="LGPL-2.0-or-later" checkdepends="tzdata" diff --git a/kde/ktrip/APKBUILD b/kde/ktrip/APKBUILD index 3569d61b27b..cbf975e6d50 100644 --- a/kde/ktrip/APKBUILD +++ b/kde/ktrip/APKBUILD @@ -4,7 +4,7 @@ pkgver=0_git20200327 pkgrel=0 _commit="222467070c3d823d7acf5572b3e0b95be68392c3" pkgdesc="A public transport assistant" -arch="all !armhf !armv7" # armhf: pmaports#75, armv7: build.postmarketos.org#72 +arch="all !armhf" url="https://invent.kde.org/kde/ktrip" license="GPL-2.0-only OR GPL-3.0-only" makedepends="extra-cmake-modules qt5-qtbase-dev qt5-qtdeclarative-dev ki18n-dev kitemmodels-dev kconfig-dev kcontacts-dev kpublictransport-dev" diff --git a/kde/plasma-camera/APKBUILD b/kde/plasma-camera/APKBUILD index 948125f44e3..813d73c7b1d 100644 --- a/kde/plasma-camera/APKBUILD +++ b/kde/plasma-camera/APKBUILD @@ -4,7 +4,7 @@ pkgver=1.0_git20200618 pkgrel=0 _commit="af2638fb6a1a1642a3b9b3320ca0ac352fdc0e78" pkgdesc="Camera application for Plasma Mobile" -arch="all !armhf !armv7" # armhf: pmaports#75, armv7: build.postmarketos.org#72 +arch="all !armhf" # armhf blocked by qt5-qtdeclarative url="https://invent.kde.org/plasma-mobile/plasma-camera" license="GPL-3.0-or-later AND BSD-3-Clause" depends="kirigami2 qt5-qtmultimedia gst-plugins-bad gst-plugins-good" diff --git a/kde/plasma-dialer/APKBUILD b/kde/plasma-dialer/APKBUILD index 0fb7760e0d6..b9140a4a44d 100644 --- a/kde/plasma-dialer/APKBUILD +++ b/kde/plasma-dialer/APKBUILD @@ -4,7 +4,7 @@ pkgver=0.1_git20200618 pkgrel=0 _commit="6be48498b6b93a8ce18ce923c2ea2d8f3d357e8b" pkgdesc="A dialer for Plasma Mobile" -arch="all !armhf !armv7" # armhf: pmaports#75, armv7: build.postmarketos.org#72 +arch="all !armhf" # Blocked qt5-qtdeclarative url="https://invent.kde.org/plasma-mobile/plasma-dialer" license="GPL-2.0-or-later" depends="kirigami2" diff --git a/kde/plasma-phonebook/APKBUILD b/kde/plasma-phonebook/APKBUILD index a813fe11e96..01403b9cada 100644 --- a/kde/plasma-phonebook/APKBUILD +++ b/kde/plasma-phonebook/APKBUILD @@ -4,7 +4,7 @@ pkgver=0_git20200618 pkgrel=0 _commit="c67aecb8a373d735b92839f809711ca6c111ac5d" pkgdesc="Contacts application which allows adding, modifying and removing contacts" -arch="all !armhf !armv7" # armhf: pmaports#75, armv7: build.postmarketos.org#72 +arch="all !armhf" url="https://invent.kde.org/kde/plasma-phonebook" license="LicenseRef-KDE-Accepted-GPL" depends="kirigami2 qt5-qtquickcontrols qt5-qtbase-sqlite" diff --git a/kde/plasma-settings/APKBUILD b/kde/plasma-settings/APKBUILD index 0d451d1b39b..f6092af88f5 100644 --- a/kde/plasma-settings/APKBUILD +++ b/kde/plasma-settings/APKBUILD @@ -4,7 +4,7 @@ pkgver=0_git20200618 pkgrel=0 _commit="280f43d3ea5b546c616254b97fe0ef20af03365e" pkgdesc="Settings application for Plasma Mobile" -arch="all !armhf !armv7" # armhf: pmaports#75, armv7: build.postmarketos.org#72 +arch="all !armhf" url="https://community.kde.org/Plasma/Mobile" license="GPL-2.0-or-later AND LGPL-2.1-or-later" depends="kirigami2 qt5-qtquickcontrols2 kded" diff --git a/kde/plasma-videoplayer/APKBUILD b/kde/plasma-videoplayer/APKBUILD index ab7b31a2d50..57580ad707c 100644 --- a/kde/plasma-videoplayer/APKBUILD +++ b/kde/plasma-videoplayer/APKBUILD @@ -6,7 +6,7 @@ pkgrel=2 _commit="efd715ef60ab321035ab44ddca36a95a8aad176f" pkgdesc="Video Player for Plasma Mobile" url="https://invent.kde.org/jbbgameich/videoplayer" -arch="all !armhf !armv7" # armhf: pmaports#75, armv7: build.postmarketos.org#72 +arch="all !armhf" # armhf blocked by extra-cmake-modules license="LGPL-2.1-or-later" makedepends="extra-cmake-modules qt5-qtbase-dev qt5-qtdeclarative-dev plasma-framework-dev kdeclarative-dev ki18n-dev kdbusaddons-dev" source="https://invent.kde.org/jbbgameich/videoplayer/-/archive/$_commit/videoplayer-$_commit.tar.gz" diff --git a/kde/plasmatube/APKBUILD b/kde/plasmatube/APKBUILD index 6d1151d52f2..b677454a3ad 100644 --- a/kde/plasmatube/APKBUILD +++ b/kde/plasmatube/APKBUILD @@ -5,7 +5,7 @@ pkgver=0_git20200413 pkgrel=0 _commit="9abe039f3bc48505b7abfb8c4b231cb26cea7ae0" pkgdesc="Kirigami YouTube video player based on libmpv and youtube-dl" -arch="all !armhf !armv7" # armhf: pmaports#75, armv7: build.postmarketos.org#72 +arch="all !armhf" # blocked by extra-cmake-modules url="https://invent.kde.org/lnj/plasmatube" license="GPL-2.0-only OR GPL-3.0-only" depends="kirigami2 qt5-qtquickcontrols2" diff --git a/kde/qmlkonsole/APKBUILD b/kde/qmlkonsole/APKBUILD index a383ec740d4..9715c31784a 100644 --- a/kde/qmlkonsole/APKBUILD +++ b/kde/qmlkonsole/APKBUILD @@ -4,7 +4,7 @@ pkgver=0_git20200618 pkgrel=0 _commit="937e07137847e58626f100116103451902cd210f" pkgdesc="Terminal app for Plasma Mobile" -arch="all !armhf !armv7" # armhf: pmaports#75, armv7: build.postmarketos.org#72 +arch="all !armhf" # armhf blocked by qt5-qtdeclarative url="https://invent.kde.org/jbbgameich/qmlkonsole" license="GPL-3.0-or-later" depends="qmltermwidget kirigami2" diff --git a/kde/qrca/APKBUILD b/kde/qrca/APKBUILD index 9f509a3f921..e6b73dba177 100644 --- a/kde/qrca/APKBUILD +++ b/kde/qrca/APKBUILD @@ -4,7 +4,7 @@ pkgver=0_git20200625 pkgrel=0 _commit="3098679f37be8cb0968b17e719dff487957c294f" pkgdesc="QR-Code scanner for Plasma Mobile" -arch="all !armhf !armv7" # armhf: pmaports#75, armv7: build.postmarketos.org#72 +arch="all !armhf" # armhf blocked by qt5-qtdeclarative url="https://invent.kde.org/kde/qrca" license="GPL-3.0-or-later" depends="kirigami2 purpose" diff --git a/kde/spacebar/APKBUILD b/kde/spacebar/APKBUILD index 64306fc7106..e6b644000fb 100644 --- a/kde/spacebar/APKBUILD +++ b/kde/spacebar/APKBUILD @@ -5,7 +5,7 @@ pkgrel=0 _commit="bc86bd0effbbd34b6eed62125521667ff0ab7671" pkgdesc="Collection of stuff for running IM on Plasma Mobile" url="https://phabricator.kde.org/source/spacebar/" -arch="all !armhf !armv7" # armhf: pmaports#75, armv7: build.postmarketos.org#72 +arch="all !armhf" # armhf blocked by qt5-qtdeclarative license="GPL-2.0-or-later AND LicenseRef-KDE-Accepted-GPL" depends="kirigami2" makedepends="extra-cmake-modules qt5-qtbase-dev qt5-qtdeclarative-dev kirigami2-dev ki18n-dev kpeople-dev kcontacts-dev telepathy-qt-dev" diff --git a/kde/trainer/APKBUILD b/kde/trainer/APKBUILD index ccb5b1150f2..a3a2cba26bd 100644 --- a/kde/trainer/APKBUILD +++ b/kde/trainer/APKBUILD @@ -5,7 +5,7 @@ pkgrel=0 _commit="ec505f334188a2d1e2be492c1fad86735f03d96b" pkgdesc="Application to help you practice sport exercises with a description and duration" url="https://invent.kde.org/plasma-mobile/trainer" -arch="all !armhf !armv7" # armhf: pmaports#75, armv7: build.postmarketos.org#72 +arch="all !armhf" # armhf blocked by qt5-qtdeclarative license="GPL-3.0-or-later AND CC0-1.0" depends="kirigami2" makedepends="extra-cmake-modules qt5-qtbase-dev qt5-qtdeclarative-dev qt5-qtmultimedia-dev qt5-qtquickcontrols2-dev qt5-qtspeech-dev kirigami2-dev ki18n-dev kdeclarative-dev kconfig-dev kcrash-dev" diff --git a/kde/voicememo/APKBUILD b/kde/voicememo/APKBUILD index d24bba092a5..e97e0ef9117 100644 --- a/kde/voicememo/APKBUILD +++ b/kde/voicememo/APKBUILD @@ -5,7 +5,7 @@ pkgrel=0 _commit="ae3b841f7e09e1cdd22bf2d83d1d23d4f05d4741" pkgdesc="Audio recorder for Plasma Mobile (and other platforms)" url="https://invent.kde.org/jbbgameich/voicememo/" -arch="all !armhf !armv7" # armhf: pmaports#75, armv7: build.postmarketos.org#72 +arch="all !armhf" # armhf blocked by extra-cmake-modules license="GPL-3.0-only" depends="kirigami2" makedepends="extra-cmake-modules qt5-qtbase-dev qt5-qtdeclarative-dev qt5-qtquickcontrols2-dev qt5-qtmultimedia-dev kirigami2-dev ki18n-dev" diff --git a/main/postmarketos-ondev/APKBUILD b/main/postmarketos-ondev/APKBUILD index 7970f8cf6b9..13153fe1ae5 100644 --- a/main/postmarketos-ondev/APKBUILD +++ b/main/postmarketos-ondev/APKBUILD @@ -4,7 +4,7 @@ pkgver=0.2.1 pkgrel=0 pkgdesc="Calamares based on-device installer" url="https://postmarketos.org" -arch="all !armhf !armv7" # armhf: pmaports#75, armv7: build.postmarketos.org#72 +arch="all !armhf" # blocked by qt5-qtdeclarative license="GPL-3.0-or-later" depends=" $pkgname-openrc diff --git a/main/postmarketos-ui-plasma-desktop/APKBUILD b/main/postmarketos-ui-plasma-desktop/APKBUILD index c430745fef9..317982aafa4 100644 --- a/main/postmarketos-ui-plasma-desktop/APKBUILD +++ b/main/postmarketos-ui-plasma-desktop/APKBUILD @@ -4,7 +4,7 @@ pkgver=2 pkgrel=1 pkgdesc="(X11/Wayland) KDE Desktop Environment (works well with tablets)" url="https://www.kde.org" -arch="noarch !armhf !armv7" # armhf: pmaports#75, armv7: build.postmarketos.org#72 +arch="noarch !armhf" license="GPL-3.0-or-later" depends="plasma qt5-qtvirtualkeyboard diff --git a/main/postmarketos-ui-plasma-mobile/APKBUILD b/main/postmarketos-ui-plasma-mobile/APKBUILD index abb1abfe527..50a2dc94f6a 100644 --- a/main/postmarketos-ui-plasma-mobile/APKBUILD +++ b/main/postmarketos-ui-plasma-mobile/APKBUILD @@ -4,7 +4,7 @@ pkgver=3 pkgrel=1 pkgdesc="(Wayland) Mobile variant of KDE Plasma (does not run without hardware acceleration, allows only numeric passwords!)" url="https://wiki.postmarketos.org/wiki/Plasma_Mobile" -arch="noarch !armhf !armv7" # armhf: pmaports#75, armv7: build.postmarketos.org#72 +arch="noarch !armhf" # Crashes on armhf due to https://gitlab.com/postmarketOS/pmaports/issues/75 license="GPL-3.0-or-later" depends="bluedevil breeze diff --git a/temp/calamares/APKBUILD b/temp/calamares/APKBUILD index 02d8e5b07d9..612288ea8b8 100644 --- a/temp/calamares/APKBUILD +++ b/temp/calamares/APKBUILD @@ -2,7 +2,7 @@ pkgname=calamares pkgver=3.2.26.1 pkgrel=0 -arch="all !armhf !armv7" # armhf: pmaports#75, armv7: build.postmarketos.org#72 +arch="all !armhf" # blocked by qt5-qtdeclarative url="https://calamares.io/" pkgdesc="Distribution-independent installer framework" license="GPL-3.0-or-later AND LGPL-2.1-only" diff --git a/temp/plasma-nano/APKBUILD b/temp/plasma-nano/APKBUILD index 699a834cf92..f10ae520a60 100644 --- a/temp/plasma-nano/APKBUILD +++ b/temp/plasma-nano/APKBUILD @@ -4,7 +4,7 @@ pkgver=5.19.3_git20200705 pkgrel=0 _commit="06dc6f3fea3d30efa009be2561ffeb0f3e01af77" pkgdesc="A minimal Plasma shell package intended for embedded devices" -arch="all !armhf !armv7" # armhf: pmaports#75, armv7: build.postmarketos.org#72 +arch="all !armhf" url="https://invent.kde.org/plasma/plasma-nano" license="GPL-2.0-or-later AND LGPL-2.1-or-later" makedepends="extra-cmake-modules qt5-qtbase-dev qt5-qtdeclarative-dev plasma-framework-dev kwindowsystem-dev kwayland-dev" diff --git a/temp/plasma-phone-components/APKBUILD b/temp/plasma-phone-components/APKBUILD index 64afc05373d..9c54173a1d0 100644 --- a/temp/plasma-phone-components/APKBUILD +++ b/temp/plasma-phone-components/APKBUILD @@ -4,7 +4,7 @@ pkgver=5.19.3_git20200626 pkgrel=0 _commit="d76fc145f924e06353e38defb088b4e9b32e0e52" pkgdesc="Modules providing phone functionality for Plasma" -arch="all !armhf !armv7" # armhf: pmaports#75, armv7: build.postmarketos.org#72 +arch="all !armhf" url="https://www.plasma-mobile.org/" license="GPL-2.0-or-later AND LGPL-2.1-or-later" depends="plasma-nano qt5-qtquickcontrols2 plasma-workspace dbus-x11 kactivities plasma-pa plasma-nm libqofono breeze-icons plasma-settings telepathy-ofono $pkgname-vkbd-style" -- GitLab