Merge branch 'testing' into Eeems-patch-9

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 <[email protected]>"
@@ -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
     }
 }

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 <[email protected]>"
-license=MIT
+maintainer="Sunny <[email protected]>"
+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
 }

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"
-

package/whiteboard-hypercard/package

@@ -1,32 +1,34 @@
 #!/usr/bin/env bash
-# Copyright (c) 2021 The Toltec Contributors
+# Copyright (c) 2023 The Toltec Contributors
 # SPDX-License-Identifier: MIT
 
 pkgnames=(whiteboard-hypercard)
 pkgdesc="Real-time collaboration, drawing or whiteboarding"
 url=https://github.com/fenollp/reMarkable-tools
-pkgver=0.3.4-1
-timestamp=2021-10-25T15:45Z
+pkgver=0.3.7-1
+timestamp=2023-10-11T12:57Z
 section="drawing"
 maintainer="Pierre Fenoll <[email protected]>"
-license=Apache-2.0
+license=CC-BY-NC-ND
 installdepends=(display)
 flags=(patch_rm2fb)
 
-image=rust:v2.2
+image=rust:v3.1
 source=(
-    https://github.com/fenollp/reMarkable-tools/archive/v0.3.4.zip
+    https://github.com/fenollp/reMarkable-tools/archive/v0.3.7.zip
     whiteboard-hypercard.draft
 )
 sha256sums=(
-    b343e1b4af9e0bf247ff2fab8331648ddd89941fb5c0ea9a45417d3bb4b20193
+    642fd954ec4f9a1d132b10cc7f7dfbee3467e9c08b1253cc32d1e372178d168b
     SKIP
 )
 
 build() {
-    cd marauder
+    pushd marauder
     rustup component add rustfmt
-    cargo build --release --bin whiteboard --locked
+    cargo fetch
+    cargo build --release --bin whiteboard --locked --frozen --offline
+    popd
 }
 
 package() {

package/whiteboard-hypercard/whiteboard-hypercard.draft

@@ -1,4 +1,4 @@
-# Copyright (c) 2020 The Toltec Contributors
+# Copyright (c) 2023 The Toltec Contributors
 # SPDX-License-Identifier: MIT
 
 name=whiteboard