From 440aa4ede3fd42b8af74c0e41ac68a798576a87f Mon Sep 17 00:00:00 2001 From: Clayton Craft Date: Tue, 3 May 2022 20:44:39 -0700 Subject: [PATCH] main/postmarketos-ui-*: add networkmanager subpackages for wifi, wwan (MR 3110) the networkmanager package in alpine was refactored and the wifi and wwan components were split off into separate subpackages. without these, wifi and wwan networking are broken. also see: aports 830af82c6c [ci:ignore-count] --- main/postmarketos-base-ui-gnome/APKBUILD | 4 +++- main/postmarketos-ui-console/APKBUILD | 4 +++- main/postmarketos-ui-fbkeyboard/APKBUILD | 4 +++- main/postmarketos-ui-i3wm/APKBUILD | 4 +++- main/postmarketos-ui-kodi/APKBUILD | 4 +++- main/postmarketos-ui-lxqt/APKBUILD | 4 +++- main/postmarketos-ui-mate/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-weston/APKBUILD | 4 +++- main/postmarketos-ui-xfce4/APKBUILD | 4 +++- main/sxmo-common/APKBUILD | 4 +++- 15 files changed, 45 insertions(+), 15 deletions(-) diff --git a/main/postmarketos-base-ui-gnome/APKBUILD b/main/postmarketos-base-ui-gnome/APKBUILD index b5e567194..5328dc97d 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=1 +pkgrel=2 pkgdesc="Meta package for shared configuration for GNOME-based UIs" url="https://postmarketos.org" arch="noarch" @@ -12,6 +12,8 @@ depends=" networkmanager networkmanager-cli networkmanager-tui + networkmanager-wifi + networkmanager-wwan polkit-elogind postmarketos-base-ui pulseaudio diff --git a/main/postmarketos-ui-console/APKBUILD b/main/postmarketos-ui-console/APKBUILD index c064a3048..5be9e7ede 100644 --- a/main/postmarketos-ui-console/APKBUILD +++ b/main/postmarketos-ui-console/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: Clayton Craft pkgname=postmarketos-ui-console pkgver=0.1 -pkgrel=2 +pkgrel=3 pkgdesc="Console environment, with no graphical/touch UI" url="https://postmarketos.org/" arch="noarch" @@ -12,6 +12,8 @@ depends=" networkmanager networkmanager-cli networkmanager-tui + networkmanager-wifi + networkmanager-wwan postmarketos-base-ui wireless-tools " diff --git a/main/postmarketos-ui-fbkeyboard/APKBUILD b/main/postmarketos-ui-fbkeyboard/APKBUILD index f1a703c2b..823e28364 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=1 -pkgrel=4 +pkgrel=5 pkgdesc="Plain framebuffer console with touchscreen keyboard support" url="https://github.com/bakonyiferenc/fbkeyboard" arch="all" @@ -13,6 +13,8 @@ depends=" networkmanager networkmanager-cli networkmanager-tui + networkmanager-wifi + networkmanager-wwan postmarketos-base-ui " install="$pkgname.post-install $pkgname.pre-deinstall $pkgname.post-upgrade" diff --git a/main/postmarketos-ui-i3wm/APKBUILD b/main/postmarketos-ui-i3wm/APKBUILD index 11b0eab30..f478aaf6b 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.3 -pkgrel=10 +pkgrel=11 pkgdesc="(X11) Tiling WM (keyboard required)" url="https://i3wm.org" arch="noarch" @@ -19,6 +19,8 @@ depends=" networkmanager networkmanager-cli networkmanager-tui + networkmanager-wifi + networkmanager-wwan postmarketos-base-ui st xinput diff --git a/main/postmarketos-ui-kodi/APKBUILD b/main/postmarketos-ui-kodi/APKBUILD index 1b2d2ec2d..aba9270bf 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=1 +pkgrel=2 pkgdesc="(GBM) 10-foot UI useful on TV's" url="https://kodi.tv" arch="x86 x86_64 aarch64" # flatbuffers missing on armhf and armv7 @@ -18,6 +18,8 @@ depends=" networkmanager networkmanager-cli 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 1c3931fa6..eb2c7d844 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=3 +pkgrel=4 pkgdesc="(X11) Lightweight Qt Desktop Environment (stylus recommended)" url="https://lxqt-project.org/" arch="noarch !armhf" # lxqt-desktop not available on armhf @@ -17,6 +17,8 @@ depends=" networkmanager networkmanager-cli networkmanager-tui + networkmanager-wifi + networkmanager-wwan postmarketos-base-ui tinydm tinydm-openrc diff --git a/main/postmarketos-ui-mate/APKBUILD b/main/postmarketos-ui-mate/APKBUILD index f2e9b4a15..5cf10d167 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=3 +pkgrel=4 pkgdesc="(X11) MATE Desktop Environment, fork of GNOME2 (stylus recommended)" url="http://mate-desktop.org/" arch="noarch" @@ -19,6 +19,8 @@ depends=" networkmanager networkmanager-cli networkmanager-tui + networkmanager-wifi + networkmanager-wwan postmarketos-base-ui postmarketos-artwork-wallpapers xorg-server diff --git a/main/postmarketos-ui-plasma-bigscreen/APKBUILD b/main/postmarketos-ui-plasma-bigscreen/APKBUILD index ad2300bf0..6bcff5a60 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=12 +pkgrel=13 _commit_configs="a8bd93e279c222be6058ef46b065c11e88aa8400" pkgdesc="(Wayland) 10-feet variant of Plasma, made for big screen TVs" url="https://wiki.postmarketos.org/wiki/Plasma_Bigscreen" @@ -15,6 +15,8 @@ depends=" networkmanager networkmanager-cli networkmanager-tui + networkmanager-wifi + networkmanager-wwan plasma-bigscreen polkit-kde-agent-1 postmarketos-artwork-wallpapers diff --git a/main/postmarketos-ui-plasma-desktop/APKBUILD b/main/postmarketos-ui-plasma-desktop/APKBUILD index e7610986c..d8de6925d 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=7 +pkgrel=8 pkgdesc="(X11/Wayland) KDE Desktop Environment (works well with tablets)" url="https://www.kde.org" # armhf blocked by plasma @@ -31,6 +31,8 @@ _pmb_recommends="ark networkmanager networkmanager-cli networkmanager-tui + networkmanager-wifi + networkmanager-wwan okular print-manager postmarketos-artwork-wallpapers diff --git a/main/postmarketos-ui-plasma-mobile/APKBUILD b/main/postmarketos-ui-plasma-mobile/APKBUILD index 9b9c8bd4d..07b277663 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.8 -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 @@ -22,6 +22,8 @@ depends=" networkmanager networkmanager-cli networkmanager-tui + networkmanager-wifi + networkmanager-wwan plasma-mobile polkit-kde-agent-1 postmarketos-base-ui diff --git a/main/postmarketos-ui-shelli/APKBUILD b/main/postmarketos-ui-shelli/APKBUILD index a88ba9baa..11b89336b 100644 --- a/main/postmarketos-ui-shelli/APKBUILD +++ b/main/postmarketos-ui-shelli/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: Craig Comstock pkgname=postmarketos-ui-shelli pkgver=3 -pkgrel=3 +pkgrel=4 pkgdesc="Plain console with touchscreen gesture support" url="https://gitlab.com/unrznbl/shelli" arch="all" @@ -12,6 +12,8 @@ depends=" networkmanager networkmanager-cli networkmanager-tui + networkmanager-wifi + networkmanager-wwan ofono ofonoctl postmarketos-base-ui diff --git a/main/postmarketos-ui-sway/APKBUILD b/main/postmarketos-ui-sway/APKBUILD index 738919dc1..e8f3c1d7b 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=4 +pkgrel=5 pkgdesc="(Wayland) Tiling WM, drop-in replacement for i3wm (DOES NOT RUN WITHOUT HW ACCELERATION!)" url="https://postmarketos.org" arch="noarch" @@ -14,6 +14,8 @@ depends=" networkmanager networkmanager-cli networkmanager-tui + networkmanager-wifi + networkmanager-wwan polkit-elogind postmarketos-base-ui pulseaudio diff --git a/main/postmarketos-ui-weston/APKBUILD b/main/postmarketos-ui-weston/APKBUILD index 46b40b5a4..625d09405 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=1 +pkgrel=2 pkgdesc="(Wayland) Reference compositor (demo, not a phone interface)" url="https://postmarketos.org" arch="noarch" @@ -13,6 +13,8 @@ depends=" networkmanager networkmanager-cli networkmanager-tui + networkmanager-wifi + networkmanager-wwan postmarketos-base-ui tinydm tinydm-openrc diff --git a/main/postmarketos-ui-xfce4/APKBUILD b/main/postmarketos-ui-xfce4/APKBUILD index 47a698280..8f09b3162 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=5 +pkgrel=6 pkgdesc="(X11) Lightweight desktop (stylus recommended)" url="https://gitlab.com/postmarketOS/xfce4-phone" arch="noarch" @@ -17,6 +17,8 @@ depends=" networkmanager networkmanager-cli networkmanager-tui + networkmanager-wifi + networkmanager-wwan polkit-elogind postmarketos-base-ui xfce4 diff --git a/main/sxmo-common/APKBUILD b/main/sxmo-common/APKBUILD index 15fef8b3e..6e1a91068 100644 --- a/main/sxmo-common/APKBUILD +++ b/main/sxmo-common/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: Miles Alan pkgname=sxmo-common pkgver=1.9.0 -pkgrel=0 +pkgrel=1 pkgdesc="Simple Mobile: Core package to build custom SXMO desktop environments" url="http://sr.ht/~mil/Sxmo" arch="noarch !armhf" @@ -35,6 +35,8 @@ depends=" networkmanager-cli networkmanager-openrc networkmanager-tui + networkmanager-wifi + networkmanager-wwan pamixer pipewire pipewire-pulse