From 9d33e4d812f6d7cc273ff40d0261fae340e9de08 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Pablo=20Correa=20G=C3=B3mez?= Date: Thu, 3 Apr 2025 14:25:30 +0200 Subject: [PATCH] main/postmarketos-base-ui: remove "_" from beginning of split functions This is inconsistent through the file. In addition, the "_" prefix is often used when a function is not directly a split function from a subpackage, but a "private" function that others call. So remove it to make it clear that these are subpackage split functions Part-of: https://gitlab.postmarketos.org/postmarketOS/pmaports/-/merge_requests/6375 --- main/postmarketos-base-ui/APKBUILD | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/main/postmarketos-base-ui/APKBUILD b/main/postmarketos-base-ui/APKBUILD index cb871045f..a2580eb25 100644 --- a/main/postmarketos-base-ui/APKBUILD +++ b/main/postmarketos-base-ui/APKBUILD @@ -24,16 +24,16 @@ depends=" " subpackages=" $pkgname-audio - $pkgname-audio-pipewire:_audio_pipewire - $pkgname-audio-pulseaudio:_audio_pulseaudio - $pkgname-bluez-openrc:_bluez_openrc - $pkgname-bluez-obexd:_obexd + $pkgname-audio-pipewire:audio_pipewire + $pkgname-audio-pulseaudio:audio_pulseaudio + $pkgname-bluez-openrc:bluez_openrc + $pkgname-bluez-obexd:obexd $pkgname-elogind $pkgname-flatpak - $pkgname-networkmanager-usb-tethering:_usb_tethering + $pkgname-networkmanager-usb-tethering:usb_tethering $pkgname-networkmanager - $pkgname-openrc:_openrc - $pkgname-openrc-settingsd:_openrc_settingsd + $pkgname-openrc + $pkgname-openrc-settingsd:openrc_settingsd $pkgname-qt-tweaks:qt_tweaks $pkgname-qt-wayland:qt_wayland $pkgname-tinydm @@ -138,13 +138,13 @@ x11() { amove etc/X11/Xwrapper.config } -_bluez_openrc() { +bluez_openrc() { install_if="$pkgname=$pkgver-r$pkgrel bluez-openrc" amove etc/conf.d/bluetooth } -_openrc() { +openrc() { install_if="$pkgname=$pkgver-r$pkgrel openrc" install="$subpkgname.post-install $subpkgname.post-upgrade" depends=" @@ -171,7 +171,7 @@ elogind() { amove etc/sleep-inhibitor.conf } -_openrc_settingsd() { +openrc_settingsd() { install_if="$pkgname=$pkgver-r$pkgrel openrc-settingsd-openrc" install="$subpkgname.post-install $subpkgname.post-upgrade" replaces="openrc-settingsd-openrc" @@ -186,14 +186,14 @@ tinydm() { amove etc/tinydm.d/env-wayland.d/50-sdl-wayland.sh } -_obexd() { +obexd() { install_if="$pkgname=$pkgver-r$pkgrel bluez-obexd" replaces="bluez-obexd" depends="obex-capabilities" mkdir -p "$subpkgdir" } -_usb_tethering() { +usb_tethering() { install_if="$pkgname-networkmanager=$pkgver-r$pkgrel" replaces="$pkgname-networkmanager" @@ -276,7 +276,7 @@ audio() { mkdir "$subpkgdir" } -_audio_pipewire() { +audio_pipewire() { pkgdesc="Use pipewire as the audio backend. (but may not work with all devices)" depends="pipewire-alsa pipewire-pulse pipewire-spa-bluez pipewire-tools" provides="postmarketos-base-ui-audio-backend=$pkgver-r$pkgrel" @@ -285,7 +285,7 @@ _audio_pipewire() { amove usr/share/wireplumber/wireplumber.conf.d/50-bluetooth.conf } -_audio_pulseaudio() { +audio_pulseaudio() { pkgdesc="Use pulseaudio as the audio backend." depends="alsa-plugins-pulse pulseaudio pulseaudio-alsa pulseaudio-utils !pipewire-pulse" provides="postmarketos-base-ui-audio-backend=$pkgver-r$pkgrel"