rebase patches

9 files changed, 51 insertions, 63 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 7f607b86395c..ac80c6598f0f 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = sxmo-utils-git
 	pkgdesc = Utility scripts, programs, and configs that hold the sxmo UI environment together
-	pkgver = 1.15.1.r20.6a024f2
+	pkgver = 1.15.2.r50.0b58e5e
 	pkgrel = 1
 	url = https://git.sr.ht/~mil/sxmo-utils
 	arch = x86_64
@@ -21,23 +21,21 @@ pkgbase = sxmo-utils-git
 	source = 0006-start-stop-graphical-session.target.patch
 	source = 00-sxmo.rules
 	source = 10-sxmo.conf
-	source = sxmo-setpermissions.service
 	sha512sums = SKIP
-	sha512sums = 0e5abaaa638d544e83f674fdfbccdec705faa541d3dd272d22580c1997cb1e40785a1d3dbe1ec0f7aad21d07c6ebdf715eb028dba8aab8f9e9f08a01005bd7d8
-	sha512sums = f315c6fbfc842a9ced93c8f493ce601f46fd0a4a0974bef22730e3e693aeff6b4c259ddc0165a6a891c6889b016c33ed5b640d787b16a1ca5525fa9f8a8b0096
-	sha512sums = 9790135846977e6d0ff681858db99e3c2dc8040a505db5b24f5cc5eefb474971db627f7a2af4ab60130e865f2c024543915f30b57a485cf56ece98dca94759ee
-	sha512sums = 20be8a30ddcd0c3acc22c3a8171e397d34cef8a3b32ad5e624105826c3ad9d1ad561a00ddbab32d931753fd782faaf2ffa1f231b1158404a2e5723189d189079
-	sha512sums = 8d60d253b5399f64a565c244a8ef210a646ed5e00ef2cc234e3170103ee5629d10fdb7847fa6cf01d41da9cb904a7ed1a72c3e7c915fd46b3646555a354f00e1
-	sha512sums = f31200582fcb3888509788a88459f27249dc2340937265fd81be54d567c92c8ed19a6b74d0dc29b82645fc27c98e67e7fc085ee8bb5843b16b0af6c759aaa601
+	sha512sums = b85d430141601aba9c0c1b2c782abc2b259b4dbc4b099bd2ddd57403c8b75da7e3e3e8d2ff4c95a783f8cb5ba709fe856b8e52ce3cb5ccc70b3c08c9cec0e625
+	sha512sums = 708e6c073ec9503fd10d14f6f090a694777e77ad92f38885416d368d482e61f2e3aba18d220100f7dd03c3fe80a799b8d3ff59bbac6b58ecbab48c31886cda72
+	sha512sums = 4eb8b89021a910b295bbf7c032e03fd017ce82ccb2e5d101e085de0fe03b58b7e30c0602904155d48a3520c07590826a79f77fa0092a53eae43744e599247014
+	sha512sums = 015e9d8fc54d5e16a403bb5a64fe473f2c5fdd846d927e7e4487c11541f02a022a51d0de7ed25b5e0934374f7a29c05d452cb8651bcbf1c9be5287924495b7e1
+	sha512sums = 2ee19773bc515621699b424d609ef3a29ba8a7bf444b51d8259cd71f69d39d1dd9960aa1d0e0effd4ff5c226ce7812991806c1fe1ab56a951ec7759902fbd687
+	sha512sums = 7ecc3a7da7bdd98f173202fda300d2b5f0e353d725c4c74d491b0ff713bb5779dd4a5642e37f457d4272fa4013ba060cff34e2b7a9f44c784c7788cfb6c0664a
 	sha512sums = 8a21e62b7ff0982a5406e98510a3004c62f883b9fae0cad5b63f6a7df520896b65c726321da515dab754a91ed94280922e3f424ecc983c1a33eb1ec287b268a2
 	sha512sums = b69a09f98f8a5cad8164cd48c5f6a78f2ce0e9818fb77ccf2a3e243cd0f2023e438022b20aad9e6b5edd90e1bb862326db79dc423630682d4c43e897090d3da1
-	sha512sums = 532c3045f52f872704876bdf56afbc7470c5d17e46655dd4040d545b6d3eb34a8791909e554c560471f9494c7382107839bcff1e48be242d5eea0092482165cd
 
 pkgname = sxmo-utils-git
 	depends = bc
 	depends = curl
 	depends = gawk
-	depends = gojq
+	depends = jq
 	depends = less
 	depends = net-tools
 	depends = pnc
diff --git a/0001-Use-sh-to-resolve-hooks-in-services.patch b/0001-Use-sh-to-resolve-hooks-in-services.patch
index 07607b514d87..3ce80b402b85 100644
--- a/0001-Use-sh-to-resolve-hooks-in-services.patch
+++ b/0001-Use-sh-to-resolve-hooks-in-services.patch
@@ -1,4 +1,4 @@
-From b911477916ae71e5af06be8bda7f374c0c0daada Mon Sep 17 00:00:00 2001
+From 8dea25b6aef3067c32ba912686e127b39e465570 Mon Sep 17 00:00:00 2001
 From: ArenM <aren@peacevolution.org>
 Date: Wed, 20 Apr 2022 20:37:03 -0400
 Subject: [PATCH sxmo-utils 1/6] Use sh to resolve hooks in services
@@ -31,5 +31,5 @@ index 202510c..182d995 100644
 -ExecStart=sxmo_hook_lisgdstart.sh
 +ExecStart=sh -c sxmo_hook_lisgdstart.sh
 -- 
-2.43.0
+2.45.0
 
diff --git a/0002-Use-KillMode-process-so-systemd-doesn-t-stop-apps.patch b/0002-Use-KillMode-process-so-systemd-doesn-t-stop-apps.patch
index 0f4f5d936b31..8206d517661a 100644
--- a/0002-Use-KillMode-process-so-systemd-doesn-t-stop-apps.patch
+++ b/0002-Use-KillMode-process-so-systemd-doesn-t-stop-apps.patch
@@ -1,4 +1,4 @@
-From 09ba55bd9935cc7c47e6e200f75c7ef6562e8057 Mon Sep 17 00:00:00 2001
+From ac6938fc6c4931dc9424bd0a1937a287f639b89b Mon Sep 17 00:00:00 2001
 From: ArenM <aren@peacevolution.org>
 Date: Sat, 23 Apr 2022 13:28:59 -0400
 Subject: [PATCH sxmo-utils 2/6] Use KillMode=process so systemd doesn't stop
@@ -20,5 +20,5 @@ index 182d995..c671235 100644
  ExecStart=sh -c sxmo_hook_lisgdstart.sh
 +KillMode=process
 -- 
-2.43.0
+2.45.0
 
diff --git a/0003-Add-PartOf-to-services-so-they-stop-when-the-graphic.patch b/0003-Add-PartOf-to-services-so-they-stop-when-the-graphic.patch
index 253d863316fd..b2b7e80c1451 100644
--- a/0003-Add-PartOf-to-services-so-they-stop-when-the-graphic.patch
+++ b/0003-Add-PartOf-to-services-so-they-stop-when-the-graphic.patch
@@ -1,4 +1,4 @@
-From 5a9247d3eb92cd18be0991de6dbd5298a4764fef Mon Sep 17 00:00:00 2001
+From c145bc9a4996735e4af541015d326ff808543de0 Mon Sep 17 00:00:00 2001
 From: ArenM <aren@peacevolution.org>
 Date: Sat, 18 Feb 2023 15:13:53 -0500
 Subject: [PATCH sxmo-utils 3/6] Add PartOf to services so they stop when the
@@ -179,7 +179,7 @@ index 1f759f3..04c0d3a 100644
  [Service]
  Type=simple
 diff --git a/configs/services/sxmo_wob.service b/configs/services/sxmo_wob.service
-index 600646f..5bacf13 100644
+index d1b7496..376b94f 100644
 --- a/configs/services/sxmo_wob.service
 +++ b/configs/services/sxmo_wob.service
 @@ -1,5 +1,6 @@
@@ -212,5 +212,5 @@ index f987ac3..0f5d2f6 100644
  [Service]
  Type=simple
 -- 
-2.43.0
+2.45.0
 
diff --git a/0004-Fix-quoting-of-strings-in-service-files.patch b/0004-Fix-quoting-of-strings-in-service-files.patch
index 71c9dd795b9e..2da2bde6f3da 100644
--- a/0004-Fix-quoting-of-strings-in-service-files.patch
+++ b/0004-Fix-quoting-of-strings-in-service-files.patch
@@ -1,4 +1,4 @@
-From 920c70568dc53df8f14c72aa37fb36e0f110fba7 Mon Sep 17 00:00:00 2001
+From 6131ee671e0c7275bef7cc308709f37719c492e0 Mon Sep 17 00:00:00 2001
 From: ArenM <aren@peacevolution.org>
 Date: Wed, 5 Apr 2023 17:42:36 -0400
 Subject: [PATCH sxmo-utils 4/6] Fix quoting of strings in service files
@@ -32,5 +32,5 @@ index a4fca14..774591e 100644
 -ExecStart=conky -c "$XDG_CONFIG_HOME"/sxmo/conky.conf
 +ExecStart=conky -c "${XDG_CONFIG_HOME}/sxmo/conky.conf"
 -- 
-2.43.0
+2.45.0
 
diff --git a/0005-Add-hook-to-manage-services.patch b/0005-Add-hook-to-manage-services.patch
index 73aaf568ce36..0aef809b3739 100644
--- a/0005-Add-hook-to-manage-services.patch
+++ b/0005-Add-hook-to-manage-services.patch
@@ -1,4 +1,4 @@
-From e6c38034a069ad6e0e451d8bf7418e6b743d6575 Mon Sep 17 00:00:00 2001
+From 6fcf5b7ca0e447f92f159afae9b81381775947b9 Mon Sep 17 00:00:00 2001
 From: Aren Moynihan <aren@peacevolution.org>
 Date: Fri, 13 Oct 2023 17:23:28 -0400
 Subject: [PATCH sxmo-utils 5/6] Add hook to manage services
@@ -9,17 +9,17 @@ command format is mostly the same as it was with superd, but this allows
 us to hide the differences between service managers.
 ---
  .../default_hooks/sxmo_hook_contextmenu.sh    | 12 ++--
- configs/default_hooks/sxmo_hook_service.sh    | 65 +++++++++++++++++++
- configs/default_hooks/sxmo_hook_start.sh      |  7 +-
+ configs/default_hooks/sxmo_hook_service.sh    | 63 +++++++++++++++++++
+ configs/default_hooks/sxmo_hook_start.sh      |  7 +--
  scripts/core/sxmo_appmenu.sh                  |  4 +-
  scripts/core/sxmo_common.sh                   |  1 +
  scripts/core/sxmo_winit.sh                    |  1 +
  scripts/core/sxmo_xinit.sh                    |  1 +
- 7 files changed, 75 insertions(+), 16 deletions(-)
+ 7 files changed, 73 insertions(+), 16 deletions(-)
  create mode 100644 configs/default_hooks/sxmo_hook_service.sh
 
 diff --git a/configs/default_hooks/sxmo_hook_contextmenu.sh b/configs/default_hooks/sxmo_hook_contextmenu.sh
-index 2445c2f..e0a8953 100755
+index 26d21ef..1d5dd6d 100755
 --- a/configs/default_hooks/sxmo_hook_contextmenu.sh
 +++ b/configs/default_hooks/sxmo_hook_contextmenu.sh
 @@ -14,10 +14,6 @@
@@ -54,7 +54,7 @@ index 2445c2f..e0a8953 100755
  			$icon_cfg Toggle Bar ^ 0 ^ sxmo_wm.sh togglebar
  			$icon_bth Bluetooth $(
  				rfkill list bluetooth | grep -q "yes" &&
-@@ -642,7 +638,7 @@ case "$WMCLASS" in
+@@ -695,7 +691,7 @@ case "$WMCLASS" in
  		;;
  	org.gnome.maps)
  	CHOICES="
@@ -65,22 +65,20 @@ index 2445c2f..e0a8953 100755
  		$icon_fnd Explore POI ^ 0 ^ sxmo_type -M ctrl -M Shift F
 diff --git a/configs/default_hooks/sxmo_hook_service.sh b/configs/default_hooks/sxmo_hook_service.sh
 new file mode 100644
-index 0000000..18ae8b3
+index 0000000..f744659
 --- /dev/null
 +++ b/configs/default_hooks/sxmo_hook_service.sh
-@@ -0,0 +1,65 @@
+@@ -0,0 +1,63 @@
 +#! /bin/sh
 +# SPDX-License-Identifier: AGPL-3.0-only
 +# Copyright 2023 Sxmo Contributors
 +
-+# include common definitions
-+# shellcheck source=scripts/core/sxmo_common.sh
-+. sxmo_common.sh
-+# prevent infinite recursion
-+unalias superd
-+
 +set -e
 +
++# WARNING: we can't source sxmo_common.sh, otherwise calling sueprd will cause a
++# loop
++# TODO: this needs better detection logic, perhaps it's just a compiel time
++# flag?
 +if [ -n "$SXMO_SERVICE_MANAGER" ]; then
 +	MANAGER="$SXMO_SERVICE_MANAGER"
 +elif command -v systemctl > /dev/null; then
@@ -135,7 +133,7 @@ index 0000000..18ae8b3
 +		esac
 +esac
 diff --git a/configs/default_hooks/sxmo_hook_start.sh b/configs/default_hooks/sxmo_hook_start.sh
-index 35bc59a..1a79d63 100755
+index 50fa86e..a838e24 100755
 --- a/configs/default_hooks/sxmo_hook_start.sh
 +++ b/configs/default_hooks/sxmo_hook_start.sh
 @@ -9,12 +9,7 @@
@@ -168,13 +166,13 @@ index 10c2f51..a7c7733 100755
  		sxmo_notify_user.sh "$1 Stopped"
  	else
 diff --git a/scripts/core/sxmo_common.sh b/scripts/core/sxmo_common.sh
-index 4eb0a1f..b6cabf9 100755
+index 270c1f8..aa9dc8a 100755
 --- a/scripts/core/sxmo_common.sh
 +++ b/scripts/core/sxmo_common.sh
-@@ -16,6 +16,7 @@ command -v shopt > /dev/null && shopt -s expand_aliases
+@@ -15,6 +15,7 @@ command -v shopt > /dev/null && shopt -s expand_aliases
+ 
  alias dmenu="sxmo_dmenu.sh"
  alias bemenu="sxmo_dmenu.sh"
- alias jq="gojq" # better performances
 +alias superctl=sxmo_hook_service.sh
  
  if ! command -v sxmobar > /dev/null; then
@@ -192,7 +190,7 @@ index 220daac..a8c381f 100755
  	pkill bemenu
  	pkill wvkbd
 diff --git a/scripts/core/sxmo_xinit.sh b/scripts/core/sxmo_xinit.sh
-index 9a491ba..f490aa4 100755
+index cafb1ab..e6a29ed 100755
 --- a/scripts/core/sxmo_xinit.sh
 +++ b/scripts/core/sxmo_xinit.sh
 @@ -45,6 +45,7 @@ with_dbus() {
@@ -204,5 +202,5 @@ index 9a491ba..f490aa4 100755
  	pkill svkbd
  	pkill dmenu
 -- 
-2.43.0
+2.45.0
 
diff --git a/0006-start-stop-graphical-session.target.patch b/0006-start-stop-graphical-session.target.patch
index e1a8549baa24..aa6e93197790 100644
--- a/0006-start-stop-graphical-session.target.patch
+++ b/0006-start-stop-graphical-session.target.patch
@@ -1,4 +1,4 @@
-From 3ba6d0415e24febb1dcf26c1f4ec6d144f32b8e2 Mon Sep 17 00:00:00 2001
+From 20b911105f35402eab064ca9f2d7248ed5b1a3ec Mon Sep 17 00:00:00 2001
 From: ArenM <aren@peacevolution.org>
 Date: Fri, 22 Apr 2022 18:24:27 -0400
 Subject: [PATCH sxmo-utils 6/6] start / stop graphical-session.target
@@ -10,10 +10,10 @@ Subject: [PATCH sxmo-utils 6/6] start / stop graphical-session.target
  create mode 100644 configs/services/sxmo-session.target
 
 diff --git a/configs/default_hooks/sxmo_hook_service.sh b/configs/default_hooks/sxmo_hook_service.sh
-index 18ae8b3..3ce6d8f 100644
+index f744659..5d25c68 100644
 --- a/configs/default_hooks/sxmo_hook_service.sh
 +++ b/configs/default_hooks/sxmo_hook_service.sh
-@@ -54,8 +54,10 @@ case "$MANAGER" in
+@@ -52,8 +52,10 @@ case "$MANAGER" in
  		case "$1" in
  			sxmo_starting)
  				printenv | cut -d '=' -f 1 | xargs systemctl --user import-environment
@@ -37,5 +37,5 @@ index 0000000..1bea6c3
 +Wants=graphical-session-pre.target
 +After=graphical-session-pre.target
 -- 
-2.43.0
+2.45.0
 
diff --git a/PKGBUILD b/PKGBUILD
index 98108801171c..89c558dc6eea 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,7 +2,7 @@
 # Contributor: dni <office@dnilabs.com>
 
 pkgname=('sxmo-utils-git' 'sxmo-utils-sway-git')
-pkgver=1.15.1.r20.6a024f2
+pkgver=1.15.2.r50.0b58e5e
 pkgrel=1
 pkgdesc="Utility scripts, programs, and configs that hold the sxmo UI environment together"
 url="https://git.sr.ht/~mil/sxmo-utils"
@@ -17,18 +17,16 @@ source=("git+https://git.sr.ht/~mil/sxmo-utils"
         '0005-Add-hook-to-manage-services.patch'
         '0006-start-stop-graphical-session.target.patch'
         '00-sxmo.rules'
-        '10-sxmo.conf'
-        'sxmo-setpermissions.service')
+        '10-sxmo.conf')
 sha512sums=('SKIP'
-            '0e5abaaa638d544e83f674fdfbccdec705faa541d3dd272d22580c1997cb1e40785a1d3dbe1ec0f7aad21d07c6ebdf715eb028dba8aab8f9e9f08a01005bd7d8'
-            'f315c6fbfc842a9ced93c8f493ce601f46fd0a4a0974bef22730e3e693aeff6b4c259ddc0165a6a891c6889b016c33ed5b640d787b16a1ca5525fa9f8a8b0096'
-            '9790135846977e6d0ff681858db99e3c2dc8040a505db5b24f5cc5eefb474971db627f7a2af4ab60130e865f2c024543915f30b57a485cf56ece98dca94759ee'
-            '20be8a30ddcd0c3acc22c3a8171e397d34cef8a3b32ad5e624105826c3ad9d1ad561a00ddbab32d931753fd782faaf2ffa1f231b1158404a2e5723189d189079'
-            '8d60d253b5399f64a565c244a8ef210a646ed5e00ef2cc234e3170103ee5629d10fdb7847fa6cf01d41da9cb904a7ed1a72c3e7c915fd46b3646555a354f00e1'
-            'f31200582fcb3888509788a88459f27249dc2340937265fd81be54d567c92c8ed19a6b74d0dc29b82645fc27c98e67e7fc085ee8bb5843b16b0af6c759aaa601'
+            'b85d430141601aba9c0c1b2c782abc2b259b4dbc4b099bd2ddd57403c8b75da7e3e3e8d2ff4c95a783f8cb5ba709fe856b8e52ce3cb5ccc70b3c08c9cec0e625'
+            '708e6c073ec9503fd10d14f6f090a694777e77ad92f38885416d368d482e61f2e3aba18d220100f7dd03c3fe80a799b8d3ff59bbac6b58ecbab48c31886cda72'
+            '4eb8b89021a910b295bbf7c032e03fd017ce82ccb2e5d101e085de0fe03b58b7e30c0602904155d48a3520c07590826a79f77fa0092a53eae43744e599247014'
+            '015e9d8fc54d5e16a403bb5a64fe473f2c5fdd846d927e7e4487c11541f02a022a51d0de7ed25b5e0934374f7a29c05d452cb8651bcbf1c9be5287924495b7e1'
+            '2ee19773bc515621699b424d609ef3a29ba8a7bf444b51d8259cd71f69d39d1dd9960aa1d0e0effd4ff5c226ce7812991806c1fe1ab56a951ec7759902fbd687'
+            '7ecc3a7da7bdd98f173202fda300d2b5f0e353d725c4c74d491b0ff713bb5779dd4a5642e37f457d4272fa4013ba060cff34e2b7a9f44c784c7788cfb6c0664a'
             '8a21e62b7ff0982a5406e98510a3004c62f883b9fae0cad5b63f6a7df520896b65c726321da515dab754a91ed94280922e3f424ecc983c1a33eb1ec287b268a2'
-            'b69a09f98f8a5cad8164cd48c5f6a78f2ce0e9818fb77ccf2a3e243cd0f2023e438022b20aad9e6b5edd90e1bb862326db79dc423630682d4c43e897090d3da1'
-            '532c3045f52f872704876bdf56afbc7470c5d17e46655dd4040d545b6d3eb34a8791909e554c560471f9494c7382107839bcff1e48be242d5eea0092482165cd')
+            'b69a09f98f8a5cad8164cd48c5f6a78f2ce0e9818fb77ccf2a3e243cd0f2023e438022b20aad9e6b5edd90e1bb862326db79dc423630682d4c43e897090d3da1')
 
 pkgver() {
   cd "sxmo-utils"
@@ -57,7 +55,7 @@ package_sxmo-utils-git() {
     'bc'
     'curl'
     'gawk'
-    'gojq'
+    'jq'
     'less'
     'net-tools' # netstat command
     'pnc'
@@ -76,6 +74,8 @@ package_sxmo-utils-git() {
     'xdg-user-dirs'
 
     # Audio
+    # TODO: alsa-utils is only required for sxmo_record.sh, it can probably be
+    # removed soon
     'alsa-utils'
     'bluez'
     'bluez-utils'
@@ -127,8 +127,6 @@ package_sxmo-utils-git() {
 
   # HACK: doas is built without --with-doas-confdir so install the sxmo config directly
   install -Dm640 "$pkgdir/etc/doas.d/sxmo.conf" "$pkgdir/etc/doas.conf"
-
-  install -Dm644 "$srcdir/sxmo-setpermissions.service" "$pkgdir/usr/lib/systemd/system/sxmo-setpermissions.service"
 }
 
 package_sxmo-utils-sway-git() {
diff --git a/sxmo-setpermissions.service b/sxmo-setpermissions.service
deleted file mode 100644
index 2686158f70c2..000000000000
--- a/sxmo-setpermissions.service
+++ /dev/null
@@ -1,6 +0,0 @@
-[Unit]
-Description=sxmo-pinephone
-[Service]
-ExecStart=/usr/bin/sxmo_setpermissions.sh
-[Install]
-WantedBy=multi-user.target