From dfd882c5faba1b66de433865b5fde5f86e974cc8 Mon Sep 17 00:00:00 2001 From: Clayton Craft Date: Wed, 9 Jun 2021 16:34:05 -0700 Subject: [PATCH] postmarketos-ui-*: explicitly depend on pmos-base-ui, dnsmasq (MR 2243) UIs that depend on networkmanager also have an added dependency on dnsmasq since this was removed from postmarketos-base [ci:ignore-count] lots of packages, but no code compilation.. --- main/postmarketos-ui-asteroid/APKBUILD | 3 ++- main/postmarketos-ui-fbkeyboard/APKBUILD | 4 +++- main/postmarketos-ui-glacier/APKBUILD | 3 ++- main/postmarketos-ui-gnome/APKBUILD | 4 +++- main/postmarketos-ui-i3wm/APKBUILD | 4 +++- main/postmarketos-ui-kodi/APKBUILD | 3 ++- main/postmarketos-ui-lxqt/APKBUILD | 4 +++- main/postmarketos-ui-mate/APKBUILD | 4 +++- main/postmarketos-ui-phosh/APKBUILD | 4 +++- main/postmarketos-ui-plasma-bigscreen/APKBUILD | 4 +++- main/postmarketos-ui-plasma-desktop/APKBUILD | 4 +++- main/postmarketos-ui-plasma-mobile/APKBUILD | 4 +++- main/postmarketos-ui-shelli/APKBUILD | 4 +++- main/postmarketos-ui-sway/APKBUILD | 4 +++- main/postmarketos-ui-sxmo/APKBUILD | 4 +++- main/postmarketos-ui-weston/APKBUILD | 4 +++- main/postmarketos-ui-xfce4/APKBUILD | 4 +++- 17 files changed, 48 insertions(+), 17 deletions(-) diff --git a/main/postmarketos-ui-asteroid/APKBUILD b/main/postmarketos-ui-asteroid/APKBUILD index 265741c35..16fe73c4a 100644 --- a/main/postmarketos-ui-asteroid/APKBUILD +++ b/main/postmarketos-ui-asteroid/APKBUILD @@ -1,7 +1,7 @@ # Maintainer: Bart Ribbers pkgname=postmarketos-ui-asteroid pkgver=0.1 -pkgrel=2 +pkgrel=3 pkgdesc="(Wayland) Smartwatch UI from AsteroidOS" url="https://wiki.postmarketos.org/wiki/AsteroidOS" # armhf blocked by asteroid-launcher @@ -14,6 +14,7 @@ depends=" # Required to launch depends="$depends elogind + postmarketos-base-ui tinydm tinydm-openrc " diff --git a/main/postmarketos-ui-fbkeyboard/APKBUILD b/main/postmarketos-ui-fbkeyboard/APKBUILD index 7792dfd58..4cee32006 100644 --- a/main/postmarketos-ui-fbkeyboard/APKBUILD +++ b/main/postmarketos-ui-fbkeyboard/APKBUILD @@ -1,14 +1,16 @@ # Maintainer: Ferenc Bakonyi pkgname=postmarketos-ui-fbkeyboard pkgver=1 -pkgrel=2 +pkgrel=3 pkgdesc="Plain framebuffer console with touchscreen keyboard support" url="https://github.com/bakonyiferenc/fbkeyboard" arch="all" license="GPL-3.0-or-later" depends=" + dnsmasq fbkeyboard networkmanager + postmarketos-base-ui " install="$pkgname.post-install $pkgname.pre-deinstall $pkgname.post-upgrade" source="fbkeyboard.init" diff --git a/main/postmarketos-ui-glacier/APKBUILD b/main/postmarketos-ui-glacier/APKBUILD index 5262c3785..6ae912d1d 100644 --- a/main/postmarketos-ui-glacier/APKBUILD +++ b/main/postmarketos-ui-glacier/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: Bart Ribbers pkgname=postmarketos-ui-glacier pkgver=0.1 -pkgrel=3 +pkgrel=4 pkgdesc="(Wayland) Open-source alternative to the SailfishOS UI" url="https://wiki.postmarketos.org/wiki/Glacier" # armhf blocked by glacier-home @@ -14,6 +14,7 @@ depends=" glacier-home ofono ofono-openrc + postmarketos-base-ui pulseaudio qt5-qtvirtualkeyboard urfkill diff --git a/main/postmarketos-ui-gnome/APKBUILD b/main/postmarketos-ui-gnome/APKBUILD index 2b93d6a66..11b1f9a8f 100644 --- a/main/postmarketos-ui-gnome/APKBUILD +++ b/main/postmarketos-ui-gnome/APKBUILD @@ -1,17 +1,19 @@ # Maintainer: Martijn Braam pkgname=postmarketos-ui-gnome pkgver=1 -pkgrel=6 +pkgrel=8 pkgdesc="(Wayland) Gnome Shell" url="https://gnome.org/" # armhf: gdm missing arch="noarch !armhf" license="GPL-3.0-or-later" depends=" + dnsmasq gdm gnome kgx polkit-elogind + postmarketos-base-ui postmarketos-artwork-wallpapers pulseaudio xwayland diff --git a/main/postmarketos-ui-i3wm/APKBUILD b/main/postmarketos-ui-i3wm/APKBUILD index d5b05c001..42e9c9092 100644 --- a/main/postmarketos-ui-i3wm/APKBUILD +++ b/main/postmarketos-ui-i3wm/APKBUILD @@ -1,13 +1,14 @@ # Maintainer: Martijn Braam pkgname=postmarketos-ui-i3wm pkgver=0.3 -pkgrel=7 +pkgrel=8 pkgdesc="(X11) Tiling WM (keyboard required)" url="https://i3wm.org" arch="noarch" license="GPL-3.0-or-later" depends=" dmenu + dnsmasq elogind i3status i3wm @@ -15,6 +16,7 @@ depends=" lightdm-openrc mesa-egl networkmanager + postmarketos-base-ui st xinput xorg-server diff --git a/main/postmarketos-ui-kodi/APKBUILD b/main/postmarketos-ui-kodi/APKBUILD index 1840bff8f..a7f96eec4 100644 --- a/main/postmarketos-ui-kodi/APKBUILD +++ b/main/postmarketos-ui-kodi/APKBUILD @@ -1,7 +1,7 @@ # Maintainer: Bart Ribbers pkgname=postmarketos-ui-kodi pkgver=1 -pkgrel=6 +pkgrel=7 pkgdesc="(Wayland) 10-foot UI useful on TV's" url="https://kodi.tv" arch="x86 x86_64 aarch64" # flatbuffers missing on armhf and armv7 @@ -11,6 +11,7 @@ depends=" elogind kodi kodi-wayland + postmarketos-base-ui pulseaudio tinydm tinydm-openrc diff --git a/main/postmarketos-ui-lxqt/APKBUILD b/main/postmarketos-ui-lxqt/APKBUILD index a9c36212c..6c53e9ba3 100644 --- a/main/postmarketos-ui-lxqt/APKBUILD +++ b/main/postmarketos-ui-lxqt/APKBUILD @@ -1,18 +1,20 @@ # Maintainer: Antoni Aloy pkgname=postmarketos-ui-lxqt pkgver=0.1 -pkgrel=1 +pkgrel=2 pkgdesc="(X11) Lightweight Qt Desktop Environment (stylus recommended)" url="https://lxqt-project.org/" arch="noarch !armhf" # lxqt-desktop not available on armhf license="GPL-3.0-or-later" depends=" dbus-x11 + dnsmasq elogind lxpolkit lxqt-desktop mesa-egl networkmanager + postmarketos-base-ui tinydm tinydm-openrc xorg-server diff --git a/main/postmarketos-ui-mate/APKBUILD b/main/postmarketos-ui-mate/APKBUILD index a3e34384a..13bb3e754 100644 --- a/main/postmarketos-ui-mate/APKBUILD +++ b/main/postmarketos-ui-mate/APKBUILD @@ -1,19 +1,21 @@ # Maintainer: Daniele Debernardi pkgname=postmarketos-ui-mate pkgver=1 -pkgrel=12 +pkgrel=13 pkgdesc="(X11) MATE Desktop Environment, fork of GNOME2 (stylus recommended)" url="http://mate-desktop.org/" arch="noarch" license="GPL-3.0-or-later" depends=" dbus-x11 + dnsmasq gtk+2.0 lightdm lightdm-openrc mate-desktop-environment mesa-egl networkmanager + postmarketos-base-ui postmarketos-artwork-wallpapers xorg-server " diff --git a/main/postmarketos-ui-phosh/APKBUILD b/main/postmarketos-ui-phosh/APKBUILD index 24e12a2de..060c37158 100644 --- a/main/postmarketos-ui-phosh/APKBUILD +++ b/main/postmarketos-ui-phosh/APKBUILD @@ -1,6 +1,6 @@ # Maintainer: Bart Ribbers pkgname=postmarketos-ui-phosh -pkgver=9 +pkgver=10 pkgrel=0 pkgdesc="(Wayland) Mobile UI developed for the Librem 5 (works only with numeric passwords!)" url="https://puri.sm" @@ -8,12 +8,14 @@ arch="noarch !armhf" license="GPL-3.0-or-later" depends=" bluez + dnsmasq gnome-keyring iio-sensor-proxy iio-sensor-proxy-openrc networkmanager phosh polkit-elogind + postmarketos-base-ui pulseaudio tinydm tinydm-openrc diff --git a/main/postmarketos-ui-plasma-bigscreen/APKBUILD b/main/postmarketos-ui-plasma-bigscreen/APKBUILD index 4a4cd075a..323a71e8c 100644 --- a/main/postmarketos-ui-plasma-bigscreen/APKBUILD +++ b/main/postmarketos-ui-plasma-bigscreen/APKBUILD @@ -1,7 +1,7 @@ # Maintainer: Bart Ribbers pkgname=postmarketos-ui-plasma-bigscreen pkgver=0.2 -pkgrel=5 +pkgrel=6 _commit_configs="757db09c8738b88d59e5d7b35b9939e91a7a31d7" pkgdesc="(Wayland) 10-feet variant of Plasma, made for big screen TVs" url="https://wiki.postmarketos.org/wiki/Plasma_Mobile" @@ -11,9 +11,11 @@ arch="noarch !armhf !armv7" license="GPL-3.0-or-later" depends=" elogind + dnsmasq networkmanager plasma-bigscreen postmarketos-artwork-wallpapers + postmarketos-base-ui pulseaudio qt5-qtvirtualkeyboard xdg-desktop-portal-kde diff --git a/main/postmarketos-ui-plasma-desktop/APKBUILD b/main/postmarketos-ui-plasma-desktop/APKBUILD index 309299cb9..8a2b9c845 100644 --- a/main/postmarketos-ui-plasma-desktop/APKBUILD +++ b/main/postmarketos-ui-plasma-desktop/APKBUILD @@ -1,13 +1,15 @@ # Maintainer: Bart Ribbers pkgname=postmarketos-ui-plasma-desktop pkgver=2 -pkgrel=4 +pkgrel=6 pkgdesc="(X11/Wayland) KDE Desktop Environment (works well with tablets)" url="https://www.kde.org" arch="noarch !armhf !x86" # x86: missing "plasma" license="GPL-3.0-or-later" depends=" + dnsmasq plasma + postmarketos-base-ui qt5-qtvirtualkeyboard sddm " diff --git a/main/postmarketos-ui-plasma-mobile/APKBUILD b/main/postmarketos-ui-plasma-mobile/APKBUILD index cd40d540b..c7b83afa7 100644 --- a/main/postmarketos-ui-plasma-mobile/APKBUILD +++ b/main/postmarketos-ui-plasma-mobile/APKBUILD @@ -1,7 +1,7 @@ # Maintainer: Bart Ribbers pkgname=postmarketos-ui-plasma-mobile pkgver=3.3 -pkgrel=5 +pkgrel=6 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 !x86" # armhf: pmaports#75, x86: aports#11807 @@ -9,6 +9,7 @@ license="GPL-3.0-or-later" depends=" bluedevil breeze + dnsmasq elogind hfd-service iio-sensor-proxy @@ -22,6 +23,7 @@ depends=" plasma-phone-components plasma-nm-mobile polkit-kde-agent-1 + postmarketos-base-ui powerdevil pulseaudio qt5-qtvirtualkeyboard diff --git a/main/postmarketos-ui-shelli/APKBUILD b/main/postmarketos-ui-shelli/APKBUILD index 9e363672c..5b12a5e0b 100644 --- a/main/postmarketos-ui-shelli/APKBUILD +++ b/main/postmarketos-ui-shelli/APKBUILD @@ -1,15 +1,17 @@ # Maintainer: Craig Comstock pkgname=postmarketos-ui-shelli pkgver=3 -pkgrel=1 +pkgrel=2 pkgdesc="Plain console with touchscreen gesture support" url="https://gitlab.com/unrznbl/shelli" arch="all" license="GPL-3.0-or-later" depends=" + dnsmasq networkmanager ofono ofonoctl + postmarketos-base-ui shelli " install="$pkgname.post-install $pkgname.pre-deinstall $pkgname.post-upgrade" diff --git a/main/postmarketos-ui-sway/APKBUILD b/main/postmarketos-ui-sway/APKBUILD index 9117d3710..8f43134d8 100644 --- a/main/postmarketos-ui-sway/APKBUILD +++ b/main/postmarketos-ui-sway/APKBUILD @@ -1,16 +1,18 @@ # Maintainer: Danct12 pkgname=postmarketos-ui-sway pkgver=2 -pkgrel=3 +pkgrel=4 pkgdesc="(Wayland) Tiling WM, drop-in replacement for i3wm (DOES NOT RUN WITHOUT HW ACCELERATION!)" url="https://postmarketos.org" arch="noarch !armhf !x86" # armhf,x86: aports#11807 license="GPL-3.0-or-later" depends=" + dnsmasq elogind lightdm lightdm-openrc networkmanager + postmarketos-base-ui sway " _pmb_recommends="alacritty diff --git a/main/postmarketos-ui-sxmo/APKBUILD b/main/postmarketos-ui-sxmo/APKBUILD index 4f527d07d..0f28395bf 100644 --- a/main/postmarketos-ui-sxmo/APKBUILD +++ b/main/postmarketos-ui-sxmo/APKBUILD @@ -1,14 +1,16 @@ # Maintainer: Miles Alan pkgname=postmarketos-ui-sxmo pkgver=1.4.1 -pkgrel=7 +pkgrel=8 pkgdesc="(X11) Simple X Mobile: Mobile environment based on simple & suckless software (best compatibility on pinephone)" url="http://sr.ht/~mil/Sxmo" arch="noarch !armhf" license="MIT" depends=" + dnsmasq networkmanager-openrc modemmanager-openrc + postmarketos-base-ui sxmo-utils-openrc sxmo-xdm-config sxmo-xdm-config-openrc diff --git a/main/postmarketos-ui-weston/APKBUILD b/main/postmarketos-ui-weston/APKBUILD index e46070bf5..208e19765 100644 --- a/main/postmarketos-ui-weston/APKBUILD +++ b/main/postmarketos-ui-weston/APKBUILD @@ -1,14 +1,16 @@ # Maintainer: Bart Ribbers pkgname=postmarketos-ui-weston pkgver=5 -pkgrel=3 +pkgrel=4 pkgdesc="(Wayland) Reference compositor (demo, not a phone interface)" url="https://postmarketos.org" arch="noarch" license="GPL-3.0-or-later" depends=" + dnsmasq elogind networkmanager + postmarketos-base-ui tinydm tinydm-openrc weston-clients diff --git a/main/postmarketos-ui-xfce4/APKBUILD b/main/postmarketos-ui-xfce4/APKBUILD index 792c3a318..de7de78a4 100644 --- a/main/postmarketos-ui-xfce4/APKBUILD +++ b/main/postmarketos-ui-xfce4/APKBUILD @@ -1,18 +1,20 @@ # Maintainer: Daniele Debernardi pkgname=postmarketos-ui-xfce4 pkgver=0.3 -pkgrel=6 +pkgrel=7 pkgdesc="(X11) Lightweight desktop (stylus recommended)" url="https://gitlab.com/postmarketOS/xfce4-phone" arch="noarch" license="GPL-3.0-or-later" depends=" + dnsmasq elogind lightdm lightdm-openrc lxpolkit mesa-egl networkmanager + postmarketos-base-ui xfce4 xorg-server "