Stable merge for week 15 of 2022

This stable merge brings support for reMarkable OS releases 2.12.2 and 2.12.3.

New packages
------------

* `toltec-base` - 1.0-1 (#532)
    - Metapackage used for specifying the default-installed packages
* `open-remarkable-shutdown` - 1.0-1 (#532)
    - Overrides the `remarkable-shutdown` and `remarkable-reboot` default configurations to use `remarkable-splash` instead of the stock utility
    - Fixes custom poweroff/reboot screens not working on rM1
    - Will be installed by default on rM1

Updated packages
----------------

* `ddvk-hacks` - 32.02-1 (#579, #584)
    - Add support for 2.12.2
    - Add support for 2.12.3
* `display` - 1:0.0.16-1 (#578, #585)
    - Add support for rM2 2.12.2
    - Add support for rM2 2.12.3
* `folly` - 0.0.1-2 (#564)
    - (Recipe improvements)
* `keywriter` - 0.2~20-gddc9e73-1 (#565)
    - Reduce font size in edit mode
    - Set default buffer orientation to portrait
    - Rotate the buffer using Ctrl-Left/Ctrl-Right in view mode
    - Add Ctrl-Q shortcut to quit the app
    - Restore cursor position when switching between modes
* `koreader` - 2022.03.1-1 (#562, #574, #575)
    - Don't use KOReader suspend/screensaver/autosuspend when Oxide is running
    - [2022.03.1 release notes](https://github.com/koreader/koreader/releases/tag/v2022.03.1)
    - [2022.03 release notes](https://github.com/koreader/koreader/releases/tag/v2022.03)
    - [2022.02 release notes](https://github.com/koreader/koreader/releases/tag/v2022.02)
* `toltec-bootstrap` - 0.2.2-1 (#532)
    - Add transient dependency on `toltec-base` for existing installs
* `xochitl` - 0.0.0-13 (#532, #567)
    - Make sure xochitl starts after/stops before the launcher
    - Force creating/removing the launcher.service alias when needed
    - Fix spurious warning when no pre-scripts are available for xochitl (e.g., on rM1)
    - Add transient dependency on `toltec-base` for existing installs
* `rmfakecloud-proxy` - 0.0.3-3 (#561)
    - Add timeout to `status` command in case the upstream server is unreachable
    - Show feedback to the user while the upstream server is being pinged
* `harmony` - 0.2.0-1 (#572)
    - Add layer support
    - Fix segfaults when showing empty load/import dialogs
    - Exporting canvas to PNG supports grays instead of dithering
    - RLE snapshots for history (less memory usage)
    - Support SYN_DROPPED in wacom events
* `remux` - 0.2.2-1
    - RLE snapshots use less memory
    - Save BPP when screenshotting current app
    - Filter palm events from gestures (less false positives)
    - Support SYN_DROPPED in wacom events

package/ddvk-hacks/package

@@ -6,15 +6,15 @@ archs=(rm1 rm2)
 pkgnames=(ddvk-hacks)
 pkgdesc="Enhance Xochitl with additional features"
 url=https://github.com/ddvk/remarkable-hacks
-pkgver=30.01-1
-timestamp=2022-02-17T14:24:50Z
+pkgver=32.02-1
+timestamp=2022-04-08T11:41:50Z
 section="readers"
 maintainer="Mattéo Delabre <[email protected]>"
 license=MIT
 flags=(nostrip)
 
-source=(https://github.com/ddvk/remarkable-hacks/archive/2bd25b5cf0453ac68dde3c45e4902b089a61c47a.zip)
-sha256sums=(b0e14028d70842be1f0d778397838982ed5d12efd41cc2af80b70f68a5baa0fa)
+source=(https://github.com/ddvk/remarkable-hacks/archive/afdb603fa4d5aeca6f8f752638e874dbb405386f.zip)
+sha256sums=(01cf5dc45ec523ccd948615689773edb90207b74b4bd0d328c33de9c3d974002)
 
 _patches_dir="/opt/share/ddvk-hacks"
 _xochitl_path="/usr/bin/xochitl"
@@ -35,6 +35,8 @@ package() {
         install -D -m 644 -t "$pkgdir$_patches_dir" "$srcdir"/patches/2103379_rm1/patch_28.1.02
         install -D -m 644 -t "$pkgdir$_patches_dir" "$srcdir"/patches/2110442_rm1/patch_29.1.02
         install -D -m 644 -t "$pkgdir$_patches_dir" "$srcdir"/patches/2121527_rm1/patch_30.1.08
+        install -D -m 644 -t "$pkgdir$_patches_dir" "$srcdir"/patches/2122573_rm1/patch_31.1.01
+        install -D -m 644 -t "$pkgdir$_patches_dir" "$srcdir"/patches/2123606_rm1/patch_32.1.02
     elif [[ $arch = rm2 ]]; then
         install -D -m 644 -t "$pkgdir$_patches_dir" "$srcdir"/patches/26171_rm2/patch_19.2.02
         install -D -m 644 -t "$pkgdir$_patches_dir" "$srcdir"/patches/26275_rm2/patch_20.2.03
@@ -48,6 +50,8 @@ package() {
         install -D -m 644 -t "$pkgdir$_patches_dir" "$srcdir"/patches/2103379_rm2/patch_28.2.02
         install -D -m 644 -t "$pkgdir$_patches_dir" "$srcdir"/patches/2110442_rm2/patch_29.2.02
         install -D -m 644 -t "$pkgdir$_patches_dir" "$srcdir"/patches/2121527_rm2/patch_30.2.07
+        install -D -m 644 -t "$pkgdir$_patches_dir" "$srcdir"/patches/2122573_rm2/patch_31.2.01
+        install -D -m 644 -t "$pkgdir$_patches_dir" "$srcdir"/patches/2123606_rm2/patch_32.2.02
     fi
 }
 
@@ -61,6 +65,16 @@ configure() {
     if [[ $arch = rm1 ]]; then
         device="reMarkable 1"
         case "$build_date" in
+            "20220330140034")
+                patch_version="32.1.02"
+                original_hash="e6693c76ad588c7a223cf5be5a280214495a68e0"
+                xochitl_version="2.12.3.606"
+                ;;
+            "20220303122245")
+                patch_version="31.1.01"
+                original_hash="00b5095022a48e48cdbe435b8afff0e3dc736b96"
+                xochitl_version="2.12.2.573"
+                ;;
             "20220202133055")
                 patch_version="30.1.08"
                 original_hash="c542ee591b45cb18599dc852cc0d3ce82ec86b56"
@@ -122,6 +136,16 @@ configure() {
     elif [[ $arch = rm2 ]]; then
         device="reMarkable 2"
         case "$build_date" in
+            "20220330134519")
+                patch_version="32.2.02"
+                original_hash="b7d8f0ca786117cdf715e3f7b08b1eac3aed907a"
+                xochitl_version="2.12.3.606"
+                ;;
+            "20220303120824")
+                patch_version="31.2.01"
+                original_hash="7105e311df4df7f4ccde457ce574da63f49d3a4e"
+                xochitl_version="2.12.2.573"
+                ;;
             "20220202133838")
                 patch_version="30.2.07"
                 original_hash="8728cf8a2677a1b458f8e1ed665f8c1358568f7f"

package/display/package

@@ -4,17 +4,17 @@
 
 archs=(rm1 rm2)
 pkgnames=(display rm2fb-client)
-timestamp=2022-02-11T17:23:07Z
+timestamp=2022-04-07T06:07:54Z
 maintainer="raisjn <[email protected]>"
 license=MIT
 url="https://github.com/ddvk/remarkable2-framebuffer"
-pkgver=1:0.0.14-1
+pkgver=1:0.0.16-1
 _release="${pkgver%-*}"
 _release="v${_release#*:}"
 _libver=1.0.1
 section="devel"
 
-image=qt:v2.1
+image=qt:v2.3
 source=(
     "https://github.com/ddvk/remarkable2-framebuffer/archive/$_release.zip"
     rm2fb.service
@@ -23,7 +23,7 @@ source=(
     rm2fb-preload.env
 )
 sha256sums=(
-    ff933cb8d81432b4a4809d49150fd75528c82e952def767659e85bb3c0ff7f5b
+    fb4860e25dcd9bc842c0c62b516c1c578d9f0df03c181aaea803c9e343c26556
     SKIP
     SKIP
     SKIP

package/folly/package

@@ -5,15 +5,15 @@
 pkgnames=(folly)
 pkgdesc="Z-machine interpreter for interactive fiction"
 url="https://github.com/bkirwi/folly"
-pkgver=0.0.1-1
+pkgver=0.0.1-2
 timestamp=2022-01-29T15:35:52-05:00
 section=games
 maintainer="Ben Kirwin <[email protected]>"
 license=MIT
 installdepends=(display)
 makedepends=(build:librust-clang-sys-dev build:libclang-dev build:libc6 build:libc6-dev build:clang)
 
-image=rust:v2.2.2
+image=rust:v2.3
 
 # Whitespace-separated list of source archives that are needed to build the package
 source=(
@@ -27,27 +27,29 @@ sha256sums=(
 )
 
 build() {
-    X_TOOLS="/opt/x-tools/arm-remarkable-linux-gnueabihf/arm-remarkable-linux-gnueabihf"
-    X_TOOLS_CPP="$X_TOOLS/include/c++/10.2.0"
+    local cpp_includes
+    local gcc_version
+    gcc_version="$("$CROSS_COMPILE"gcc -dumpfullversion)"
+    cpp_includes="$(realpath "$SYSROOT"/../include/c++/"$gcc_version")"
 
     # Arguments for bindgen's usage of clang
-    export BINDGEN_EXTRA_CLANG_ARGS="\
-      --sysroot=$X_TOOLS/sysroot\
-      -I$X_TOOLS_CPP -I$X_TOOLS_CPP/arm-remarkable-linux-gnueabihf"
+    export BINDGEN_EXTRA_CLANG_ARGS="--sysroot=$SYSROOT -I$cpp_includes \
+        -I$cpp_includes/$NGCONFIG"
 
     # Arguments for the gcc-based tensorflow build in the build.rs file of tflite-rs.
-    export TFLITE_RS_MAKE_TARGET_TOOLCHAIN_PREFIX="arm-remarkable-linux-gnueabihf-"
-    export TFLITE_RS_MAKE_EXTRA_CFLAGS="$BINDGEN_EXTRA_CLANG_ARGS -mfpu=neon -mfloat-abi=hard -mcpu=cortex-a9"
+    export TFLITE_RS_MAKE_TARGET_TOOLCHAIN_PREFIX="$CROSS_COMPILE"
+    export TFLITE_RS_MAKE_EXTRA_CFLAGS="$BINDGEN_EXTRA_CLANG_ARGS \
+        -mfpu=neon -mfloat-abi=hard -mcpu=cortex-a9"
 
     cargo build --release
 
     # Save the build system the trouble of stripping unused binaries
     rm -r target/release/build
-    rm -r target/armv7-unknown-linux-gnueabihf/release/build
+    rm -r target/*/release/build
 }
 
 package() {
     # Install the app binary and the draft file
-    install -D -m 755 "$srcdir"/target/armv7-unknown-linux-gnueabihf/release/folly "$pkgdir"/opt/bin/folly
+    install -D -m 755 "$srcdir"/target/*/release/folly "$pkgdir"/opt/bin/folly
     install -D -m 644 "$srcdir"/folly.draft "$pkgdir"/opt/etc/draft/folly.draft
 }

package/keywriter/package

@@ -5,24 +5,24 @@
 pkgnames=(keywriter)
 pkgdesc="Markdown-enabled free writing app"
 url=https://github.com/dps/remarkable-keywriter
-pkgver=0.1.0-3
-timestamp=2019-07-13T06:27Z
+pkgver=0.2~20-gddc9e73-1
+timestamp=2022-02-09T07:05:03Z
 section="writing"
 maintainer="Mattéo Delabre <[email protected]>"
 license=MIT
 installdepends=(display)
 flags=(patch_rm2fb)
 
-image=qt:v2.1
+image=qt:v2.3
 _sundown=37728fb2d7137ff7c37d0a474cb827a8d6d846d8
 source=(
-    https://github.com/dps/remarkable-keywriter/archive/c77ec3f65d9ff769f3f5dc85cc91abbf05aa163f.zip
+    https://github.com/dps/remarkable-keywriter/archive/ddc9e7321e0a57a014f19b891dc8104e67d2e447.zip
     "https://github.com/vmg/sundown/archive/$_sundown.zip"
     keywriter.draft
 )
 noextract=("$_sundown.zip")
 sha256sums=(
-    acbd0b0f74793320b1399d2adb68c4647f128578c7786f80c1cf8472b16a36f7
+    aaa22f616b44eb57594c2ec25e3a5461caec1165f6d6760112b898d9bece9135
     3c594d8219b17acd140b7011b44ebc69ab9d68910da827494f8c9cc2f5b12ecf
     SKIP
 )

package/koreader/package

@@ -5,8 +5,8 @@
 pkgnames=(koreader)
 pkgdesc="Ebook reader supporting PDF, DjVu, EPUB, FB2 and many more formats"
 url=https://github.com/koreader/koreader
-pkgver=2022.01-1
-timestamp=2022-01-16T13:04:08Z
+pkgver=2022.03.1-1
+timestamp=2022-03-20T08:31:59Z
 section="readers"
 maintainer="raisjn <[email protected]>"
 license=AGPL-3.0-or-later
@@ -21,7 +21,7 @@ source=(
     koreader
 )
 sha256sums=(
-    0c8ca8705fa49dd10dc5359a86acdd1d16349c30d7dce166fe57f90112ec6c44
+    109947258172456baeaadcf329b8b1fa4cfe1c03315c7e7222c3e4d83d81363c
     SKIP
     SKIP
     SKIP

package/open-remarkable-shutdown/package

@@ -0,0 +1,35 @@
+#!/usr/bin/env bash
+# Copyright (c) 2021 The Toltec Contributors
+# SPDX-License-Identifier: MIT
+
+pkgnames=(open-remarkable-shutdown)
+pkgdesc="Use remarkable-splash to display shutdown and reboot images"
+url=https://github.com/ddvk/remarkable-splash
+pkgver=1.0-1
+timestamp=2022-02-28T00:12Z
+section="utils"
+maintainer="Eeems <[email protected]>"
+license=MIT
+installdepends=(remarkable-splash)
+
+source=(
+    remarkable-shutdown-override.conf
+    remarkable-reboot-override.conf
+)
+sha256sums=(
+    SKIP
+    SKIP
+)
+
+package() {
+    install -D -m 644 -t "$pkgdir"/etc/systemd/system/remarkable-shutdown.service.d "$srcdir"/remarkable-shutdown-override.conf
+    install -D -m 644 -t "$pkgdir"/etc/systemd/system/remarkable-reboot.service.d "$srcdir"/remarkable-reboot-override.conf
+}
+
+configure() {
+    systemctl daemon-reload
+}
+
+postremove() {
+    systemctl daemon-reload
+}

package/open-remarkable-shutdown/remarkable-reboot-override.conf

@@ -0,0 +1,3 @@
+[Service]
+ExecStart=
+ExecStart=-/opt/bin/remarkable-splash /usr/share/remarkable/rebooting.png

package/open-remarkable-shutdown/remarkable-shutdown-override.conf

@@ -0,0 +1,3 @@
+[Service]
+ExecStart=
+ExecStart=-/opt/bin/remarkable-splash

package/rmfakecloud-proxy/package

@@ -7,8 +7,8 @@ pkgdesc="Connect Xochitl to a rmfakecloud server"
 _url=https://github.com/ddvk/rmfakecloud-proxy
 url="$_url"
 _upver=0.0.3
-pkgver="$_upver-2"
-timestamp=2021-09-26T20:38:44Z
+pkgver="$_upver-3"
+timestamp=2022-02-26T22:59Z
 section="utils"
 maintainer="Mattéo Delabre <[email protected]>"
 license=MIT

package/rmfakecloud-proxy/rmfakecloudctl

@@ -32,6 +32,9 @@ green="\033[32m"
 yellow="\033[33m"
 reset="\033[m"
 
+# ANSI escape to clear line from cursor until end
+clearline="\033[K"
+
 # Disconnect Xochitl from the cloud
 #
 # This is a necessary step when switching cloud servers to prevent the client
@@ -157,8 +160,11 @@ check-upstream() {
     local url="$upstream/service/json/1/test"
     local contents
     local wget_exit
-    contents="$(wget --output-document - --quiet "$url" 2>&1)" \
-        && wget_exit=$? || wget_exit=$?
+    contents="$(wget \
+        --output-document - \
+        --quiet "$url" \
+        --tries 1 \
+        --timeout 5 2>&1)" && wget_exit=$? || wget_exit=$?
 
     if [[ $wget_exit = 8 ]]; then
         # HTTP error, the page probably doesn't exist
@@ -359,20 +365,22 @@ if [[ $0 = "${BASH_SOURCE[0]}" ]]; then
                 service="$yellow$service"
             fi
 
+            echo -e "Status: $state$reset ($service$reset)"
+            echo -en "Upstream server: "
+
             if ! upstream="$(get-upstream)"; then
-                upstream="(${yellow}not set$reset)"
+                echo -e "(${yellow}not set$reset)"
             else
+                echo -en "$upstream (checking status...)"
                 if ! upstream_status="$(check-upstream "$upstream")"; then
-                    upstream="$upstream ($red$upstream_status$reset)"
+                    echo -en "\rUpstream server: $upstream "
+                    echo -e "($red$upstream_status$reset)$clearline"
                 else
-                    upstream="$upstream ($green$upstream_status$reset)"
+                    echo -en "\rUpstream server: $upstream "
+                    echo -e "($green$upstream_status$reset)$clearline"
                 fi
             fi
 
-            echo -e "Status: $state$reset ($service$reset)"
-            echo -e "Upstream server: $upstream"
-            echo
-
             if is-enabled; then
                 echo "Run \`rmfakecloudctl disable\` to disable \
 rmfakecloud-proxy."

package/rmkit/changelog

@@ -1,3 +1,21 @@
+2022-03-16 raisjn <of.raisjn@arkose>
+	remux
+
+	* RLE snapshots use less memory
+	* save bpp when screenshotting current app
+	* filter palm events from gestures (less false positives)
+
+	harmony:
+
+	* RLE snapshots for history (less memory usage)
+	* add layer support
+	* fix segfault when when showing empty load/import dialogs
+	* exporting canvas to png supports grays instead of dithering
+
+	rmkit:
+
+	* support SYN_DROPPED in wacom events
+
 2022-01-29 raisjn <of.raisjn@arkose>
 	rpncalc:
 

package/rmkit/package

@@ -3,20 +3,20 @@
 # SPDX-License-Identifier: MIT
 
 pkgnames=(bufshot dumbskull genie harmony iago lamp mines nao remux rpncalc simple wordlet)
-timestamp=2022-01-29T09:18:10Z
+timestamp=2022-03-15T09:18:10Z
 maintainer="raisjn <[email protected]>"
 license=MIT
 installdepends=(display)
 flags=(patch_rm2fb)
 
 image=python:v2.1
 source=(
-    https://github.com/rmkit-dev/rmkit/archive/e864182feb30e409bfd79534fd368f4d5c04c741.zip
+    https://github.com/rmkit-dev/rmkit/archive/f014604ffc129e69938bd84635a2202a21f388b6.zip
     remux.service
     genie.service
 )
 sha256sums=(
-    1aaaa7ea0ddc89eb95f099151e2f88d56f160f4d27a385a7a89907c50f47fbe0
+    e710c3864a40cec39d6960726f49f98ab9a849769b9c7e134e6db04f283863fa
     SKIP
     SKIP
 )
@@ -80,7 +80,7 @@ genie() {
 harmony() {
     pkgdesc="Procedural sketching app"
     url="https://rmkit.dev/apps/harmony"
-    pkgver=0.1.5-2
+    pkgver=0.2.0-1
     section="drawing"
 
     package() {
@@ -147,7 +147,7 @@ nao() {
 remux() {
     pkgdesc="Launcher that supports multi-tasking applications"
     url="https://rmkit.dev/apps/remux"
-    pkgver=0.2.1-2
+    pkgver=0.2.2-1
     section="launchers"
 
     package() {