From 405cc598713c80740f4da3a11d606e59be45bfab Mon Sep 17 00:00:00 2001
From: Jami Kettunen <jami.kettunen@protonmail.com>
Date: Mon, 16 Jan 2023 02:01:43 +0200
Subject: [PATCH] waydroid: update to 1.4.1.

D-Bus is now used for IPC but disable D-Bus activation for Waydroid
container because there's no way to supervise (or stop) it properly
under runit.
---
 srcpkgs/waydroid/INSTALL                      |  8 ++++----
 srcpkgs/waydroid/INSTALL.msg                  |  9 +++++++++
 srcpkgs/waydroid/files/README.voidlinux       |  7 ++++---
 srcpkgs/waydroid/files/waydroid-container/run |  1 +
 srcpkgs/waydroid/template                     | 11 ++++++-----
 5 files changed, 24 insertions(+), 12 deletions(-)
 create mode 100644 srcpkgs/waydroid/INSTALL.msg

diff --git a/srcpkgs/waydroid/INSTALL b/srcpkgs/waydroid/INSTALL
index b6ca3e4ef5ab..34fa67f8c09e 100644
--- a/srcpkgs/waydroid/INSTALL
+++ b/srcpkgs/waydroid/INSTALL
@@ -1,8 +1,8 @@
 case "$ACTION" in
 post)
-	if [ ! -f ./var/lib/waydroid/waydroid.cfg ]; then return 0; fi
-	if [ ! -f ./var/lib/waydroid/waydroid_base.prop ]; then return 0; fi
-	echo "Regenerating Waydroid configs..."
-	waydroid upgrade --offline || exit 0
+	if [ -f /var/lib/waydroid/waydroid_base.prop ]; then
+		echo "Regenerating Waydroid configs..."
+		waydroid upgrade --offline || :
+	fi
 	;;
 esac
diff --git a/srcpkgs/waydroid/INSTALL.msg b/srcpkgs/waydroid/INSTALL.msg
new file mode 100644
index 000000000000..2419f4538718
--- /dev/null
+++ b/srcpkgs/waydroid/INSTALL.msg
@@ -0,0 +1,9 @@
+To finish upgrading Waydroid:
+
+	# sv restart waydroid-container
+
+In case the above times out, until https://github.com/void-linux/runit/issues/25
+is solved you need to:
+
+	# kill $(pgrep -fx 'runsv waydroid-container')
+
diff --git a/srcpkgs/waydroid/files/README.voidlinux b/srcpkgs/waydroid/files/README.voidlinux
index 5efed75858fe..5653c569b66e 100644
--- a/srcpkgs/waydroid/files/README.voidlinux
+++ b/srcpkgs/waydroid/files/README.voidlinux
@@ -4,8 +4,9 @@ To finish Waydroid installation run:
 	# waydroid init
 
 Additionally ensure /proc/pressure/cpu exists, otherwise add 'psi=1' to your
-kernel cmdline; without this /system/bin/lmkd will keep crashing and the LXC
-container won't finish booting.
+kernel cmdline; without this under memory pressure e.g. even the OS bootup or
+gaming *may* cause the /dev/binder session manager to die due to
+/system/bin/lmkd crashing.
 For more details on kernel command line arguments and their configuration see
 https://docs.voidlinux.org/config/kernel.html#cmdline
 
@@ -15,7 +16,7 @@ also works).
 Optionally clipboard syncing between the container and host Wayland compositor
 can be enabled with:
 
-	# xbps-install python3-pyclip wl-clipboard
+	# xbps-install -S python3-pyclip wl-clipboard
 
 When running under X11 in a nested Wayland compositor you'll also need xclip.
 
diff --git a/srcpkgs/waydroid/files/waydroid-container/run b/srcpkgs/waydroid/files/waydroid-container/run
index 3e44af632958..8de4fd3df6d2 100644
--- a/srcpkgs/waydroid/files/waydroid-container/run
+++ b/srcpkgs/waydroid/files/waydroid-container/run
@@ -1,3 +1,4 @@
 #!/bin/sh
 exec 2>&1
+sv check dbus >/dev/null || exit 1
 exec waydroid -w container start
diff --git a/srcpkgs/waydroid/template b/srcpkgs/waydroid/template
index af8f78ff64c8..70e07b3e5c9a 100644
--- a/srcpkgs/waydroid/template
+++ b/srcpkgs/waydroid/template
@@ -1,19 +1,20 @@
 # Template file for 'waydroid'
 pkgname=waydroid
-version=1.3.4
-revision=2
+version=1.4.1
+revision=1
 # https://developer.android.com/ndk/guides/abis#sa
 archs="aarch64* armv7* i686* x86_64*"
 build_style=gnu-makefile
-make_install_args="USE_NFTABLES=1"
-depends="python3 gbinder-python python3-gobject gtk+3 lxc dnsmasq nftables"
+make_install_args="USE_NFTABLES=1 USE_DBUS_ACTIVATION=0"
+depends="gbinder-python python3-gobject python3-dbus gtk+3 polkit dnsmasq
+ nftables lxc"
 short_desc="Container-based approach to boot a full Android system"
 maintainer="Jami Kettunen <jami.kettunen@protonmail.com>"
 license="GPL-3.0-or-later"
 homepage="https://waydro.id"
 changelog="https://raw.githubusercontent.com/waydroid/waydroid/main/debian/changelog"
 distfiles="https://github.com/waydroid/waydroid/archive/refs/tags/${version}.tar.gz"
-checksum=32e30e6c7384a514649daeac68b1326e2781362692ae143927628ff2f1387c4e
+checksum=6c9a87bf61efb72c19d96f442b710bd8b4dd5b5be093e10e2d0b1d1782376207
 
 python_version=3
 pycompile_dirs="usr/lib/waydroid"