From 518e62df34926fe767ce1156f43a19851873f07a Mon Sep 17 00:00:00 2001 From: Arnav Singh Date: Mon, 12 Feb 2024 08:54:38 -0800 Subject: [PATCH] main/postmarketos-base-ui: add tinydm subpackage to pull in xinit (MR 4814) tinydm uses startx for Xorg UIs, which is provided by the xinit package. The xinit package used to be pulled in automatically by the xorg-server package, but this stopped being the case with https://gitlab.alpinelinux.org/alpine/aports/-/commit/1fd2d70696b88a0605ad5771137da148c998c192 --- main/postmarketos-base-ui/APKBUILD | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/main/postmarketos-base-ui/APKBUILD b/main/postmarketos-base-ui/APKBUILD index 309a74be1..e4d87a160 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=18 -pkgrel=0 +pkgrel=1 pkgdesc="Meta package for minimal postmarketOS UI base" url="https://postmarketos.org" arch="noarch" @@ -31,6 +31,7 @@ subpackages=" $pkgname-qt-tweaks:qt_tweaks $pkgname-qt-wayland:qt_wayland $pkgname-tinydm + $pkgname-tinydm-x11:tinydm_x11 $pkgname-wifi-iwd:iwd $pkgname-wifi-wpa_supplicant:wpa_supplicant $pkgname-x11 @@ -147,6 +148,13 @@ tinydm() { amove etc/tinydm.d/env-wayland.d/50-sdl-wayland.sh } +tinydm_x11() { + install_if="$pkgname-tinydm=$pkgver-r$pkgrel xorg-server" + depends="xinit" + + mkdir "$subpkgdir" +} + pulseaudio() { install_if="$pkgname=$pkgver-r$pkgrel pulseaudio" depends="pulseaudio-utils"