diff --git a/main/postmarketos-base-ui-gnome/APKBUILD b/main/postmarketos-base-ui-gnome/APKBUILD index 353a30a2a..a6385523f 100644 --- a/main/postmarketos-base-ui-gnome/APKBUILD +++ b/main/postmarketos-base-ui-gnome/APKBUILD @@ -1,6 +1,6 @@ pkgname=postmarketos-base-ui-gnome pkgver=1 -pkgrel=3 +pkgrel=4 pkgdesc="Meta package for shared configuration for GNOME-based UIs" url="https://postmarketos.org" arch="noarch" @@ -9,14 +9,9 @@ depends=" dnsmasq elogind gnome-bluetooth - networkmanager - networkmanager-cli - networkmanager-openrc - networkmanager-tui - networkmanager-wifi - networkmanager-wwan polkit-elogind postmarketos-base-ui + postmarketos-base-ui-networkmanager pulseaudio " source=" diff --git a/main/postmarketos-base-ui/APKBUILD b/main/postmarketos-base-ui/APKBUILD index 5621110e1..dcbb3c690 100644 --- a/main/postmarketos-base-ui/APKBUILD +++ b/main/postmarketos-base-ui/APKBUILD @@ -1,7 +1,7 @@ # Maintainer: Clayton Craft pkgname=postmarketos-base-ui pkgver=6 -pkgrel=1 +pkgrel=2 pkgdesc="Meta package for minimal postmarketOS UI base" url="https://postmarketos.org" arch="noarch" @@ -118,7 +118,13 @@ _obexd() { } networkmanager() { - install_if="$pkgname=$pkgver-r$pkgrel networkmanager" + depends=" + networkmanager + networkmanager-cli + networkmanager-openrc + networkmanager-tui + networkmanager-wifi + networkmanager-wwan" amove etc/NetworkManager/conf.d/hostname-mode.conf } diff --git a/main/postmarketos-ui-console/APKBUILD b/main/postmarketos-ui-console/APKBUILD index 62bd75071..285776d8b 100644 --- a/main/postmarketos-ui-console/APKBUILD +++ b/main/postmarketos-ui-console/APKBUILD @@ -2,20 +2,15 @@ # Maintainer: Clayton Craft pkgname=postmarketos-ui-console pkgver=0.1 -pkgrel=4 +pkgrel=5 pkgdesc="Console environment, with no graphical/touch UI" url="https://postmarketos.org/" arch="noarch" license="GPL-3.0-or-later" depends=" dnsmasq - networkmanager - networkmanager-cli - networkmanager-openrc - networkmanager-tui - networkmanager-wifi - networkmanager-wwan postmarketos-base-ui + postmarketos-base-ui-networkmanager wireless-tools " options="!check" # No testsuite diff --git a/main/postmarketos-ui-fbkeyboard/APKBUILD b/main/postmarketos-ui-fbkeyboard/APKBUILD index 9f429976a..03ac2376d 100644 --- a/main/postmarketos-ui-fbkeyboard/APKBUILD +++ b/main/postmarketos-ui-fbkeyboard/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: Ferenc Bakonyi pkgname=postmarketos-ui-fbkeyboard pkgver=2 -pkgrel=0 +pkgrel=1 pkgdesc="Plain framebuffer console with touchscreen keyboard support" url="https://github.com/bakonyiferenc/fbkeyboard" arch="all" @@ -10,13 +10,8 @@ license="GPL-3.0-or-later" depends=" dnsmasq fbkeyboard - networkmanager - networkmanager-cli - networkmanager-openrc - networkmanager-tui - networkmanager-wifi - networkmanager-wwan postmarketos-base-ui + postmarketos-base-ui-networkmanager " install="$pkgname.post-install $pkgname.pre-deinstall $pkgname.post-upgrade" source="fbkeyboard.init" diff --git a/main/postmarketos-ui-i3wm/APKBUILD b/main/postmarketos-ui-i3wm/APKBUILD index 9274ae3b9..d72e2e6eb 100644 --- a/main/postmarketos-ui-i3wm/APKBUILD +++ b/main/postmarketos-ui-i3wm/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: Martijn Braam pkgname=postmarketos-ui-i3wm pkgver=0.4 -pkgrel=0 +pkgrel=1 pkgdesc="(X11) Tiling WM (keyboard required)" url="https://i3wm.org" arch="noarch" @@ -16,13 +16,8 @@ depends=" tinydm tinydm-openrc mesa-egl - networkmanager - networkmanager-cli - networkmanager-openrc - networkmanager-tui - networkmanager-wifi - networkmanager-wwan postmarketos-base-ui + postmarketos-base-ui-networkmanager st xorg-server " diff --git a/main/postmarketos-ui-kodi/APKBUILD b/main/postmarketos-ui-kodi/APKBUILD index 069b74175..d1dc37d2f 100644 --- a/main/postmarketos-ui-kodi/APKBUILD +++ b/main/postmarketos-ui-kodi/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: Bart Ribbers pkgname=postmarketos-ui-kodi pkgver=2 -pkgrel=4 +pkgrel=5 pkgdesc="(GBM) 10-foot UI useful on TV's" url="https://kodi.tv" # kodi does not know of other archs @@ -14,14 +14,9 @@ depends=" kodi-gbm kodi-polkit postmarketos-base-ui + postmarketos-base-ui-networkmanager pulseaudio upower - networkmanager - networkmanager-cli - networkmanager-openrc - networkmanager-tui - networkmanager-wifi - networkmanager-wwan " install="$pkgname.post-install $pkgname.post-upgrade" options="!check pmb:gpu-accel" diff --git a/main/postmarketos-ui-lxqt/APKBUILD b/main/postmarketos-ui-lxqt/APKBUILD index ac32e0a8b..97529e0f7 100644 --- a/main/postmarketos-ui-lxqt/APKBUILD +++ b/main/postmarketos-ui-lxqt/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: Antoni Aloy pkgname=postmarketos-ui-lxqt pkgver=0.1 -pkgrel=5 +pkgrel=6 pkgdesc="(X11) Lightweight Qt Desktop Environment (stylus recommended)" url="https://lxqt-project.org/" arch="noarch !armhf" # lxqt-desktop not available on armhf @@ -14,13 +14,8 @@ depends=" lxpolkit lxqt-desktop mesa-egl - networkmanager - networkmanager-cli - networkmanager-openrc - networkmanager-tui - networkmanager-wifi - networkmanager-wwan postmarketos-base-ui + postmarketos-base-ui-networkmanager tinydm tinydm-openrc xorg-server diff --git a/main/postmarketos-ui-mate/APKBUILD b/main/postmarketos-ui-mate/APKBUILD index bc61243d7..def9c71fa 100644 --- a/main/postmarketos-ui-mate/APKBUILD +++ b/main/postmarketos-ui-mate/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: Jakko pkgname=postmarketos-ui-mate pkgver=5 -pkgrel=6 +pkgrel=7 pkgdesc="(X11) MATE Desktop Environment, fork of GNOME2 (stylus recommended)" url="http://mate-desktop.org/" arch="noarch" @@ -17,14 +17,9 @@ depends=" lightdm-openrc mate-desktop-environment mesa-egl - networkmanager - networkmanager-cli - networkmanager-openrc - networkmanager-tui - networkmanager-wifi - networkmanager-wwan polkit-elogind postmarketos-base-ui + postmarketos-base-ui-networkmanager postmarketos-artwork-wallpapers xorg-server " diff --git a/main/postmarketos-ui-plasma-bigscreen/APKBUILD b/main/postmarketos-ui-plasma-bigscreen/APKBUILD index a647df715..b6534b096 100644 --- a/main/postmarketos-ui-plasma-bigscreen/APKBUILD +++ b/main/postmarketos-ui-plasma-bigscreen/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: Bart Ribbers pkgname=postmarketos-ui-plasma-bigscreen pkgver=0.2 -pkgrel=14 +pkgrel=15 _commit_configs="a8bd93e279c222be6058ef46b065c11e88aa8400" pkgdesc="(Wayland) 10-feet variant of Plasma, made for big screen TVs" url="https://wiki.postmarketos.org/wiki/Plasma_Bigscreen" @@ -12,16 +12,11 @@ license="GPL-3.0-or-later" depends=" elogind dnsmasq - networkmanager - networkmanager-cli - networkmanager-openrc - networkmanager-tui - networkmanager-wifi - networkmanager-wwan plasma-bigscreen polkit-kde-agent-1 postmarketos-artwork-wallpapers postmarketos-base-ui + postmarketos-base-ui-networkmanager pulseaudio qt5-qtvirtualkeyboard xdg-desktop-portal-kde diff --git a/main/postmarketos-ui-plasma-desktop/APKBUILD b/main/postmarketos-ui-plasma-desktop/APKBUILD index 422bbb767..68ae9ba41 100644 --- a/main/postmarketos-ui-plasma-desktop/APKBUILD +++ b/main/postmarketos-ui-plasma-desktop/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: Bart Ribbers pkgname=postmarketos-ui-plasma-desktop pkgver=2 -pkgrel=13 +pkgrel=14 pkgdesc="(X11/Wayland) KDE Desktop Environment (works well with tablets)" url="https://www.kde.org" # armhf and riscv64 blocked by plasma @@ -27,13 +27,8 @@ _pmb_recommends=" kio-extras konsole maliit-keyboard - networkmanager - networkmanager-cli - networkmanager-openrc - networkmanager-tui - networkmanager-wifi - networkmanager-wwan postmarketos-artwork-wallpapers + postmarketos-base-ui-networkmanager print-manager qt5-qtvirtualkeyboard spectacle diff --git a/main/postmarketos-ui-plasma-mobile/APKBUILD b/main/postmarketos-ui-plasma-mobile/APKBUILD index fc4befc01..2beec924b 100644 --- a/main/postmarketos-ui-plasma-mobile/APKBUILD +++ b/main/postmarketos-ui-plasma-mobile/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: Bart Ribbers pkgname=postmarketos-ui-plasma-mobile pkgver=3.9 -pkgrel=0 +pkgrel=1 pkgdesc="(Wayland) Mobile variant of KDE Plasma (does not run without hardware acceleration)" url="https://wiki.postmarketos.org/wiki/Plasma_Mobile" arch="noarch !armhf !x86" # armhf: pmaports#75, x86: aports#11807 @@ -20,16 +20,11 @@ depends=" kwallet-pam kwayland-integration modemmanager - networkmanager - networkmanager-cli - networkmanager-openrc - networkmanager-tui - networkmanager-wifi - networkmanager-wwan pipewire plasma-mobile polkit-kde-agent-1 postmarketos-base-ui + postmarketos-base-ui-networkmanager powerdevil pulseaudio xdg-desktop-portal-kde diff --git a/main/postmarketos-ui-shelli/APKBUILD b/main/postmarketos-ui-shelli/APKBUILD index 930a933fe..a1b9c004d 100644 --- a/main/postmarketos-ui-shelli/APKBUILD +++ b/main/postmarketos-ui-shelli/APKBUILD @@ -2,22 +2,17 @@ # Maintainer: Craig Comstock pkgname=postmarketos-ui-shelli pkgver=3 -pkgrel=5 +pkgrel=6 pkgdesc="Plain console with touchscreen gesture support" url="https://gitlab.com/unrznbl/shelli" arch="all" license="GPL-3.0-or-later" depends=" dnsmasq - networkmanager - networkmanager-cli - networkmanager-openrc - networkmanager-tui - networkmanager-wifi - networkmanager-wwan ofono ofonoctl postmarketos-base-ui + postmarketos-base-ui-networkmanager 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 2d49c381c..3656deb59 100644 --- a/main/postmarketos-ui-sway/APKBUILD +++ b/main/postmarketos-ui-sway/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: Oliver Smith pkgname=postmarketos-ui-sway pkgver=3 -pkgrel=6 +pkgrel=7 pkgdesc="(Wayland) Tiling WM, drop-in replacement for i3wm (DOES NOT RUN WITHOUT HW ACCELERATION!)" url="https://postmarketos.org" arch="noarch" @@ -11,14 +11,9 @@ subpackages="$pkgname-logo-key-alt:logo_key_alt" depends=" dnsmasq elogind - networkmanager - networkmanager-cli - networkmanager-openrc - networkmanager-tui - networkmanager-wifi - networkmanager-wwan polkit-elogind postmarketos-base-ui + postmarketos-base-ui-networkmanager pulseaudio sway tinydm diff --git a/main/postmarketos-ui-weston/APKBUILD b/main/postmarketos-ui-weston/APKBUILD index 4b35b9eea..78ecade79 100644 --- a/main/postmarketos-ui-weston/APKBUILD +++ b/main/postmarketos-ui-weston/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: Bart Ribbers pkgname=postmarketos-ui-weston pkgver=6 -pkgrel=5 +pkgrel=6 pkgdesc="(Wayland) Reference compositor (demo, not a phone interface)" url="https://postmarketos.org" arch="noarch" @@ -10,13 +10,8 @@ license="GPL-3.0-or-later" depends=" dnsmasq elogind - networkmanager - networkmanager-cli - networkmanager-openrc - networkmanager-tui - networkmanager-wifi - networkmanager-wwan postmarketos-base-ui + postmarketos-base-ui-networkmanager tinydm tinydm-openrc weston-clients diff --git a/main/postmarketos-ui-xfce4/APKBUILD b/main/postmarketos-ui-xfce4/APKBUILD index 288078bd0..4164cfb73 100644 --- a/main/postmarketos-ui-xfce4/APKBUILD +++ b/main/postmarketos-ui-xfce4/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: Jakko pkgname=postmarketos-ui-xfce4 pkgver=0.5.1 -pkgrel=8 +pkgrel=9 pkgdesc="(X11) Lightweight desktop (stylus recommended)" url="https://gitlab.com/postmarketOS/xfce4-phone" arch="noarch" @@ -14,14 +14,9 @@ depends=" lightdm lightdm-openrc mesa-egl - networkmanager - networkmanager-cli - networkmanager-openrc - networkmanager-tui - networkmanager-wifi - networkmanager-wwan polkit-elogind postmarketos-base-ui + postmarketos-base-ui-networkmanager xfce4 xorg-server " diff --git a/main/sxmo-common/APKBUILD b/main/sxmo-common/APKBUILD index 481fac478..cc471f6c5 100644 --- a/main/sxmo-common/APKBUILD +++ b/main/sxmo-common/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: Miles Alan pkgname=sxmo-common pkgver=1.11.0 -pkgrel=1 +pkgrel=2 pkgdesc="Simple Mobile: Core package to build custom SXMO desktop environments" url="http://sr.ht/~mil/Sxmo" arch="noarch !armhf" @@ -31,17 +31,12 @@ depends=" modemmanager-openrc mpv ncurses - networkmanager - networkmanager-cli - networkmanager-openrc - networkmanager-tui - networkmanager-wifi - networkmanager-wwan pamixer pn polkit polkit-openrc postmarketos-base-ui + postmarketos-base-ui-networkmanager pulseaudio-utils superd sxmo-common-audio