From 5eee83f1fd4e9e5cbf93eb62df8d6bacc976f30d Mon Sep 17 00:00:00 2001
From: Oliver Smith <ollieparanoid@postmarketos.org>
Date: Tue, 29 Oct 2024 17:52:55 +0100
Subject: [PATCH] main/postmarketos-ui-phosh: remove systemd subpkg (MR 5743)
v24.06 doesn't have systemd, and this -systemd subpackage cannot be
installed because there is no phosh-service (as listed in depends="").
Fix it so the upstream-compat job doesn't complain about it anymore:
Increase 'postmarketos-ui-phosh' pkgrel (6 -> 7), missing depend(s): phosh-service
[ci:skip-build]: already built successfully in CI
---
main/postmarketos-ui-phosh/APKBUILD | 14 ++------------
.../postmarketos-ui-phosh-systemd.post-install | 3 ---
2 files changed, 2 insertions(+), 15 deletions(-)
delete mode 100644 main/postmarketos-ui-phosh/postmarketos-ui-phosh-systemd.post-install
diff --git a/main/postmarketos-ui-phosh/APKBUILD b/main/postmarketos-ui-phosh/APKBUILD
index 5b742be96f2..9021c573d63 100644
--- a/main/postmarketos-ui-phosh/APKBUILD
+++ b/main/postmarketos-ui-phosh/APKBUILD
@@ -2,7 +2,7 @@
# Maintainer: Newbyte <newbyte@postmarketos.org>
pkgname=postmarketos-ui-phosh
pkgver=22.3
-pkgrel=6
+pkgrel=7
pkgdesc="(Wayland) Mobile UI initially developed for the Librem 5"
url="https://phosh.mobi"
arch="noarch !armhf"
@@ -43,7 +43,7 @@ source="
udiskie.desktop
"
options="!check pmb:gpu-accel pmb:systemd"
-subpackages="$pkgname-openrc $pkgname-systemd"
+subpackages="$pkgname-openrc"
package() {
install -Dm644 "$srcdir"/01_postmarketos-ui-phosh.gschema.override \
@@ -64,16 +64,6 @@ openrc() {
mkdir "$subpkgdir"
}
-systemd() {
- install_if="$pkgname=$pkgver-r$pkgrel systemd"
- install="$subpkgname.post-install"
- depends="
- libcap-utils
- phosh-service
- "
- mkdir "$subpkgdir"
-}
-
sha512sums="
e577b8073df680ccee75ef5b6bb1f2877d5727687d63d6fd9211298e791b6c9f593eb79278c77a4b4918e3c57333c2a012030baf5a3c8d6d16000cc63a030f84 01_postmarketos-ui-phosh.gschema.override
a741e8db9e4232334b924326c48be4e4c8f7a2382a7608926918a7491c518b2dda551e55a00d4d5fcf58c7950a78dc35d5cc5eaab53ad93a56de40887071f242 mimeapps.list
diff --git a/main/postmarketos-ui-phosh/postmarketos-ui-phosh-systemd.post-install b/main/postmarketos-ui-phosh/postmarketos-ui-phosh-systemd.post-install
deleted file mode 100644
index 5ca967066d3..00000000000
--- a/main/postmarketos-ui-phosh/postmarketos-ui-phosh-systemd.post-install
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/bin/sh
-
-systemctl enable phosh
--
GitLab