Merge branch 'testing' into Eeems-patch-16

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/display/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/rm2fb-preload.env

@@ -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/kernelctl/kernelctl

@@ -14,6 +14,9 @@ bl="\033[1;34m" # blue
 # change our working directory to / to ease filesystem operations
 cd /
 
+# find current os version
+os_version=$(awk -F= '/RELEASE_VERSION/{print $2}' /usr/share/remarkable/update.conf)
+
 help() {
     read -r -d '' msg <<- EOM
 		Usage: $(basename "$0") COMMAND
@@ -36,7 +39,7 @@ help() {
 # backup current kernel
 backup() {
     if [[ "$1" = "vanilla" ]]; then
-        kernel_name="vanilla-$(< /etc/version)"
+        kernel_name="vanilla-$os_version"
     else
         kernel_name=$1
     fi
@@ -82,7 +85,7 @@ to_kernel_name() {
         echo "${kernel_names[$(($1 - 1))]}"
         return
     elif [[ "$1" = "default" ]]; then
-        ker="vanilla-$(< /etc/version)"
+        ker="vanilla-$os_version"
     else
         ker="$1"
     fi
@@ -185,7 +188,7 @@ prune() {
     echo -n "Do you want to proceed? [N/y]: "
     read -r ans
     if [[ "$ans" = "y" || "$ans" = "Y" ]]; then
-        mapfile -t filenames < <(find "$kernelctl_dir" -path "*vanilla-*.tar.bz2" ! -name vanilla-"$(< /etc/version)".tar.bz2)
+        mapfile -t filenames < <(find "$kernelctl_dir" -path "*vanilla-*.tar.bz2" ! -name vanilla-"$os_version".tar.bz2)
         for filename in "${filenames[@]}"; do
             rm "$filename"
         done

package/kernelctl/package

@@ -5,7 +5,7 @@
 pkgnames=(kernelctl)
 pkgdesc="Manage aftermarket kernels"
 url=https://toltec-dev.org/
-pkgver=0.1-7
+pkgver=0.2-1
 timestamp=2022-11-12T00:00Z
 section="utils"
 maintainer="Salvatore Stella <[email protected]>"
@@ -26,15 +26,17 @@ package() {
 }
 
 configure() {
-    if [[ "$(kernelctl list | tail -n +2 | awk '{print $2}' | grep "vanilla-$(< /etc/version)")" == "" ]]; then
+    os_version=$(awk -F= '/RELEASE_VERSION/{print $2}' /usr/share/remarkable/update.conf)
+    if [[ "$(kernelctl list | tail -n +2 | awk '{print $2}' | grep "vanilla-$os_version")" == "" ]]; then
         echo "Creating a backup of the currently running kernel."
         kernelctl backup vanilla
     fi
 }
 
 preremove() {
-    if [[ "$(kernelctl show | tail -n 1 | grep "vanilla-$(< /etc/version)")" == "" ]]; then
-        if [[ "$(kernelctl list | tail -n +2 | awk '{print $2}' | grep "vanilla-$(< /etc/version)")" == "" ]]; then
+    os_version=$(awk -F= '/RELEASE_VERSION/{print $2}' /usr/share/remarkable/update.conf)
+    if [[ "$(kernelctl show | tail -n 1 | grep "vanilla-$os_version")" == "" ]]; then
+        if [[ "$(kernelctl list | tail -n +2 | awk '{print $2}' | grep "vanilla-$os_version")" == "" ]]; then
             echo "Unable to restore default kernel."
             echo "To force removal, you can run the following:"
             echo "  opkg remove --force-remove kernelctl"

package/koreader/package

@@ -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/lf/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/linux-mainline/package

@@ -2,25 +2,26 @@
 # Copyright (c) 2021 The Toltec Contributors
 # SPDX-License-Identifier: MIT
 
-archs=(rm2os2)
+archs=(rm2)
 pkgnames=(linux-mainline)
 pkgdesc="reMarkable 2 kernel based on the mainline kernel"
 url=https://www.kernel.org
-pkgver=6.2.0-3
-timestamp=2022-05-22T21:50:09Z
+pkgver=6.3.0-1
+timestamp=2023-08-23T21:50:09Z
 section=kernel
 maintainer="Alistair Francis <[email protected]>"
 makedepends=(build:flex build:bison build:libssl-dev build:bc build:lzop build:libgmp-dev build:libmpc-dev)
+installdepends=(kernelctl)
 license=GPL-2.0-only
 flags=(nostrip)
 
 image=base:v2.3
 source=(
-    https://github.com/alistair23/linux/archive/8241218883331bfdc0800f30eb337ff97b7c648c.tar.gz
+    https://github.com/alistair23/linux/archive/1698a3bdd8d66e58873c5bb3ce370b7d48b004cf.tar.gz
     remarkable_defconfig
 )
 sha256sums=(
-    de69fc74f1d25f447da170967eeea13b24354e9b8aa1927addcaa88c2ea9cd7c
+    647f6a60adad8c4e37eeaf9114c037888cb33923e364bbf5dc0830b2661c21b7
     f4d8cbb2c0e7bff5b151729b45064eb9e95005cb91899f0a9df038343d95ebf2
 )
 
@@ -55,9 +56,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 " - Device doesn't always resume from suspend, a reboot is required"
-    echo " - GUI shutdown in Oxide doesn't work"
+    echo " - Shutdown doesn't work (https://github.com/alistair23/linux/issues/4)"
+    echo " - Device doesn't always resume correctly from suspend, a reboot is required"
     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"
+    echo " - Folio does not work"
 }

package/oxide/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