Stable merge for Week 33 of 2023

.github/ISSUE_TEMPLATE/documentation-issue.md

@@ -0,0 +1,20 @@
+---
+name: Documentation Issue
+about: Report an issue with the documentation
+title: ''
+labels: bug, documentation
+assignees: ''
+
+---
+
+**Describe the issue**
+A clear and concise description of what the issue with the documentation is.
+
+**Potential resolution**
+A clear and concise description of what you expected to happen.
+
+**Links**
+If applicable, add links to the documentation in question.
+
+**Additional context**
+Add any other context about the problem here.

.github/ISSUE_TEMPLATE/documentation-request.md

@@ -0,0 +1,20 @@
+---
+name: Documentation request
+about: Request changes to the documentation
+title: ''
+labels: documentation
+assignees: ''
+
+---
+
+**Is your documentation request related to a problem? Please describe.**
+A clear and concise description of what the problem is. Ex. I'm always frustrated when [...]
+
+**Describe the solution you'd like**
+A clear and concise description of what you want to happen.
+
+**Describe alternatives you've considered**
+A clear and concise description of any alternative solutions or features you've considered.
+
+**Additional context**
+Add any other context or screenshots about the feature request here.

.github/ISSUE_TEMPLATE/installation-issue.md

@@ -0,0 +1,31 @@
+---
+name: Installation issue
+about: Report an issue with the installation process
+title: ''
+labels: bug, install
+assignees: ''
+
+---
+
+**Describe the issue**
+A clear and concise description of what the issue is.
+
+**To Reproduce**
+Steps to reproduce the behaviour:
+1. Go to '...'
+2. Click on '....'
+3. Scroll down to '....'
+4. See error
+
+**Expected behaviour**
+A clear and concise description of what you expected to happen.
+
+**Screenshots**
+If applicable, add screenshots to help explain your problem.
+
+**Device information (please complete the following information):**
+ - Device: [e.g. reMarkable 2]
+ - OS version: [e.g. 2.15]
+
+**Additional context**
+Add any other context about the problem here.

.github/ISSUE_TEMPLATE/package-issue.md

@@ -0,0 +1,35 @@
+---
+name: Package Issue
+about: Create a report to help us improve
+title: ''
+labels: bug, packages
+assignees: ''
+
+---
+
+**Describe the issue**
+A clear and concise description of what the issue is.
+
+**To Reproduce**
+Steps to reproduce the behaviour:
+1. Go to '...'
+2. Click on '....'
+3. Scroll down to '....'
+4. See error
+
+**Expected behaviour**
+A clear and concise description of what you expected to happen.
+
+**Upstream issue**
+If applicable, add the link to the upstream issue here.
+
+**Screenshots**
+If applicable, add screenshots to help explain your problem.
+
+**Device/Package information (please complete the following information):**
+ - Device: [e.g. reMarkable 2]
+ - OS version: [e.g. 2.15]
+ - Package: [e.g. toltec-base 0.0.1-1]
+
+**Additional context**
+Add any other context about the problem here.

.github/ISSUE_TEMPLATE/package-request.md

@@ -0,0 +1,14 @@
+---
+name: Package request
+about: Request a package be added to toltec
+title: Add [package] to toltec
+labels: packages
+assignees: ''
+
+---
+
+**Package information**
+Add the name of the package, and a link to where the source can be found.
+
+**Reason for addition**
+Provide some basic information about why you'd need this package, and what it provides that existing packages don't.

.github/actions/setup/action.yml

@@ -67,6 +67,10 @@ runs:
                 sudo chown root:root shellcheck
                 sudo mv shellcheck "$install_dir"
             fi
+        - name: Setup Python
+          uses: actions/setup-python@v4
+          with:
+            python-version: '3.10'
         - name: Cache Python environment
           uses: actions/cache@v3
           id: cache-python
@@ -80,5 +84,6 @@ runs:
           run: |
             if [[ "$CACHE_HIT" != 'true' ]]; then
                 python -m pip install --upgrade pip
+                pip install wheel
                 pip install -r requirements.txt
             fi

.github/workflows/pr.yml

@@ -8,10 +8,6 @@ jobs:
         steps:
             - name: Checkout the Git repository
               uses: actions/checkout@v3
-            - name: Setup Python
-              uses: actions/setup-python@v4
-              with:
-                python-version: '3.8'
             - name: Setup Toltec dependencies
               uses: ./.github/actions/setup
             - name: Check formatting
@@ -25,10 +21,6 @@ jobs:
         steps:
             - name: Checkout the Git repository
               uses: actions/checkout@v3
-            - name: Setup Python
-              uses: actions/setup-python@v4
-              with:
-                python-version: '3.8'
             - name: Setup Toltec dependencies
               uses: ./.github/actions/setup
             - name: Build packages

.github/workflows/stable.yml

@@ -10,10 +10,6 @@ jobs:
         steps:
             - name: Checkout the Git repository
               uses: actions/checkout@v3
-            - name: Setup Python
-              uses: actions/setup-python@v4
-              with:
-                python-version: '3.8'
             - name: Setup Toltec dependencies
               uses: ./.github/actions/setup
             - name: Build packages

.github/workflows/testing.yml

@@ -10,10 +10,6 @@ jobs:
         steps:
             - name: Checkout the Git repository
               uses: actions/checkout@v3
-            - name: Setup Python
-              uses: actions/setup-python@v4
-              with:
-                python-version: '3.8'
             - name: Setup Toltec dependencies
               uses: ./.github/actions/setup
             - name: Build packages

docs/building.md

@@ -18,7 +18,7 @@ Before running the build, make sure you have all the required dependencies:
 
 * Docker
 * bsdtar
-* Python ⩾ 3.8
+* Python 3.10
 
 You’ll also need all the Python modules listed in [requirements.txt](../requirements.txt) (install them by running `pip install --user -r requirements.txt` or using a [virtual environment](https://docs.python.org/3/tutorial/venv.html)).
 

package/linux-mainline/package

@@ -6,7 +6,7 @@ archs=(rm2)
 pkgnames=(linux-mainline)
 pkgdesc="reMarkable 2 kernel based on the mainline kernel"
 url=https://www.kernel.org
-pkgver=6.0.0-1
+pkgver=6.2.0-1
 timestamp=2022-05-22T21:50:09Z
 section=kernel
 maintainer="Alistair Francis <alistair@alistair23.me>"
@@ -15,8 +15,8 @@ license=GPL-2.0-only
 flags=(nostrip)
 
 image=base:v2.3
-source=("https://github.com/alistair23/linux/archive/4c2ef4e3bba89a8d767eccb85a242b2cd8850146.tar.gz")
-sha256sums=(1583d553380a656ecaac8dab89558051e9165983381adc9c3d52fb8ac0ce19fd)
+source=("https://github.com/alistair23/linux/archive/8241218883331bfdc0800f30eb337ff97b7c648c.tar.gz")
+sha256sums=(de69fc74f1d25f447da170967eeea13b24354e9b8aa1927addcaa88c2ea9cd7c)
 
 build() {
     ARCH=arm make imx_v6_v7_defconfig
@@ -48,8 +48,9 @@ configure() {
     echo
     echo "Known issues with the mainline kernel:"
     echo " - No support for low power mode (suspend uses more power then it should)"
-    echo " - WiFi sometimes is off on boot (can be turned on again though)"
+    echo " - Device doesn't always resume from suspend, a reboot is required"
     echo " - GUI shutdown in Oxide doesn't work"
-    echo " - Wacom stylus doesn't work in Xochitl (works everywhere else though)"
+    echo " - Wacom stylus doesn't work in Xochitl (https://github.com/reMarkable/linux/issues/15)"
+    echo " - Finger input doesn't work in Koreader (https://github.com/koreader/koreader/issues/10012)"
     echo " - No OTG control support"
 }

package/reterm/package

@@ -0,0 +1,57 @@
+#!/usr/bin/env bash
+# Copyright (c) 2021 The Toltec Contributors
+# SPDX-License-Identifier: MIT
+pkgnames=(reterm)
+pkgdesc="Landscape terminal support for the Remarkable 2 + type cover"
+section="admin"
+pkgver="20230628.1927-1"
+timestamp="2023-06-28T19:28:06Z"
+maintainer="Eeems <eeems@eeems.email>"
+url="https://github.com/i-am-shodan/ReTerm"
+license=MIT
+_gitcommit="5730f56cf25642b9752fb9d7987a40f6af6b5f59"
+source=(https://github.com/i-am-shodan/ReTerm/archive/refs/tags/release_20230628_1927.tar.gz)
+sha256sums=(3a6db39cfb83606c4ac5153fe2ac0319ab5c8322c73172178534c047a15c635b)
+image=dotnet6:latest
+makedepends=(build:gawk build:git)
+
+prepare() {
+    cd "$srcdir"
+    git config --global --add safe.directory /src
+    git init
+    git remote add origin https://github.com/i-am-shodan/ReTerm.git
+    git fetch --depth=1 origin "$_gitcommit"
+    git checkout -f "$_gitcommit"
+    git submodule update --init --force
+}
+
+build() {
+    dotnet publish \
+        -r linux-arm \
+        --self-contained true \
+        -p:PublishSingleFile=true \
+        -p:PublishedTrimmed=true \
+        -p:PublishReadyToRun=true \
+        -p:Configuration=Release \
+        -p:PublishReadyToRunShowWarnings=true \
+        src/ReTerm/ReTerm.csproj
+}
+
+package() {
+    local pubdir
+    pubdir="$srcdir"/src/ReTerm/bin/Release/net6.0/linux-arm/publish
+    install -D -m 755 -t "$pkgdir"/opt/usr/lib/reterm "$pubdir"/ReTerm
+    install -D -m 755 -T "$pubdir"/ReTerm.sh "$pkgdir"/opt/bin/ReTerm
+    sed -i 's|/home/root/ReTerm/ReTerm|/opt/usr/lib/reterm/ReTerm|' "$pkgdir"/opt/bin/ReTerm
+    install -D -m 644 -t "$pkgdir"/opt/etc/draft "$srcdir"/draft/reterm.draft
+    sed -i 's|/home/root/ReTerm/ReTerm.sh|/opt/bin/ReTerm|' "$pkgdir"/opt/etc/draft/reterm.draft
+    sed -i 's|killall -9 dotnet|killall ReTerm|' "$pkgdir"/opt/etc/draft/reterm.draft
+    install -D -m 644 -t "$pkgdir"/opt/etc/draft/icons "$srcdir"/draft/reterm.png
+    install -D -m 644 -t "$pkgdir"/opt/usr/share/applications "$srcdir"/oxide/reterm.oxide
+}
+
+configure() {
+    if is-active "tarnish.service"; then
+        type update-desktop-database &> /dev/null && update-desktop-database
+    fi
+}

package/rmscreens/package

@@ -0,0 +1,19 @@
+#!/usr/bin/env bash
+# Copyright (c) 2020 The Toltec Contributors
+# SPDX-License-Identifier: MIT
+
+pkgnames=(changescrn)
+pkgdesc="Change sleep/suspend/poweroff/reboot screens"
+url=https://github.com/pr0fsmith/rMscreens/
+pkgver=1.0.0-1
+timestamp=2022-03-15T01:28:33Z
+section="utils"
+maintainer="pr0fsmith <evon_smith@yahoo.ca>"
+license=GPL-3.0
+
+source=(https://github.com/pr0fsmith/rMscreens/archive/6d04e97b3997873f0f8b1bd50283ae7ed9be7abd.zip)
+sha256sums=(3c2e8b0952d848d7326c0a4ce45da625dd7fd0fbc6b564a2d40c3b97015138e3)
+
+package() {
+    install -Dm755 "$srcdir"/changescrn "$pkgdir/opt/bin/changescrn"
+}

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 <z@kwi.li>"
+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 <eeems@eeems.email>"
@@ -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;
+