From 80ec826433eac0ee9cdb2f1c1fa11e139d5289e4 Mon Sep 17 00:00:00 2001 From: Nathaniel van Diepen Date: Mon, 20 May 2024 19:02:44 -0600 Subject: [PATCH] Stable merge for week 4 of 2024 (#830) ### New Packages - `move-logs-to-opt` - 0.0.1-1 (#821) - Move log files to `/opt` to avoid filling up the root partition. - `oxide-extra` and `liboxide-dev` - 2.7-3 (#760) ### Updated Packages - `folly` - 0.0.1-4 (#823) - `koreader` - 2024.01-1 (#826) - `linux-stracciatella` - 5.4.70.4-1 (#808) - `oxide`, `oxide-utils`, `inject_evdev`, and `liboxide` - 2.7-3 (#760) - `puzzles` - 0.2.4-4 (#785) - `rm2-suspend-fix` - 0.0.0-3 (#821) - `genie` - 0.1.7-1 (#825) - `harmony` - 0.2.3-1 (#825) - `iago` - 0.1.2-1 (#825) - `remux` - 0.3.0-1 (#825) - `simple` - 0.2.1-1 (#825) - `tilem` - 0.1.1-1 (#764) - `toltec-base` - 1.3-1 (#806) - `yaft` - 0.1.1 (#763) - `zoneinfo-utils` - 2023c-1 (#702) - `rmfakecloud-proxy` - 0.0.3-5 (#757 #831) ### Packages removed - `erode`, `tarnish`, `decay`, and `corrupt` - Replaced by `oxide` - `fret`, and `anxiety` - Replaced by `oxide-extra` - `rot` - Replaced by `oxide-utils` --- .github/workflows/pr-labels.yml | 2 +- .github/workflows/pr.yml | 6 +- .github/workflows/stable.yml | 2 +- .github/workflows/testing.yml | 2 +- Makefile | 4 + package/folly/package | 4 +- package/koreader/package | 6 +- package/linux-stracciatella/package | 8 +- package/move-logs-to-opt/package | 56 ++++++++++ package/move-logs-to-opt/var-log.mount | 15 +++ package/oxide/package | 134 +++++++++-------------- package/puzzles/package | 9 +- package/rm2-suspend-fix/package | 4 +- package/rmfakecloud-proxy/package | 2 +- package/rmfakecloud-proxy/rmfakecloudctl | 2 +- package/rmkit/changelog | 23 ++++ package/rmkit/package | 16 +-- package/tilem/package | 26 ++++- package/toltec-base/package | 29 +++-- package/yaft/input.patch | 23 ---- package/yaft/package | 35 +++--- package/zoneinfo-utils/package | 24 ++-- 22 files changed, 256 insertions(+), 176 deletions(-) create mode 100644 package/move-logs-to-opt/package create mode 100644 package/move-logs-to-opt/var-log.mount delete mode 100644 package/yaft/input.patch diff --git a/.github/workflows/pr-labels.yml b/.github/workflows/pr-labels.yml index 67daf3ba2..166d3e256 100644 --- a/.github/workflows/pr-labels.yml +++ b/.github/workflows/pr-labels.yml @@ -5,7 +5,7 @@ on: jobs: check-labels: name: Check that PRs against the stable branch are labelled correctly - runs-on: ubuntu-20.04 + runs-on: ubuntu-22.04 steps: - name: Check labels run: | diff --git a/.github/workflows/pr.yml b/.github/workflows/pr.yml index 34bc2ca28..7968bff0e 100644 --- a/.github/workflows/pr.yml +++ b/.github/workflows/pr.yml @@ -4,7 +4,7 @@ on: jobs: lint: name: Check that it conforms to the style guide - runs-on: ubuntu-20.04 + runs-on: ubuntu-22.04 steps: - name: Checkout the Git repository uses: actions/checkout@v3 @@ -16,7 +16,7 @@ jobs: run: make lint pr: name: Check that it builds without error - runs-on: ubuntu-20.04 + runs-on: ubuntu-22.04 needs: lint steps: - name: Checkout the Git repository @@ -24,7 +24,7 @@ jobs: - name: Setup Toltec dependencies uses: ./.github/actions/setup - name: Build packages - run: make repo-new FLAGS='--remote-repo https://toltec-dev.org/${{ github.base_ref }}' + run: FLAGS='--remote-repo https://toltec-dev.org/${{ github.base_ref }}' make repo-new - name: Save the build output uses: actions/upload-artifact@v3 with: diff --git a/.github/workflows/stable.yml b/.github/workflows/stable.yml index 62a06e427..caa8c28c8 100644 --- a/.github/workflows/stable.yml +++ b/.github/workflows/stable.yml @@ -6,7 +6,7 @@ on: jobs: stable: name: Build and publish the stable channel - runs-on: ubuntu-20.04 + runs-on: ubuntu-22.04 steps: - name: Checkout the Git repository uses: actions/checkout@v3 diff --git a/.github/workflows/testing.yml b/.github/workflows/testing.yml index 883718745..ed52c0ecf 100644 --- a/.github/workflows/testing.yml +++ b/.github/workflows/testing.yml @@ -6,7 +6,7 @@ on: jobs: testing: name: Build and publish the testing channel - runs-on: ubuntu-20.04 + runs-on: ubuntu-22.04 steps: - name: Checkout the Git repository uses: actions/checkout@v3 diff --git a/Makefile b/Makefile index 8a6fe60f1..a6bca5d92 100644 --- a/Makefile +++ b/Makefile @@ -6,6 +6,10 @@ RECIPES=$(shell ls package/) RECIPES_PUSH=$(foreach app, $(RECIPES), $(app)-push) RECIPES_CLEAN=$(foreach app, $(RECIPES), $(app)-clean) +ifeq ($(RUNNER_DEBUG), 1) +FLAGS+= --verbose +endif + define USAGE Building packages: diff --git a/package/folly/package b/package/folly/package index 2682d2c7d..80a788d08 100644 --- a/package/folly/package +++ b/package/folly/package @@ -5,13 +5,13 @@ pkgnames=(folly) pkgdesc="Z-machine interpreter for interactive fiction" url="https://github.com/bkirwi/folly" -pkgver=0.0.1-3 +pkgver=0.0.1-4 timestamp=2022-04-18T17:50:16Z section=games maintainer="Ben Kirwin " license=MIT installdepends=(display) -makedepends=(build:librust-clang-sys-dev build:libclang-dev build:libc6 build:libc6-dev build:clang) +makedepends=(build:libclang-14-dev build:clang-14 build:llvm-14-dev) image=rust:v2.3 diff --git a/package/koreader/package b/package/koreader/package index 3568eb43a..9f91852d2 100644 --- a/package/koreader/package +++ b/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=2023.10-2 -timestamp=2023-10-30T17:19:28Z +pkgver=2024.01-1 +timestamp=2024-01-11T17:16:35Z section="readers" maintainer="raisjn " license=AGPL-3.0-or-later @@ -21,7 +21,7 @@ source=( koreader ) sha256sums=( - fdb72bdb80c74b6c955ffde8852ce67b77ebc7d88ceb4a439b622aff74ad858e + 2616c7f0c63d54810f4ec78477ecb5dac2443990c7d2c8188c577ad5d925cca1 SKIP SKIP SKIP diff --git a/package/linux-stracciatella/package b/package/linux-stracciatella/package index e0fe100eb..994842c50 100644 --- a/package/linux-stracciatella/package +++ b/package/linux-stracciatella/package @@ -6,8 +6,8 @@ archs=(rm1 rm2) pkgnames=(linux-stracciatella) pkgdesc="RemarkableAS's vanilla kernel with a few extra flakes" url=https://github.com/Etn40ff/linux-remarkable -pkgver=5.4.70-3 -timestamp=2023-09-23T00:12:00Z +pkgver=5.4.70.4-1 +timestamp=2023-12-28T22:42:42Z section="kernel" maintainer="Salvatore Stella " makedepends=(build:flex build:bison build:libssl-dev build:bc build:lzop build:libgmp-dev build:libmpc-dev build:kmod) @@ -17,11 +17,11 @@ installdepends=(kernelctl) image=base:v3.1 _wireguard_version=1.0.20220627 source=( - https://github.com/Etn40ff/linux-remarkable/archive/c908b16d6b848964ecc9b116a024f247c290a1bf.tar.gz + "https://github.com/Etn40ff/linux-remarkable/archive/refs/tags/${pkgver%-*}.tar.gz" "https://git.zx2c4.com/wireguard-linux-compat/snapshot/wireguard-linux-compat-$_wireguard_version.tar.xz" ) sha256sums=( - 2075b9eb69172751b3e8e0d3a40d63c0c05982e79a2724ed7c3bdfc4f7988eea + 29fd9d7adcb243b841d3577088dd2aec6106eaaa3bc51440411f49ea50658c01 362d412693c8fe82de00283435818d5c5def7f15e2433a07a9fe99d0518f63c0 ) noextract=("wireguard-linux-compat-$_wireguard_version.tar.xz") diff --git a/package/move-logs-to-opt/package b/package/move-logs-to-opt/package new file mode 100644 index 000000000..99e131bb6 --- /dev/null +++ b/package/move-logs-to-opt/package @@ -0,0 +1,56 @@ +#!/usr/bin/env bash +# Copyright (c) 2023 The Toltec Contributors +# SPDX-License-Identifier: MIT + +pkgnames=(move-logs-to-opt) +pkgdesc="Move log files to /opt to save space on the root partition" +url=https://github.com/toltec-dev/toltec +pkgver=0.0.1-1 +timestamp=2024-01-07T23:55Z +section="utils" +maintainer="Eeems " +license=MIT + +source=(var-log.mount) +sha256sums=(SKIP) + +package() { + mkdir -p "$pkgdir"/opt/var/log + install -D -m 644 -t "$pkgdir"/lib/systemd/system/ "$srcdir"/var-log.mount +} + +configure() { + systemctl daemon-reload + if is-active systemd-journald.service; then + journalctl --sync --flush + systemctl stop systemd-journald.service + fi + if ! mountpoint -q /var/log; then + echo "Moving log files to new location" + local target_path=/home/root/.entware/var/log + mkdir -p "$target_path" + cp -af "/var/log/." "$target_path" + rm -rf "/var/log/"* + fi + if ! is-enabled "var-log.mount"; then + systemctl enable "var-log.mount" + fi + systemctl restart "var-log.mount" + systemctl start systemd-journald.service +} + +preremove() { + if is-active systemd-journald.service; then + journalctl --sync --flush + systemctl stop systemd-journald.service + fi + disable-unit "var-log.mount" +} + +postremove() { + systemctl daemon-reload + systemctl start systemd-journald.service + if mountpoint -q /var/log; then + umount -l /var/log + fi +} diff --git a/package/move-logs-to-opt/var-log.mount b/package/move-logs-to-opt/var-log.mount new file mode 100644 index 000000000..a1fd0d3d3 --- /dev/null +++ b/package/move-logs-to-opt/var-log.mount @@ -0,0 +1,15 @@ +[Unit] +Description=Bind mount '/home/root/.entware/var/log' over '/var/log' +DefaultDependencies=no +Conflicts=umount.target +Before=local-fs.target umount.target systemd-journald.service +After=home.mount + +[Mount] +What=/home/root/.entware/var/log +Where=/var/log +Type=none +Options=bind + +[Install] +WantedBy=local-fs.target diff --git a/package/oxide/package b/package/oxide/package index 8c2c32049..66a6575e4 100644 --- a/package/oxide/package +++ b/package/oxide/package @@ -2,22 +2,22 @@ # Copyright (c) 2021 The Toltec Contributors # SPDX-License-Identifier: MIT -pkgnames=(erode fret oxide rot tarnish decay corrupt anxiety oxide-utils inject_evdev liboxide libsentry) -_oxidever=2.6 +pkgnames=(oxide oxide-extra oxide-utils inject_evdev liboxide liboxide-dev libsentry) +_oxidever=2.7 pkgver=$_oxidever-3 _sentryver=0.5.0 -timestamp=2023-06-05T23:27:53Z +timestamp=2023-12-05T04:43:04Z maintainer="Eeems " url=https://oxide.eeems.codes license=MIT flags=(patch_rm2fb) -image=qt:v2.3 +image=qt:v3.1 source=( "https://github.com/Eeems-Org/oxide/archive/refs/tags/v$_oxidever.zip" toltec-rm2-override.conf ) sha256sums=( - bbcf83302f530afe069974121496be6f8118eadba3c00633f834db026e41ae95 + e1f20fc60ae8edccb941e09c0e61cbfb58f1f8a5f64be98870eb2d079f83316f SKIP ) @@ -27,67 +27,36 @@ build() { CMAKE_TOOLCHAIN_FILE="/usr/share/cmake/$CHOST.cmake" make FEATURES=sentry release } -erode() { - pkgdesc="Task manager" - section="admin" - installdepends=(display "tarnish=$pkgver" "liboxide=$pkgver" "libsentry=$_sentryver") +oxide() { + pkgdesc="Launcher application" + section="launchers" + installdepends=("oxide-utils=$pkgver" "liboxide=$pkgver" "libsentry=$_sentryver" "reboot-guard") + replaces=(erode tarnish decay corrupt) + conflicts=(erode tarnish decay corrupt) package() { + # System service + install -D -m 644 -t "$pkgdir"/etc/dbus-1/system.d "$srcdir"/release/etc/dbus-1/system.d/codes.eeems.oxide.conf + install -D -m 644 -t "$pkgdir"/lib/systemd/system "$srcdir"/release/etc/systemd/system/tarnish.service + install -D -m 755 -t "$pkgdir"/opt/bin "$srcdir"/release/opt/bin/tarnish + # Task manager install -D -m 755 -t "$pkgdir"/opt/bin "$srcdir"/release/opt/bin/erode install -D -m 644 -t "$pkgdir"/opt/usr/share/icons/oxide/48x48/apps "$srcdir"/release/opt/usr/share/icons/oxide/48x48/apps/erode.png install -D -m 644 -t "$pkgdir"/opt/usr/share/icons/oxide/702x702/splash "$srcdir"/release/opt/usr/share/icons/oxide/702x702/splash/erode.png install -D -m 644 -t "$pkgdir"/opt/usr/share/applications "$srcdir"/release/opt/usr/share/applications/codes.eeems.erode.oxide - } -} - -fret() { - pkgdesc="Take screenshots" - section="utils" - installdepends=("tarnish=$pkgver" "oxide-utils=$pkgver" "liboxide=$pkgver" "libsentry=$_sentryver") - - package() { - install -D -m 755 -t "$pkgdir"/opt/bin "$srcdir"/release/opt/bin/fret - install -D -m 644 -t "$pkgdir"/opt/usr/share/applications "$srcdir"/release/opt/usr/share/applications/codes.eeems.fret.oxide - } -} - -oxide() { - pkgdesc="Launcher application" - section="launchers" - installdepends=("erode=$pkgver" "fret=$pkgver" "tarnish=$pkgver" "rot=$pkgver" "decay=$pkgver" "oxide-utils=$pkgver" "liboxide=$pkgver" "libsentry=$_sentryver") - - package() { + # Launcher install -D -m 755 -t "$pkgdir"/opt/bin "$srcdir"/release/opt/bin/oxide install -D -m 644 -t "$pkgdir"/opt/etc "$srcdir"/release/opt/etc/oxide.conf install -D -m 644 -t "$pkgdir"/opt/usr/share/applications "$srcdir"/release/opt/usr/share/applications/codes.eeems.oxide.oxide install -D -m 644 -t "$pkgdir"/opt/usr/share/icons/oxide/702x702/splash "$srcdir"/release/opt/usr/share/icons/oxide/702x702/splash/oxide.png + # Lockscreen + install -D -m 755 -t "$pkgdir"/opt/bin "$srcdir"/release/opt/bin/decay + install -D -m 644 -t "$pkgdir"/opt/usr/share/applications "$srcdir"/release/opt/usr/share/applications/codes.eeems.decay.oxide + # Task switcher + install -D -m 755 -t "$pkgdir"/opt/bin "$srcdir"/release/opt/bin/corrupt + install -D -m 644 -t "$pkgdir"/opt/usr/share/applications "$srcdir"/release/opt/usr/share/applications/codes.eeems.corrupt.oxide } -} - -rot() { - pkgdesc="Manage Oxide settings through the command line" - section="admin" - installdepends=("tarnish=$pkgver" "liboxide=$pkgver" "libsentry=$_sentryver") - - package() { - install -D -m 755 -t "$pkgdir"/opt/bin "$srcdir"/release/opt/bin/rot - } -} -tarnish() { - pkgdesc="Service managing power states, connectivity and buttons" - section="devel" - installdepends=(display xochitl "liboxide=$pkgver" "libsentry=$_sentryver") - - package() { - install -D -m 644 -t "$pkgdir"/etc/dbus-1/system.d "$srcdir"/release/etc/dbus-1/system.d/codes.eeems.oxide.conf - install -D -m 644 -t "$pkgdir"/lib/systemd/system "$srcdir"/release/etc/systemd/system/tarnish.service - install -D -m 755 -t "$pkgdir"/opt/bin "$srcdir"/release/opt/bin/tarnish - if [[ $arch = rm2 ]]; then - install -D -m 644 -t "$pkgdir"/etc/systemd/system/tarnish.service.d \ - "$srcdir"/toltec-rm2-override.conf - fi - } configure() { systemctl daemon-reload if ! is-enabled "tarnish.service"; then @@ -97,41 +66,28 @@ tarnish() { echo "" fi } + preremove() { disable-unit tarnish.service } + postremove() { systemctl daemon-reload } } -decay() { - pkgdesc="Lockscreen application" +oxide-extra() { + pkgdesc="Extra applications for oxide" section="utils" - installdepends=(display "tarnish=$pkgver" "oxide-utils=$pkgver" "liboxide=$pkgver" "libsentry=$_sentryver") - - package() { - install -D -m 755 -t "$pkgdir"/opt/bin "$srcdir"/release/opt/bin/decay - install -D -m 644 -t "$pkgdir"/opt/usr/share/applications "$srcdir"/release/opt/usr/share/applications/codes.eeems.decay.oxide - } -} -corrupt() { - pkgdesc="Task Switcher for Oxide" - section="utils" - installdepends=(display "tarnish=$pkgver" "oxide-utils=$pkgver" "liboxide=$pkgver" "libsentry=$_sentryver") - - package() { - install -D -m 755 -t "$pkgdir"/opt/bin "$srcdir"/release/opt/bin/corrupt - install -D -m 644 -t "$pkgdir"/opt/usr/share/applications "$srcdir"/release/opt/usr/share/applications/codes.eeems.corrupt.oxide - } -} - -anxiety() { - pkgdesc="Screenshot viewer for Oxide" - section="utils" - installdepends=(display "tarnish=$pkgver" "oxide-utils=$pkgver" "liboxide=$pkgver" "libsentry=$_sentryver") + installdepends=("oxide=$pkgver" "oxide-utils=$pkgver" "liboxide=$pkgver" "libsentry=$_sentryver") + replaces=(fret anxiety) + conflicts=(fret anxiety) package() { + # Screenshot daemon + install -D -m 755 -t "$pkgdir"/opt/bin "$srcdir"/release/opt/bin/fret + install -D -m 644 -t "$pkgdir"/opt/usr/share/applications "$srcdir"/release/opt/usr/share/applications/codes.eeems.fret.oxide + # Screenshot viewer install -D -m 755 -t "$pkgdir"/opt/bin "$srcdir"/release/opt/bin/anxiety install -D -m 644 -t "$pkgdir"/opt/usr/share/applications "$srcdir"/release/opt/usr/share/applications/codes.eeems.anxiety.oxide install -D -m 644 -t "$pkgdir"/opt/usr/share/icons/oxide/48x48/apps "$srcdir"/release/opt/usr/share/icons/oxide/48x48/apps/image.png @@ -142,11 +98,12 @@ anxiety() { oxide-utils() { pkgdesc="Command line tools for Oxide" section="admin" - installdepends=("tarnish=$pkgver" "liboxide=$pkgver" "libsentry=$_sentryver") - replaces=(notify-send) - conflicts=(notify-send) + installdepends=("oxide=$pkgver" "liboxide=$pkgver" "libsentry=$_sentryver") + replaces=(rot notify-send update-desktop-database desktop-file-validate) + conflicts=(rot notify-send update-desktop-database desktop-file-validate) package() { + install -D -m 755 -t "$pkgdir"/opt/bin "$srcdir"/release/opt/bin/rot install -D -m 755 -t "$pkgdir"/opt/bin "$srcdir"/release/opt/bin/notify-send install -D -m 755 -t "$pkgdir"/opt/bin "$srcdir"/release/opt/bin/update-desktop-database install -D -m 755 -t "$pkgdir"/opt/bin "$srcdir"/release/opt/bin/desktop-file-validate @@ -177,12 +134,25 @@ liboxide() { } } +liboxide-dev() { + pkgdesc="Shared library for oxide applications" + section="devel" + 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/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/ + } +} + libsentry() { pkgdesc="Sentry SDK for C, C++ and native applications." section="devel" url=https://github.com/getsentry/sentry-native pkgver="$_sentryver" - timestamp="2022-08-02T14:40:22Z" + timestamp="2021-12-20T14:25:11Z" package() { install -D -m 755 -t "$pkgdir"/opt/lib "$srcdir"/release/opt/lib/libsentry.so diff --git a/package/puzzles/package b/package/puzzles/package index 3af1b64d3..8ac7d3e84 100644 --- a/package/puzzles/package +++ b/package/puzzles/package @@ -5,7 +5,8 @@ pkgnames=(puzzles) timestamp=2021-03-04T14:03-08:00 maintainer="Mattéo Delabre " -pkgver=0.2.2-4 +_ver=0.2.4 +pkgver=${_ver}-4 license=MIT pkgdesc="Simon Tatham's Puzzle Package" url="https://github.com/mrichards42/remarkable_puzzles" @@ -13,13 +14,13 @@ section="games" makedepends=(build:git) flags=(patch_rm2fb) -image=python:v2.1 +image=python:v2.3.2 source=( "https://github.com/mrichards42/remarkable_puzzles/releases/download/v${pkgver%-*}/puzzles-source.tar.gz" puzzles.draft ) sha256sums=( - 3fe3686757e69d1267e830ba527d15ff6d1a68e34f830842dcaf35f58b43d501 + ae00474f6b1f7ced13bd6b1f18ff57b583fcd66c587a5180e87af997768345ff SKIP ) @@ -27,7 +28,7 @@ build() { pip3 install okp # do the build - ARCH=arm BUILD=release make puzzles -r + make puzzles ARCH=rm BUILD=release RMP_VERSION="${_ver}" } package() { diff --git a/package/rm2-suspend-fix/package b/package/rm2-suspend-fix/package index dc4a1d0cb..4a6eb0151 100644 --- a/package/rm2-suspend-fix/package +++ b/package/rm2-suspend-fix/package @@ -6,9 +6,9 @@ archs=(rm2) pkgnames=(rm2-suspend-fix) pkgdesc="Fix issue where suspend breaks networking on the reMarkable 2" url=https://toltec-dev.org/ -pkgver=0.0.0-2 +pkgver=0.0.0-3 timestamp=2021-01-04T22:40Z -section="devel" +section="utils" maintainer="Eeems " license=MIT diff --git a/package/rmfakecloud-proxy/package b/package/rmfakecloud-proxy/package index b9f247d55..6c497fb60 100644 --- a/package/rmfakecloud-proxy/package +++ b/package/rmfakecloud-proxy/package @@ -7,7 +7,7 @@ pkgdesc="Connect Xochitl to a rmfakecloud server" _url=https://github.com/ddvk/rmfakecloud-proxy url="$_url" _upver=0.0.3 -pkgver="$_upver-4" +pkgver="$_upver-5" timestamp=2022-02-26T22:59Z section="utils" maintainer="Mattéo Delabre " diff --git a/package/rmfakecloud-proxy/rmfakecloudctl b/package/rmfakecloud-proxy/rmfakecloudctl index deff1f18d..c530f3589 100644 --- a/package/rmfakecloud-proxy/rmfakecloudctl +++ b/package/rmfakecloud-proxy/rmfakecloudctl @@ -75,7 +75,7 @@ disconnect-cloud() { # Mark all files as not synced grep sync "$xochitl_data_dir"/*.metadata -l \ - | xargs sed -i 's/synced\": true/synced\": false/' + | xargs -r sed -i 's/synced\": true/synced\": false/' # Disconnect from cloud sed -i '/^devicetoken=/d' "$xochitl_conf_path" diff --git a/package/rmkit/changelog b/package/rmkit/changelog index a08e54c9c..09d14f032 100644 --- a/package/rmkit/changelog +++ b/package/rmkit/changelog @@ -1,3 +1,26 @@ +2024-01-11 raisjn + + harmony + + * fix for buffer crash / weird buffers when saved buffer is wrong dims + + remux + + * add launcher-ctrl APIs + + iago + + * add table shape (yogatbear) + + rmkit + + * refactor how scene stack works + * fixes for image code + + genie + + * add support for conf directory + 2023-03-12 raisjn harmony diff --git a/package/rmkit/package b/package/rmkit/package index f8930555b..2b3da328a 100644 --- a/package/rmkit/package +++ b/package/rmkit/package @@ -3,7 +3,7 @@ # SPDX-License-Identifier: MIT pkgnames=(bufshot dumbskull genie harmony iago lamp mines nao remux rpncalc simple wordlet) -timestamp=2023-03-12T20:03:10Z +timestamp=2024-01-11T20:03:10Z maintainer="raisjn " license=MIT installdepends=(display) @@ -11,12 +11,12 @@ flags=(patch_rm2fb) image=python:v2.1 source=( - https://github.com/rmkit-dev/rmkit/archive/2bf3488010eccf0d9e7f6c64e681517739420c58.zip + https://github.com/rmkit-dev/rmkit/archive/7edc291646c4a72b7b8a512205646a9ad6586fd6.zip remux.service genie.service ) sha256sums=( - a0d1a8b16adeca688d7df6a18e4c7404d9d4a405b33615dfb4e374f24ff3dded + 2861ea61ef272acd0d1d9ec4c80f44ef620be3f8ce58a356fbcbdb27e01dc9e8 SKIP SKIP ) @@ -52,7 +52,7 @@ dumbskull() { genie() { pkgdesc="Gesture engine that connects commands to gestures" url="https://rmkit.dev/apps/genie" - pkgver=0.1.6-3 + pkgver=0.1.7-1 section="utils" package() { @@ -78,7 +78,7 @@ genie() { harmony() { pkgdesc="Procedural sketching app" url="https://rmkit.dev/apps/harmony" - pkgver=0.2.2-2 + pkgver=0.2.3-1 section="drawing" package() { @@ -95,7 +95,7 @@ harmony() { iago() { pkgdesc="overlay for drawing shapes via stroke injection" url="https://rmkit.dev/apps/iago" - pkgver=0.1.1-2 + pkgver=0.1.2-1 section="utils" installdepends+=("lamp") @@ -145,7 +145,7 @@ nao() { remux() { pkgdesc="Launcher that supports multi-tasking applications" url="https://rmkit.dev/apps/remux" - pkgver=0.2.4-2 + pkgver=0.3.0-1 section="launchers" package() { @@ -189,7 +189,7 @@ rpncalc() { simple() { pkgdesc="Simple app script for writing scripted applications" url="https://rmkit.dev/apps/sas" - pkgver=0.2.0-2 + pkgver=0.2.1-1 section="devel" package() { diff --git a/package/tilem/package b/package/tilem/package index 0c5b954f3..17be922d7 100644 --- a/package/tilem/package +++ b/package/tilem/package @@ -5,23 +5,37 @@ pkgnames=(tilem) pkgdesc="TI-84+ calculator emulator" url=https://github.com/timower/rM2-stuff/tree/master/apps/tilem -pkgver=0.0.7-3 -timestamp=2021-04-30T10:42Z +_tag=0.1.1 +pkgver=${_tag}-1 +timestamp=2023-11-25T20:49:48Z maintainer="Mattéo Delabre " license=GPL-3.0 section="utils" -image=base:v2.1 +image=base:v3.1 installdepends=(display) -source=(https://github.com/timower/rM2-stuff/archive/refs/tags/v0.0.7.tar.gz) -sha256sums=(ed2db5f1aa7c9e8b0bead53bd60cb8fd9eec24c028d789fdbdc4b1655d6c78ce) +source=() +sha256sums=() + +prepare() { + cd "$srcdir" + mkdir -p tilem + cd tilem + git init + git lfs install + git remote add origin https://github.com/timower/rM2-stuff.git + git fetch --depth 1 origin tag v${_tag} --no-tags + git checkout v${_tag} + git lfs fetch + git lfs checkout +} build() { mkdir build mkdir install cd build cmake -DCMAKE_TOOLCHAIN_FILE="/usr/share/cmake/$CHOST.cmake" \ - -DCMAKE_INSTALL_PREFIX="../install" -DCMAKE_BUILD_TYPE=Release .. + -DCMAKE_INSTALL_PREFIX="../install" -DCMAKE_BUILD_TYPE=Release ../tilem cd apps/tilem make make install diff --git a/package/toltec-base/package b/package/toltec-base/package index b333afb84..06d812667 100644 --- a/package/toltec-base/package +++ b/package/toltec-base/package @@ -1,13 +1,13 @@ #!/usr/bin/env bash -# Copyright (c) 2021 The Toltec Contributors +# Copyright (c) 2023 The Toltec Contributors # SPDX-License-Identifier: MIT 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-3 -timestamp=2023-05-08T19:31Z +pkgver=1.3-1 +timestamp=2023-12-27T08:30Z section="utils" maintainer="Eeems " license=MIT @@ -31,12 +31,22 @@ configure() { /opt/etc/profile echo "Disabling automatic update" disable-unit update-engine.service - if [[ "$arch" == "rm1" ]] && ! is-masked sys-subsystem-net-devices-usb1.device; then + if [[ "$arch" == "rm1" ]]; then echo "Disabling usb1 network device to avoid long boots" - systemctl mask sys-subsystem-net-devices-usb1.device - elif [[ "$arch" == "rm2" ]] && is-masked sys-subsystem-net-devices-usb1.device; then + if ! is-masked sys-subsystem-net-devices-usb1.device; then + systemctl mask sys-subsystem-net-devices-usb1.device + fi + if ! is-masked busybox-ifplugd@usb1.service; then + systemctl mask busybox-ifplugd@usb1.service + fi + elif [[ "$arch" == "rm2" ]]; then echo "Enabling usb1 network device to ensure usb SSH works" - systemctl unmask sys-subsystem-net-devices-usb1.device + if is-masked sys-subsystem-net-devices-usb1.device; then + systemctl unmask sys-subsystem-net-devices-usb1.device + fi + if is-masked busybox-ifplugd@usb1.service; then + systemctl unmask busybox-ifplugd@usb1.service + fi fi } @@ -44,7 +54,10 @@ postremove() { if is-masked sys-subsystem-net-devices-usb1.device; then systemctl unmask sys-subsystem-net-devices-usb1.device fi - if ! is-enabled "update-engine.service"; then + if is-masked busybox-ifplugd@usb1.service; then + systemctl unmask busybox-ifplugd@usb1.service + fi + if ! is-enabled update-engine.service; then systemctl enable update-engine fi } diff --git a/package/yaft/input.patch b/package/yaft/input.patch deleted file mode 100644 index 02d0acde7..000000000 --- a/package/yaft/input.patch +++ /dev/null @@ -1,23 +0,0 @@ ---- Device.cpp 2022-08-03 20:07:16.705724406 0000 -+++ Device-rM1-inputfix.cpp 2022-08-03 20:07:36.455219878 0000 -@@ -22,17 +22,17 @@ - - const InputPaths rm1_paths = { - // touch -- "/dev/input/event1", -+ "/dev/input/event2", - Transform{ { { -float(screen_width) / rm1_touch_width, 0 }, - { 0, -float(screen_height) / rm1_touch_height } }, - { screen_width, screen_height } }, - - // pen -- "/dev/input/event0", -+ "/dev/input/event1", - wacom_transform, - - // keys -- "/dev/input/event2" -+ "/dev/input/event0" - }; - - const InputPaths rm2_paths = { diff --git a/package/yaft/package b/package/yaft/package index 8a94a0946..251dc0f77 100644 --- a/package/yaft/package +++ b/package/yaft/package @@ -5,37 +5,40 @@ pkgnames=(yaft) pkgdesc="Yet another framebuffer terminal" url=https://github.com/timower/rM2-stuff/tree/master/apps/yaft -_tag=0.0.10 -pkgver=${_tag}-2 -timestamp=2023-08-12T14:31Z +_tag=0.1.1 +pkgver=${_tag}-1 +timestamp=2023-11-25T20:49:48Z maintainer="Mattéo Delabre " license=GPL-3.0 section="admin" -image=base:v2.3 +image=base:v3.1 installdepends=(display terminfo) -source=( - "https://github.com/timower/rM2-stuff/archive/refs/tags/v${_tag}.zip" - input.patch -) +source=() +sha256sums=() -sha256sums=( - 1cd4741a93cde6bd545215eb303e51219fc9901cba1c28b6206b1b5e0871a7b5 - SKIP -) +prepare() { + cd "$srcdir" + mkdir -p yaft + cd yaft + git init + git lfs install + git remote add origin https://github.com/timower/rM2-stuff.git + git fetch --depth 1 origin tag v${_tag} --no-tags + git checkout v${_tag} + git lfs fetch + git lfs checkout +} build() { - patch -u libs/rMlib/Device.cpp -i input.patch mkdir build mkdir install cd build cmake -DCMAKE_TOOLCHAIN_FILE="/usr/share/cmake/$CHOST.cmake" \ - -DCMAKE_INSTALL_PREFIX="../install" -DCMAKE_BUILD_TYPE=Release .. + -DCMAKE_INSTALL_PREFIX="../install" -DCMAKE_BUILD_TYPE=Release ../yaft cd apps/yaft make make install - cd ../../libs/libYaft - make install } package() { diff --git a/package/zoneinfo-utils/package b/package/zoneinfo-utils/package index f31bd7eb8..8caab1ce8 100644 --- a/package/zoneinfo-utils/package +++ b/package/zoneinfo-utils/package @@ -7,23 +7,24 @@ pkgnames=(zoneinfo-utils) pkgdesc="Utilities for interacting with zoneinfo files" url=https://www.iana.org/time-zones -_tzver=2021a -pkgver="$_tzver"-2 -timestamp=2020-05-04T06:16Z +_tzver=2023c +pkgver="$_tzver"-1 +timestamp=2023-03-28T00:00Z section=utils maintainer="Eeems " license="custom: public domain" installdepends=(zoneinfo-core) makedepends=(build:gawk) +flags=(nostrip) -image=base:v2.1 +image=base:v3.0 source=( "https://www.iana.org/time-zones/repository/releases/tzcode${_tzver}.tar.gz" "https://www.iana.org/time-zones/repository/releases/tzdata${_tzver}.tar.gz" ) sha256sums=( - eb46bfa124b5b6bd13d61a609bfde8351bd192894708d33aa06e5c1e255802d0 - 39e7d2ba08c68cbaefc8de3227aab0dec2521be8042cf56855f7dc3a9fb14e08 + 46d17f2bb19ad73290f03a203006152e0fa0d7b11e5b71467c4a823811b214e7 + 3f510b5d1b4ae9bb38e485aa302a776b317fb3637bdb6404c4adf7b6cadd965c ) prepare() { @@ -35,17 +36,20 @@ build() { pushd .x86 > /dev/null shopt -s extglob - cp -r ../* . - make VERSION="$_tzver" + ln -s ../* . + make VERSION="$_tzver" zic + mv zic ../zic.x86 popd > /dev/null - + rm -r .x86 make VERSION="$_tzver" CC=arm-linux-gnueabihf-cc + "${CROSS_COMPILE}strip" --strip-all zic zdump } package() { pushd "${srcdir}" > /dev/null - local zic=.x86/zic + + local zic=./zic.x86 # install tzcode stuff make DESTDIR="${pkgdir}" zic="$zic" install # install license