Merge branch 'testing' into Eeems-patch-10

package/sill/package

@@ -0,0 +1,31 @@
+#!/usr/bin/env bash
+# Copyright (c) 2020 The Toltec Contributors
+# SPDX-License-Identifier: MIT
+
+pkgnames=(sill)
+pkgdesc="Gesture-based text editor (and shell) for the reMarkable tablet"
+url=https://github.com/bkirwi/sill
+pkgver=0.1.1-alpha
+section="writing"
+timestamp=2023-08-12T00:00Z
+maintainer="Kai <[email protected]>"
+license="Apache-2.0"
+
+image=rust:v3.0
+source=(
+    https://github.com/bkirwi/sill/archive/refs/tags/v0.1.1.tar.gz
+    sill.draft
+)
+sha256sums=(
+    ed3ef2f7ff37101db16f7020e6af86da6c32e78d76247c91a1676b72ce87e3df
+    SKIP
+)
+
+build() {
+    cargo build --release
+}
+
+package() {
+    install -D -m 755 -t "$pkgdir"/opt/bin "$srcdir"/target/armv7-unknown-linux-gnueabihf/release/sill
+    install -D -m 644 "$srcdir"/sill.draft "$pkgdir"/opt/etc/draft/sill.draft
+}

package/sill/sill.draft

@@ -0,0 +1,7 @@
+# Copyright (c) 2021 The Toltec Contributors
+# SPDX-License-Identifier: MIT
+
+name=Sill
+desc= Gesture-based text editor (and shell) for the reMarkable tablet 
+call=/opt/bin/sill
+term=:

package/toltec-base/package

@@ -6,7 +6,7 @@ archs=(rm1 rm2)
 pkgnames=(toltec-base)
 pkgdesc="Metapackage defining the base set of packages in a Toltec install"
 url=https://toltec-dev.org/
-pkgver=1.2-1
+pkgver=1.2-2
 timestamp=2023-05-08T19:31Z
 section="utils"
 maintainer="Eeems <[email protected]>"
@@ -24,6 +24,11 @@ package() {
 }
 
 configure() {
+    ln -sf /opt/etc/profile /etc/profile.d/toltec.sh
+    # shellcheck disable=SC2016
+    sed -i \
+        -e 's|^export TERM=xterm|if \[ -z "$TERM" \];then export TERM=xterm;fi|' \
+        /opt/etc/profile
     if is-enabled "update-engine.service"; then
         echo "Disabling automatic update"
         systemctl disable --now update-engine

package/yaft/bash-l.patch

@@ -0,0 +1,13 @@
+diff --git a/apps/yaft/main.cpp b/apps/yaft/main.cpp
+index baa1f56..1d4ee6a 100755
+--- a/apps/yaft/main.cpp
++++ b/apps/yaft/main.cpp
+@@ -200,7 +200,7 @@ main(int argc, const char* argv[]) {
+   extern volatile sig_atomic_t need_redraw;
+   extern volatile sig_atomic_t child_alive;
+   extern struct termios termios_orig;
+-  static const char* shell_args[2] = { shell_cmd, NULL };
++  static const char* shell_args[3] = { shell_cmd, "-l", NULL };
+
+   Keyboard keyboard;
+

package/yaft/package

@@ -6,26 +6,29 @@ pkgnames=(yaft)
 pkgdesc="Yet another framebuffer terminal"
 url=https://github.com/timower/rM2-stuff/tree/master/apps/yaft
 _tag=0.0.8
-pkgver=${_tag}-1
+pkgver=${_tag}-2
 timestamp=2021-05-02T09:23Z
 maintainer="Mattéo Delabre <[email protected]>"
 license=GPL-3.0
 section="admin"
 image=base:v2.3
-installdepends=(display)
+installdepends=(display terminfo)
 
 source=(
     "https://github.com/timower/rM2-stuff/archive/refs/tags/v${_tag}.zip"
     input.patch
+    bash-l.patch
 )
 
 sha256sums=(
     718a9fc7a8e26d587bac790fd83ad8242978b59745269b2ff213e04820bf45b8
     SKIP
+    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