From 051a9d763a775e39200857c93a0989d02eb41b6f Mon Sep 17 00:00:00 2001
From: Clayton Craft <clayton@craftyguy.net>
Date: Mon, 13 Dec 2021 22:26:55 -0800
Subject: [PATCH] device-qemu-*: fix sway subpackage install conditions (MR
 2749)

By setting the `install_if` to include postmarketos-ui-sway instead of
sway, apk doesn't seem to be confused if it is also trying to install
some other package with `provides=sway` in it.

fixes #1343

[ci:skip-build] already built successfully in CI
---
 device/main/device-qemu-aarch64/APKBUILD | 4 ++--
 device/main/device-qemu-amd64/APKBUILD   | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/device/main/device-qemu-aarch64/APKBUILD b/device/main/device-qemu-aarch64/APKBUILD
index 444cec466..cdcedd145 100644
--- a/device/main/device-qemu-aarch64/APKBUILD
+++ b/device/main/device-qemu-aarch64/APKBUILD
@@ -3,7 +3,7 @@
 # Co-Maintainer: Daniele Debernardi <drebrez@gmail.com>
 pkgname=device-qemu-aarch64
 pkgver=2.4
-pkgrel=0
+pkgrel=1
 pkgdesc="Simulated device in QEMU (aarch64)"
 url="https://postmarketos.org"
 arch="aarch64"
@@ -41,7 +41,7 @@ mce() {
 }
 
 sway() {
-	install_if="$pkgname=$pkgver-r$pkgrel sway"
+	install_if="$pkgname=$pkgver-r$pkgrel postmarketos-ui-sway"
 	depends="postmarketos-ui-sway-logo-key-alt"
 	mkdir "$subpkgdir"
 }
diff --git a/device/main/device-qemu-amd64/APKBUILD b/device/main/device-qemu-amd64/APKBUILD
index 83dcf8514..51322ff8f 100644
--- a/device/main/device-qemu-amd64/APKBUILD
+++ b/device/main/device-qemu-amd64/APKBUILD
@@ -3,7 +3,7 @@
 # Co-Maintainer: Daniele Debernardi <drebrez@gmail.com>
 pkgname=device-qemu-amd64
 pkgver=2.5
-pkgrel=0
+pkgrel=1
 pkgdesc="Simulated device in QEMU (x86_64)"
 url="https://postmarketos.org"
 arch="x86_64"
@@ -40,7 +40,7 @@ mce() {
 }
 
 sway() {
-	install_if="$pkgname=$pkgver-r$pkgrel sway"
+	install_if="$pkgname=$pkgver-r$pkgrel postmarketos-ui-sway"
 	depends="postmarketos-ui-sway-logo-key-alt"
 	mkdir "$subpkgdir"
 }