Merge branch 'testing' into update-desktop-database

package/reboot-guard/package

@@ -5,7 +5,7 @@
 pkgnames=(reboot-guard)
 pkgdesc="Block systemd-initiated poweroff/reboot/halt until configurable condition checks pass"
 url=https://github.com/stephanritscher/reboot-guard
-pkgver=1.0.1-6
+pkgver=1.0.1-7
 timestamp=2020-05-04T06:16Z
 section="devel"
 maintainer="Eeems <[email protected]>"
@@ -34,8 +34,13 @@ configure() {
 }
 
 preremove() {
-    if systemctl list-units --full -all | grep -Fq 'rguard.service'; then
-        systemctl disable --now rguard
+    if is-active rguard.service; then
+        echo "Stopping rguard.service"
+        systemctl stop rguard.service
+    fi
+    if is-enabled rguard.service; then
+        echo "Disabling rguard.service"
+        systemctl disable rguard.service
     fi
 }
 

package/remarkable_templates/package

@@ -0,0 +1,142 @@
+#!/usr/bin/env bash
+# Copyright (c) 2023 The Toltec Contributors
+# SPDX-License-Identifier: MIT
+
+pkgnames=(
+    template-daily-planner
+    template-weekly-planner
+    template-journal
+    template-meeting-notes
+    template-smart-goals
+    template-good-time-journal
+)
+url=https://github.com/msencer/remarkable_templates
+pkgver=0.0.0-1
+timestamp=2023-07-27T12:28:59Z
+section="templates"
+maintainer="Eeems <[email protected]>"
+license=MIT
+installdepends=(templatectl)
+
+source=("https://github.com/msencer/remarkable_templates/archive/03282d34b905e7e6431132b022b5a9cb3af116a2.zip")
+sha256sums=(7a39d53767963f59c8d5b8a7ebda411b60d1256fe1077a3864cc43cd59281e03)
+
+template-daily-planner() {
+    pkgdesc="Daily Planner template"
+    package() {
+        install -D -m 755 \
+            -t "$pkgdir"/opt/share/remarkable/templates \
+            "$srcdir"/templates/pngs/daily_planner.png
+    }
+    configure() {
+        templatectl add \
+            --name "Daily Planner" \
+            --filename "daily_planner" \
+            --category "Custom" \
+            --category "Life/organize" \
+            --icon_code "e9da"
+    }
+    preremove() {
+        templatectl remove --name "Daily Planner"
+    }
+}
+
+template-weekly-planner() {
+    pkgdesc="Weekly Planner template"
+    package() {
+        install -D -m 755 \
+            -t "$pkgdir"/opt/share/remarkable/templates \
+            "$srcdir"/templates/pngs/weekly_planner.png
+    }
+    configure() {
+        templatectl add \
+            --name "Weekly Planner" \
+            --filename "weekly_planner" \
+            --category "Custom" \
+            --category "Life/organize" \
+            --icon_code "e997"
+    }
+    preremove() {
+        templatectl remove --name "Weekly Planner"
+    }
+}
+
+template-journal() {
+    pkgdesc="Journal template"
+    package() {
+        install -D -m 755 \
+            -t "$pkgdir"/opt/share/remarkable/templates \
+            "$srcdir"/templates/pngs/journal.png
+    }
+    configure() {
+        templatectl add \
+            --name "Journal" \
+            --filename "journal" \
+            --category "Custom" \
+            --category "Life/organize" \
+            --icon_code "e991"
+    }
+    preremove() {
+        templatectl remove --name "Journal"
+    }
+}
+
+template-meeting-notes() {
+    pkgdesc="Meeting Notes template"
+    package() {
+        install -D -m 755 \
+            -t "$pkgdir"/opt/share/remarkable/templates \
+            "$srcdir"/templates/pngs/meeting_notes.png
+    }
+    configure() {
+        templatectl add \
+            --name "1:1 / Meeting Notes" \
+            --filename "meeting_notes" \
+            --category "Custom" \
+            --category "Life/organize" \
+            --icon_code "e9d8"
+    }
+    preremove() {
+        templatectl remove --name "1:1 / Meeting Notes"
+    }
+}
+
+template-smart-goals() {
+    pkgdesc="Smart Goals template"
+    package() {
+        install -D -m 755 \
+            -t "$pkgdir"/opt/share/remarkable/templates \
+            "$srcdir"/templates/pngs/goals.png
+    }
+    configure() {
+        templatectl add \
+            --name "Smart Goals" \
+            --filename "goals" \
+            --category "Custom" \
+            --category "Life/organize" \
+            --icon_code "e98f"
+    }
+    preremove() {
+        templatectl remove --name "Smart Goals"
+    }
+}
+
+template-good-time-journal() {
+    pkgdesc="Smart Goals template"
+    package() {
+        install -D -m 755 \
+            -t "$pkgdir"/opt/share/remarkable/templates \
+            "$srcdir"/templates/pngs/gt_journal.png
+    }
+    configure() {
+        templatectl add \
+            --name "Good Time Journal" \
+            --filename "gt_journal" \
+            --category "Custom" \
+            --category "Life/organize" \
+            --icon_code "e9b2"
+    }
+    preremove() {
+        templatectl remove --name "Good Time Journal"
+    }
+}

package/xochitl/xochitl

@@ -18,4 +18,4 @@ fi
 if ! systemctl is-active --quiet manual-sync.service; then
     systemctl enable --now manual-sync.service
 fi
-exec /usr/bin/xochitl "$@"
+exec -a /usr/bin/xochitl /usr/bin/xochitl "$@"

package/yaft/package

@@ -5,9 +5,9 @@
 pkgnames=(yaft)
 pkgdesc="Yet another framebuffer terminal"
 url=https://github.com/timower/rM2-stuff/tree/master/apps/yaft
-_tag=0.0.8
-pkgver=${_tag}-3
-timestamp=2021-05-02T09:23Z
+_tag=0.0.10
+pkgver=${_tag}-2
+timestamp=2023-08-12T14:31Z
 maintainer="Mattéo Delabre <[email protected]>"
 license=GPL-3.0
 section="admin"
@@ -17,18 +17,15 @@ installdepends=(display terminfo)
 source=(
     "https://github.com/timower/rM2-stuff/archive/refs/tags/v${_tag}.zip"
     input.patch
-    bash-l.patch
 )
 
 sha256sums=(
-    718a9fc7a8e26d587bac790fd83ad8242978b59745269b2ff213e04820bf45b8
-    SKIP
+    1cd4741a93cde6bd545215eb303e51219fc9901cba1c28b6206b1b5e0871a7b5
     SKIP
 )
 
 build() {
     patch -u libs/rMlib/Device.cpp -i input.patch
-    patch -u apps/yaft/main.cpp -i bash-l.patch
     mkdir build
     mkdir install
     cd build
@@ -37,6 +34,8 @@ build() {
     cd apps/yaft
     make
     make install
+    cd ../../libs/libYaft
+    make install
 }
 
 package() {