From 4e646f06bd5a162ca175a732924fbcc345c4a49b Mon Sep 17 00:00:00 2001
From: Nathaniel van Diepen <Eeems@users.noreply.github.com>
Date: Thu, 5 Oct 2023 21:24:59 -0600
Subject: [PATCH 1/2] Add missing xdg-settings binary to oxide-utils (#745)

---
 package/oxide/package | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/package/oxide/package b/package/oxide/package
index c4e25b486..1db608f78 100644
--- a/package/oxide/package
+++ b/package/oxide/package
@@ -4,7 +4,7 @@
 
 pkgnames=(erode fret oxide rot tarnish decay corrupt anxiety oxide-utils inject_evdev liboxide libsentry)
 _oxidever=2.6
-pkgver=$_oxidever-1
+pkgver=$_oxidever-2
 _sentryver=0.5.0
 timestamp=2023-06-05T23:27:53Z
 maintainer="Eeems <eeems@eeems.email>"
@@ -179,6 +179,7 @@ oxide-utils() {
         install -D -m 755 -t "$pkgdir"/opt/bin "$srcdir"/release/opt/bin/xdg-desktop-menu
         install -D -m 755 -t "$pkgdir"/opt/bin "$srcdir"/release/opt/bin/xdg-desktop-icon
         install -D -m 755 -t "$pkgdir"/opt/bin "$srcdir"/release/opt/bin/xdg-open
+        install -D -m 755 -t "$pkgdir"/opt/bin "$srcdir"/release/opt/bin/xdg-settings
         install -D -m 755 -t "$pkgdir"/opt/bin "$srcdir"/release/opt/bin/gio
     }
 }

From f5a6c36031e52fecf3ef80d6797ad410a2e953a4 Mon Sep 17 00:00:00 2001
From: Sunny <8181990+TheLastZombie@users.noreply.github.com>
Date: Sun, 8 Oct 2023 23:46:43 +0200
Subject: [PATCH 2/2] rmfm: Update to 1.5.0 (#746)

---
 package/rmfm/package        | 15 +++++++--------
 package/rmfm/path_fix.patch |  6 ++----
 2 files changed, 9 insertions(+), 12 deletions(-)

diff --git a/package/rmfm/package b/package/rmfm/package
index 01bdfca9d..ffec3e72b 100644
--- a/package/rmfm/package
+++ b/package/rmfm/package
@@ -5,25 +5,24 @@
 pkgnames=(rmfm)
 pkgdesc="Bare-bones file manager using Node.js and sas"
 url="https://forgejo.sny.sh/sun/rmFM"
-pkgver=1.4.0-3
-timestamp=2022-08-19T11:20:10+02:00
+pkgver=1.5.0-1
+timestamp=2023-08-08T22:19:23+02:00
 section=utils
-maintainer="Sunny <roesch.eric@protonmail.com>"
-license=MIT
+maintainer="Sunny <sunny@sny.sh>"
+license=Unlicense
 installdepends=(node simple)
 
 source=(
-    https://forgejo.sny.sh/sun/rmFM/archive/1.4.0.zip
+    https://forgejo.sny.sh/sun/rmFM/archive/1.5.0.zip
     path_fix.patch
 )
 sha256sums=(
-    28ce80c67fecc370d11f3fe2069742c2789b388a9426fff49d269d7900ae3dc9
+    515cc1843bf61f628c3a0b2b2dcb3256a0182352c6b491585fd52cf96a554b26
     SKIP
 )
 
 prepare() {
-    # Assume node to be in /opt/bin and add that directory
-    # to the path of the app to allow finding simple
+    # Assume node to be in /opt/bin
     # This is a temporary fix for not working in remux
     patch -d "$srcdir" < "$srcdir"/path_fix.patch
 }
diff --git a/package/rmfm/path_fix.patch b/package/rmfm/path_fix.patch
index a2cf4aef2..d8c314aef 100644
--- a/package/rmfm/path_fix.patch
+++ b/package/rmfm/path_fix.patch
@@ -1,9 +1,7 @@
 diff --git a/rmfm b/rmfm
-index 4571db9..172eedf 100755
+index 63eeb98..b28dbd0 100755
 --- a/rmfm
 +++ b/rmfm
-@@ -1,2 +1,3 @@
+@@ -1 +1 @@
 -#!/usr/bin/env node
 +#!/opt/bin/node
-+process.env.PATH += ":/opt/bin"
-