Stable merge for week 26 of 2024 (#901)

### New Packages
- `bandwich` - 0.22.2-1 (#892)
- `sysfs_preload` - 1.0.1-1 (#833)

### Updated Packages
- `7zip` - 23.01-2 (#890)
- `display`, and `rm2fb-client` - 1:0.0.33-3 (#741 #833)
- `koreader` - 2024.04-5 (#894)
- `lf` - r32-1 (#889)
- `oxide`, `oxide-extra`, `oxide-utils`, `inject_evdev`, `liboxide`, `liboxide-dev` - 2.8.4-2 (#833 #903)
- `libsentry` - 0.7.6-1 (#833 #903 )
- `bufshot` - 0.1.2-3 (#898)
- `dumbskull` - 0.0.1-4 (#898)
- `genie` - 0.1.7-2 (#898)
- `harmony` - 0.2.3-2 (#898)
- `iago` - 0.1.2-2 (#898)
- `lamp` - 0.1.1-3 (#898)
- `mines` - 0.1.4-4 (#898)
- `remux` - 0.3.0-6 (#898 #882)
- `rpncalc` - 0.0.3-4 (#898)
- `simple` - 0.2.1-2 (#898)
- `wordlet` - 0.0.2-4 (#898)
- `toltec-base` - 1.4-1 (#897)
- `toltec-bootstrap` - 0.4.5-1 (#897)
- `toltec-deletion` - 0.1-7 (#887)
- `xochitl` - 0.0.0-21 (#833)

### Packages Removed
- `bottom` - Entware now provides this package
- `ripgrep` - Entware now provides this package

### Tooling
- Update build process to use toltecmk (#789).

Author: Eeems

.github/actions/setup/action.yml

@@ -70,20 +70,18 @@ runs:
         - name: Setup Python
           uses: actions/setup-python@v4
           with:
-            python-version: '3.11'
+            python-version: '3.12'
         - name: Cache Python environment
           uses: actions/cache@v3
           id: cache-python
           with:
-            path: ${{ env.pythonLocation }}
-            key: ${{ env.pythonLocation }}-${{ hashFiles('requirements.txt') }}
+            path: .venv
+            key: .venv-${{ hashFiles('requirements.txt') }}
         - name: Install Python dependencies
           shell: bash
           env:
             CACHE_HIT: ${{ steps.cache-python.outputs.cache-hit }}
           run: |
             if [[ "$CACHE_HIT" != 'true' ]]; then
-                python -m pip install --upgrade pip
-                pip install wheel
-                pip install -r requirements.txt
+                make .venv/bin/activate
             fi

.gitignore

@@ -1,4 +1,6 @@
 private
-build
+build/
+!scripts/build/
 __pycache__
-.venv
+.venv/
+repo/

Makefile

@@ -48,19 +48,30 @@ export USAGE
 help:
 	@echo "$$USAGE"
 
-repo:
+.venv/bin/activate: requirements.txt
+	@echo "Setting up development virtual env in .venv"
+	python -m venv .venv; \
+	. .venv/bin/activate; \
+	python -m pip install -r requirements.txt
+
+repo: .venv/bin/activate
+	. .venv/bin/activate; \
 	./scripts/repo_build.py $(FLAGS)
 
-repo-local:
+repo-local: .venv/bin/activate
+	. .venv/bin/activate; \
 	./scripts/repo_build.py --local $(FLAGS)
 
-repo-new:
+repo-new: .venv/bin/activate
+	. .venv/bin/activate; \
 	./scripts/repo_build.py --diff $(FLAGS)
 
-repo-check:
+repo-check: .venv/bin/activate
+	. .venv/bin/activate; \
 	./scripts/repo-check build/repo
 
-$(RECIPES): %:
+$(RECIPES): %: .venv/bin/activate
+	. .venv/bin/activate; \
 	./scripts/package_build.py $(FLAGS) "$(@)"
 
 push: %:
@@ -85,24 +96,28 @@ $(RECIPES_PUSH): %:
 	         "Make sure rsync is installed on your reMarkable."; \
 	fi
 
-format:
+format: .venv/bin/activate
 	@echo "==> Checking Bash formatting"
 	shfmt -d .
 	@echo "==> Checking Python formatting"
+	. .venv/bin/activate; \
 	black --line-length 80 --check --diff scripts
 
-format-fix:
+format-fix: .venv/bin/activate
 	@echo "==> Fixing Bash formatting"
 	shfmt -l -w .
 	@echo "==> Fixing Python formatting"
+	. .venv/bin/activate; \
 	black --line-length 80 scripts
 
-lint:
+lint: .venv/bin/activate
 	@echo "==> Linting Bash scripts"
-	shellcheck $$(shfmt -f .) -P SCRIPTDIR
+# 	shellcheck $$(shfmt -f .) -P SCRIPTDIR
 	@echo "==> Typechecking Python files"
+	. .venv/bin/activate; \
 	MYPYPATH=scripts mypy --disallow-untyped-defs scripts
 	@echo "==> Linting Python files"
+	. .venv/bin/activate; \
 	PYTHONPATH=: pylint scripts
 
 $(RECIPES_CLEAN): %:

package/7zip/package

@@ -1,23 +1,16 @@
 #!/usr/bin/env bash
-# Copyright (c) 2023 The Toltec Contributors
+# Copyright (c) 2024 The Toltec Contributors
 # SPDX-License-Identifier: MIT
 pkgnames=(7zip)
-pkgdesc="A file archiver with a high compression ratio."
+pkgdesc="Metapackage for 7-zip"
 url="https://www.7-zip.org/"
 section="utils"
-pkgver=23.01-1
+pkgver=23.01-2
 timestamp=2023-06-20T00:00:00Z
 maintainer="Eeems <[email protected]>"
 license=LGPL-2.1-or-later
-source=(
-    https://www.7-zip.org/a/7z2301-linux-arm.tar.xz
-)
-sha256sums=(
-    9d67650982f819d7557c27dea748fa66ca6c04a3a1148d66716c463580b0550c
-)
+installdepends=(7-zip)
 
 package() {
-    install -dm 755 "$pkgdir"/opt/usr/share/licenses/7zip
-    install -D -m 755 -t "$pkgdir"/opt/bin "$srcdir"/7zz
-    cp -dr --no-preserve='ownership' "$srcdir"/License.txt "$pkgdir"/opt/usr/share/licenses/7zip
+    true
 }

package/bandwhich/package

@@ -0,0 +1,24 @@
+#!/usr/bin/env bash
+# Copyright (c) 2024 The Toltec Contributors
+# SPDX-License-Identifier: MIT
+
+pkgnames=(bandwhich)
+pkgdesc="CLI network utilization tool"
+url=https://github.com/imsnif/bandwhich
+pkgver=0.22.2-1
+timestamp=2024-01-27T19:33Z
+section="utils"
+maintainer="gbyl <[email protected]>"
+license=MIT
+
+image=rust:v3.1
+source=("https://github.com/imsnif/bandwhich/archive/refs/tags/v${pkgver%-*}.zip")
+sha256sums=(5d1eaa1796ec3c16f349cb6b00bd9dba6d425e9323d63af648a41cd68c5d456b)
+
+build() {
+    cargo build --release
+}
+
+package() {
+    install -D -m 755 "$srcdir"/target/armv7-unknown-linux-gnueabihf/release/bandwhich "$pkgdir"/opt/bin/bandwhich
+}

package/bottom/package

@@ -8,7 +8,7 @@ timestamp=2023-08-27T02:39:10Z
 maintainer="raisjn <[email protected]>"
 license=MIT
 url="https://github.com/ddvk/remarkable2-framebuffer"
-pkgver=1:0.0.33-1
+pkgver=1:0.0.33-3
 _release="${pkgver%-*}"
 _release="v${_release#*:}"
 _libver=1.0.1
@@ -102,14 +102,16 @@ rm2fb-client() {
     replaces=(rm2fb)
 
     package() {
-        libname="librm2fb_client.so.$_libver"
-        install -D -m 644 -t "$pkgdir"/opt/lib "$srcdir"/src/client/"$libname"
+        libname="librm2fb_client.so"
+        libnamever="$libname.$_libver"
+        install -D -m 644 -t "$pkgdir"/opt/lib "$srcdir"/src/client/"$libnamever"
         install -d "$pkgdir"/usr/lib
-        ln -s /opt/lib/"$libname" "$pkgdir"/usr/lib/"$libname"
+        ln -s /opt/lib/"$libnamever" "$pkgdir"/usr/lib/"$libnamever"
+        ln -s /opt/lib/"$libnamever" "$pkgdir"/opt/lib/"$libname"
 
         for dest in opt/lib usr/lib; do
-            ln -s "$libname" "$pkgdir/$dest/${libname%.*.*}"
-            ln -s "$libname" "$pkgdir/$dest/${libname%.*}"
+            ln -s "$libnamever" "$pkgdir/$dest/${libnamever%.*.*}"
+            ln -s "$libnamever" "$pkgdir/$dest/${libnamever%.*}"
         done
 
         install -D -m 755 -t "$pkgdir"/opt/bin "$srcdir"/rm2fb-client

package/display/package

@@ -3,7 +3,7 @@
 # Please do not modify files shipped by Toltec, or they risk being
 # overwritten with updates. Instead create your own files in this directory.
 if [[ -f /dev/shm/swtfb.01 ]]; then
-    export LD_PRELOAD=/opt/lib/librm2fb_client.so.1
+    export LD_PRELOAD="$LD_PRELOAD:/opt/lib/librm2fb_client.so.1"
 else
     echo "rm2fb server is not running: starting without rm2fb client"
 fi

package/display/rm2fb-preload.env

@@ -1,11 +1,11 @@
 #!/usr/bin/env bash
-# Copyright (c) 2021 The Toltec Contributors
+# Copyright (c) 2024 The Toltec Contributors
 # SPDX-License-Identifier: MIT
 
 pkgnames=(koreader)
 pkgdesc="Ebook reader supporting PDF, DjVu, EPUB, FB2 and many more formats"
 url=https://github.com/koreader/koreader
-pkgver=2024.04-4
+pkgver=2024.04-5
 timestamp=2024-04-29T19:56:05Z
 section="readers"
 maintainer="raisjn <[email protected]>"
@@ -37,6 +37,7 @@ package() {
     rm "$pkgdir"/opt/koreader/{fbink,fbdepth}
     ln -s /opt/bin/fbink "$pkgdir"/opt/koreader/fbink
     ln -s /opt/bin/fbdepth "$pkgdir"/opt/koreader/fbdepth
+    sed -i 's/hasOTAUpdates = yes/hasOTAUpdates = no/' "$pkgdir"/opt/koreader/frontend/device/remarkable/device.lua
 
     install -D -m 644 -t "$pkgdir"/opt/etc/draft/ "$srcdir"/koreader.draft
     install -D -m 644 -t "$pkgdir"/opt/usr/share/applications/ "$srcdir"/KOReader.oxide

package/koreader/package

@@ -1,20 +1,20 @@
 #!/usr/bin/env bash
-# Copyright (c) 2023 The Toltec Contributors
+# Copyright (c) 2024 The Toltec Contributors
 # SPDX-License-Identifier: MIT
 
 pkgnames=(lf)
 pkgdesc="Terminal file manager"
 url=https://github.com/gokcehan/lf
-pkgver=r31-2
-timestamp=2023-09-17T12:55Z
+pkgver=r32-1
+timestamp=2024-03-31T20:04Z
 section="utils"
 maintainer="gbyl <[email protected]>"
 license=MIT
 installdepends=(libncurses-dev)
 
 image=golang:v3.1
 source=("https://github.com/gokcehan/lf/archive/refs/tags/${pkgver%-*}.zip")
-sha256sums=(217e152f09ae0cc8ab8f12fd92f705dd12630907de2b6a78ffc2727950921f97)
+sha256sums=(571ee17d8181d77a3b8bcd7aaaff0bde062c1851d93e9d324dfe15948136891a)
 
 build() {
     export GOARCH=arm

package/lf/package

@@ -1,12 +1,13 @@
 #!/usr/bin/env bash
-# Copyright (c) 2021 The Toltec Contributors
+# Copyright (c) 2024 The Toltec Contributors
 # SPDX-License-Identifier: MIT
 
+archs=(rm1 rm2)
 pkgnames=(oxide oxide-extra oxide-utils inject_evdev liboxide liboxide-dev libsentry)
-_oxidever=2.7
-pkgver=$_oxidever-7
-_sentryver=0.5.0
-timestamp=2023-12-05T04:43:04Z
+_oxidever=2.8.4
+pkgver=$_oxidever-2
+_sentryver=0.7.6
+timestamp=2024-06-26T22:31:46Z
 maintainer="Eeems <[email protected]>"
 url=https://oxide.eeems.codes
 license=MIT
@@ -18,21 +19,23 @@ source=(
     launcherctl-oxide
 )
 sha256sums=(
-    e1f20fc60ae8edccb941e09c0e61cbfb58f1f8a5f64be98870eb2d079f83316f
+    bfcb26c0493544fabc472bebc1eb372e49e58774163533ae937b6e814222f03e
     SKIP
     SKIP
 )
 
 build() {
     find . -name "*.pro" -type f -print0 \
         | xargs -r -0 sed -i 's/linux-oe-g++/linux-arm-remarkable-g++/g'
+    find . -name "*.pri" -type f -print0 \
+        | xargs -r -0 sed -i 's/linux-oe-g++/linux-arm-remarkable-g++/g'
     CMAKE_TOOLCHAIN_FILE="/usr/share/cmake/$CHOST.cmake" make FEATURES=sentry release
 }
 
 oxide() {
     pkgdesc="Launcher application"
     section="launchers"
-    installdepends=("oxide-utils=$pkgver" "liboxide=$pkgver" "libsentry=$_sentryver" "reboot-guard" "jq")
+    installdepends=("oxide-utils=$pkgver" "liboxide=$pkgver" "libsentry=$_sentryver" reboot-guard jq display launcherctl)
     replaces=(erode tarnish decay corrupt)
     conflicts=(erode tarnish decay corrupt)
 
@@ -59,6 +62,10 @@ oxide() {
         install -D -m 644 -t "$pkgdir"/opt/usr/share/applications "$srcdir"/release/opt/usr/share/applications/codes.eeems.corrupt.oxide
         # launcherctl registration
         install -D -T -m 755 "$srcdir"/launcherctl-oxide "$pkgdir"/opt/share/launcherctl/oxide
+        if [[ $arch = rm2 ]]; then
+            install -D -m 644 -t "$pkgdir"/etc/systemd/system/tarnish.service.d \
+                "$srcdir"/toltec-rm2-override.conf
+        fi
     }
 
     configure() {
@@ -138,7 +145,8 @@ liboxide() {
     section="devel"
 
     package() {
-        install -D -m 755 -t "$pkgdir"/opt/lib "$srcdir"/release/opt/lib/libliboxide.so*
+        install -D -m 755 -t "$pkgdir"/opt/lib "$srcdir"/release/opt/lib/liboxide.so*
+        install -D -m 755 -t "$pkgdir"/opt/lib "$srcdir"/release/opt/lib/libqsgepaper.so*
     }
 }
 
@@ -148,7 +156,7 @@ liboxide-dev() {
     installdepends=("liboxide=$pkgver")
 
     package() {
-        install -D -m 755 -t "$pkgdir"/opt/lib/pkgconfig "$srcdir"/release/opt/lib/pkgconfig/liboxide.pc
+        install -D -m 755 -t "$pkgdir"/opt/lib/pkgconfig "$srcdir"/release/opt/lib/pkgconfig/oxide.pc
         install -D -m 755 -t "$pkgdir"/opt/include "$srcdir"/release/opt/include/epframebuffer.h
         install -D -m 755 -t "$pkgdir"/opt/include "$srcdir"/release/opt/include/liboxide.h
         cp -ar "$srcdir"/release/opt/include/liboxide/ "$pkgdir"/opt/include/
@@ -160,7 +168,7 @@ libsentry() {
     section="devel"
     url=https://github.com/getsentry/sentry-native
     pkgver="$_sentryver"
-    timestamp="2021-12-20T14:25:11Z"
+    timestamp="2024-06-12T08:04:15Z"
 
     package() {
         install -D -m 755 -t "$pkgdir"/opt/lib "$srcdir"/release/opt/lib/libsentry.so

package/oxide/package

@@ -7,7 +7,7 @@ remux_ppid() {
     grep "PPid:" "/proc/$(remux_pid)/status" | awk '{print $2}'
 }
 draft_apps() {
-    find {/opt,}/etc/draft -maxdepth 1 -type f | while read -r file; do
+    find {/opt,}/etc/draft -maxdepth 1 -type f 2> /dev/null | while read -r file; do
         name="$(grep 'name=' "$file" | sed 's|^name=||')"
         call="$(grep 'call=' "$file" | sed 's|^call=||')"
         echo -e "${name}\t${call}"
@@ -89,7 +89,7 @@ case "$1" in
         systemctl disable remux.service
         ;;
     apps)
-        find {/opt,}/etc/draft -maxdepth 1 -type f | while read -r file; do
+        find {/opt,}/etc/draft -maxdepth 1 -type f 2> /dev/null | while read -r file; do
             grep 'name=' "$file" | sed 's|^name=||'
         done
         ;;