From c97618d5392232d78bbd9ca2671f6dc38add3986 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Moritz=20B=C3=B6hme?= Date: Fri, 14 Feb 2025 16:16:02 +0000 Subject: [PATCH 01/12] Add package for rmstylusbutton (#939) Apply suggestions from code review Co-authored-by: Nathaniel van Diepen --- package/rmstylusbutton/package | 49 +++++++++++++++++++ package/rmstylusbutton/rmstylusbutton.service | 10 ++++ 2 files changed, 59 insertions(+) create mode 100644 package/rmstylusbutton/package create mode 100644 package/rmstylusbutton/rmstylusbutton.service diff --git a/package/rmstylusbutton/package b/package/rmstylusbutton/package new file mode 100644 index 000000000..24847793f --- /dev/null +++ b/package/rmstylusbutton/package @@ -0,0 +1,49 @@ +#!/usr/bin/env bash +# Copyright (c) 2025 The Toltec Contributors +# SPDX-License-Identifier: MIT + +archs=(rm2) +pkgnames=(rmstylusbutton) +_pkgver=3.0 +pkgver=$_pkgver-1 +pkgdesc="Use a stylus button with the reMarkable 2" +timestamp=2024-03-04T04:30:52Z +maintainer="Moritz " +license=GPL-3.0 +url=https://github.com/rschroll/RMStylusButton +section="utils" +installdepends=(xochitl) +conflicts=(remarkable-stylus) + +image=base:v3.2 +source=( + "$url/archive/refs/tags/v$_pkgver.tar.gz" + rmstylusbutton.service +) +sha256sums=( + 5f468b9f78b705ca67ea3288ae923b10fb70193c236b31507a4e6148ebb4e60e + SKIP +) + +build() { + export CC=arm-linux-gnueabihf-gcc + make +} + +package() { + install -D -m 755 -t "$pkgdir"/opt/bin "$srcdir"/RMStylusButton/RMStylusButton + install -D -m 644 -t "$pkgdir"/lib/systemd/system/ "$srcdir"/rmstylusbutton.service +} + +configure() { + systemctl daemon-reload + systemctl enable --now rmstylusbutton.service +} + +preremove() { + disable-unit rmstylusbutton.service +} + +postremove() { + systemctl daemon-reload +} diff --git a/package/rmstylusbutton/rmstylusbutton.service b/package/rmstylusbutton/rmstylusbutton.service new file mode 100644 index 000000000..70127ecb0 --- /dev/null +++ b/package/rmstylusbutton/rmstylusbutton.service @@ -0,0 +1,10 @@ +[Unit] +Description=Stylus Button Input +After=xochitl.service + +[Service] +ExecStart=/opt/bin/RMStylusButton +Restart=on-failure + +[Install] +WantedBy=multi-user.target From 4cbfdf1c6dc2d895333b6b17bf5c9dae383c3c63 Mon Sep 17 00:00:00 2001 From: rempack-b <157570976+rempack-b@users.noreply.github.com> Date: Tue, 11 Mar 2025 04:26:27 +0000 Subject: [PATCH 02/12] Add Rempack (#940) * Add rempack recipe * add draft and oxide, finalize build script * bump to 1.1.3 * format fix I guess? * change github url * Add source shasum, change arch to rmall * Fix URLs, license, bump version --------- Co-authored-by: Brant Martin --- package/rempack/package | 37 +++++++++++++++++++++++++++++++++++ package/rempack/rempack.draft | 4 ++++ package/rempack/rempack.oxide | 7 +++++++ 3 files changed, 48 insertions(+) create mode 100644 package/rempack/package create mode 100644 package/rempack/rempack.draft create mode 100644 package/rempack/rempack.oxide diff --git a/package/rempack/package b/package/rempack/package new file mode 100644 index 000000000..60cf3091c --- /dev/null +++ b/package/rempack/package @@ -0,0 +1,37 @@ +#!/usr/bin/env bash +# Copyright (c) 2020 The Toltec Contributors +# SPDX-License-Identifier: MIT + +pkgnames=(rempack) +pkgdesc="A user friendly package manager frontend for opkg" +archs=(rmall) +url="https://github.com/rexxar-tc/rempack" +pkgver=1.1.4 +timestamp=2025-03-09T21:13:27 +section=admin +maintainer="Brant Martin " +license=MIT +image=base:v3.1 +installdepends=(display) +source=( + https://github.com/rexxar-tc/rempack/archive/refs/tags/1.1.4.zip + rempack.draft + rempack.oxide +) +sha256sums=( + b8d8c1f75269f9091b39e1e20afbcdc6e4c1f12d811682f36b759aa4f9955696 + SKIP + SKIP +) +build() { + cd $srcdir + mkdir output + cmake -S . -B output --preset "Release Native" + cmake --build output --target rempack +} + +package() { + install -D -m 755 "$srcdir"/output/rempack "$pkgdir"/opt/bin/rempack + install -D -m 644 "$srcdir"/rempack.draft "$pkgdir"/opt/etc/draft/rempack.draft + install -D -m 644 "$srcdir"/rempack.oxide "$pkgdir"/opt/usr/share/applications/rempack.oxide +} diff --git a/package/rempack/rempack.draft b/package/rempack/rempack.draft new file mode 100644 index 000000000..6b765f9ad --- /dev/null +++ b/package/rempack/rempack.draft @@ -0,0 +1,4 @@ +name=rempack +desc=User firendly package manager +call=/opt/bin/rempack +term=killall rempack diff --git a/package/rempack/rempack.oxide b/package/rempack/rempack.oxide new file mode 100644 index 000000000..f68d82c27 --- /dev/null +++ b/package/rempack/rempack.oxide @@ -0,0 +1,7 @@ +{ + "displayName": "rempack", + "description": "A friendly package manager", + "bin": "/opt/bin/rempack", + "type": "foreground", + "permissions": ["permissions", "apps", "system"] +} From 96531e87a75b1c55572893050bee2e5e93c1beec Mon Sep 17 00:00:00 2001 From: Nathaniel van Diepen Date: Wed, 9 Apr 2025 09:01:43 -0600 Subject: [PATCH 03/12] Update KOReader to v2025.04 (#942) --- package/koreader/package | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/package/koreader/package b/package/koreader/package index a8766ee22..c1e56c61f 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=2024.11-1 -timestamp=2024-11-20T19:52:06Z +pkgver=2025.04-1 +timestamp=2025-04-09T14:07:12Z section="readers" maintainer="raisjn " license=AGPL-3.0-or-later @@ -22,7 +22,7 @@ source=( launcherctl-koreader ) sha256sums=( - 2b97146e38bdfeec483773e01738cd6109fadc06312b41a16328e33ad3eceae5 + 99cb6778af85172d5624e13805ff0a5642ab0ddf9ff2bb6b4056a336270757a7 SKIP SKIP SKIP From ccb43f3a1e2aba8e5f8d1c4efe3c5043f236d63e Mon Sep 17 00:00:00 2001 From: rempack-b <157570976+rempack-b@users.noreply.github.com> Date: Fri, 4 Jul 2025 18:07:21 -0400 Subject: [PATCH 04/12] remove OpenWrt from opkg docs (#944) * remove OpenWrt from opkg docs --------- Co-authored-by: Brant Martin Co-authored-by: Nathaniel van Diepen --- docs/opkg.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/docs/opkg.md b/docs/opkg.md index f15cd250d..8d1050006 100644 --- a/docs/opkg.md +++ b/docs/opkg.md @@ -1,11 +1,11 @@ ## Opkg and `.ipk` Files Toltec packages are meant to be used with [Opkg](https://git.yoctoproject.org/cgit/cgit.cgi/opkg), a lightweight package manager targeting embedded devices like the reMarkable. -Opkg is developed both by [OpenWrt](https://git.openwrt.org/project/opkg-lede.git) and by the [Yocto Project](https://git.yoctoproject.org/cgit/cgit.cgi/opkg/). +Opkg is developed by the [Yocto Project](https://git.yoctoproject.org/cgit/cgit.cgi/opkg/). The Toltec distribution is built on top of [Entware](https://github.com/Entware/Entware) which provides device-agnostic Opkg-compatible packages. > Opkg is a fork of [ipkg](https://en.wikipedia.org/wiki/Ipkg), the package manager used in NSLU2's [Optware](http://www.nslu2-linux.org/wiki/Optware/), which is designed to add software to stock firmware of embedded devices. -> — [OpenWrt's documentation](https://openwrt.org/docs/guide-user/additional-software/opkg) +> — [OpenWrt's documentation](https://openwrt.org/docs/guide-user/additional-software/opkg) (This may be outdated) ### What is the `.ipk` Format? From f7081be9c8fa1abe195be35c13c19a28bfde5442 Mon Sep 17 00:00:00 2001 From: Timothy Werquin Date: Sun, 27 Jul 2025 22:34:04 +0200 Subject: [PATCH 05/12] Update bootstrap wget to 1.21.1-2 (#947) * Update bootstrap wget to 1.21.1-2 --------- Co-authored-by: Nathaniel van Diepen --- package/toltec-bootstrap/package | 4 ++-- package/toltec-bootstrap/toltecctl | 4 ++-- scripts/bootstrap/bootstrap | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/package/toltec-bootstrap/package b/package/toltec-bootstrap/package index 90d201f50..8d89d3b98 100644 --- a/package/toltec-bootstrap/package +++ b/package/toltec-bootstrap/package @@ -5,8 +5,8 @@ pkgnames=(toltec-bootstrap) pkgdesc="Manage your Toltec install" url=https://toltec-dev.org/ -pkgver=0.4.5-1 -timestamp=2024-05-31T19:13Z +pkgver=0.4.5-2 +timestamp=2025-07-26T00:54Z section="utils" maintainer="Eeems " license=MIT diff --git a/package/toltec-bootstrap/toltecctl b/package/toltec-bootstrap/toltecctl index 5a26d3790..96bcb873e 100644 --- a/package/toltec-bootstrap/toltecctl +++ b/package/toltec-bootstrap/toltecctl @@ -746,8 +746,8 @@ install-standalone-opkg() { # installed on the reMarkable does not) in the PATH install-standalone-wget() { local wget_path="${toltec_share}/wget" - local wget_remote=http://toltec-dev.org/thirdparty/bin/wget-v1.21.1-1 - local wget_checksum=c258140f059d16d24503c62c1fdf747ca843fe4ba8fcd464a6e6bda8c3bbb6b5 + local wget_remote=http://toltec-dev.org/thirdparty/bin/wget-v1.21.1-2 + local wget_checksum=3130886a020a56b7471ed60f3742db26acdced4b27fed5be22f9892b77589bc5 if [ -f "$wget_path" ] && ! [[ -e $wget_path ]] || ! sha256sum -c <(echo "$wget_checksum $wget_path") > /dev/null 2>&1; then rm "$wget_path" diff --git a/scripts/bootstrap/bootstrap b/scripts/bootstrap/bootstrap index 71691c1d0..9586b887d 100755 --- a/scripts/bootstrap/bootstrap +++ b/scripts/bootstrap/bootstrap @@ -120,8 +120,8 @@ check-installed() { # Install a local wget binary which supports TLS (the original one # installed on the reMarkable does not) in the PATH wget-bootstrap() { - local wget_remote=http://toltec-dev.org/thirdparty/bin/wget-v1.21.1-1 - local wget_checksum=c258140f059d16d24503c62c1fdf747ca843fe4ba8fcd464a6e6bda8c3bbb6b5 + local wget_remote=http://toltec-dev.org/thirdparty/bin/wget-v1.21.1-2 + local wget_checksum=3130886a020a56b7471ed60f3742db26acdced4b27fed5be22f9892b77589bc5 if [[ ! -x $wget_path ]]; then if [[ -e $wget_path ]]; then From 85ab8b6ecdbcc0003cbfba1fa5b888dea663c618 Mon Sep 17 00:00:00 2001 From: Nathaniel van Diepen Date: Fri, 29 Aug 2025 11:58:02 -0600 Subject: [PATCH 06/12] Update to ubuntu-24.02 or ubuntu-latest, apply auto formatting with lsp (#941) --- .github/actions/discord-send/action.yml | 38 ++--- .github/actions/setup/action.yml | 170 ++++++++++----------- .github/actions/sync-repository/action.yml | 20 +-- .github/workflows/pr-labels.yml | 6 +- .github/workflows/pr.yml | 83 +++++----- .github/workflows/stable.yml | 90 +++++------ .github/workflows/testing.yml | 64 ++++---- 7 files changed, 235 insertions(+), 236 deletions(-) diff --git a/.github/actions/discord-send/action.yml b/.github/actions/discord-send/action.yml index db4a8e3a2..2a7197643 100644 --- a/.github/actions/discord-send/action.yml +++ b/.github/actions/discord-send/action.yml @@ -30,22 +30,22 @@ runs: MSG_COLOR: ${{ inputs.color }} MSG_VALUE: ${{ inputs.message }} run: | - payload="$(jq --null-input --compact-output --monochrome-output \ - --arg title "$MSG_TITLE" \ - --arg link "$MSG_LINK" \ - --arg color "$MSG_COLOR" \ - --arg message "$MSG_VALUE" \ - '{ - username: "Toltec", - avatar_url: "https://avatars0.githubusercontent.com/u/71158884", - embeds: [{ - title: $title, - url: $link, - color: $color, - description: $message, - }] - }')" - curl --silent --show-error --fail \ - --header "Content-Type: application/json" \ - --data "$payload" \ - 'https://discord.com/api/webhooks/${{ inputs.channel }}/${{ inputs.token }}' + payload="$(jq --null-input --compact-output --monochrome-output \ + --arg title "$MSG_TITLE" \ + --arg link "$MSG_LINK" \ + --arg color "$MSG_COLOR" \ + --arg message "$MSG_VALUE" \ + '{ + username: "Toltec", + avatar_url: "https://avatars0.githubusercontent.com/u/71158884", + embeds: [{ + title: $title, + url: $link, + color: $color, + description: $message, + }] + }')" + curl --silent --show-error --fail \ + --header "Content-Type: application/json" \ + --data "$payload" \ + 'https://discord.com/api/webhooks/${{ inputs.channel }}/${{ inputs.token }}' diff --git a/.github/actions/setup/action.yml b/.github/actions/setup/action.yml index 3e34d796a..e582b43e6 100644 --- a/.github/actions/setup/action.yml +++ b/.github/actions/setup/action.yml @@ -1,87 +1,87 @@ name: Setup Toltec dependencies runs: - using: "composite" - steps: - - name: Check for Apt updates - shell: bash - run: | - sudo apt-get update -yq - echo "aptVersion=libarchive-tools-$(apt-cache policy libarchive-tools | grep -oP '(?<=Candidate:\s)(.+)')" >> $GITHUB_ENV - - name: Cache Apt packages - uses: actions/cache@v4 - id: cache-apt - with: - path: ~/.aptcache - key: ${{ env.aptVersion }} - - name: Install or restore Apt packages - shell: bash - env: - CACHE_HIT: ${{ steps.cache-apt.outputs.cache-hit }} - run: | - if [[ "$CACHE_HIT" != 'true' ]]; then - sudo apt-get install -yq libarchive-tools - mkdir -p ~/.aptcache - sudo dpkg -L libarchive-tools | while IFS= read -r f; do if test -f $f; then echo $f; fi; done | xargs cp --parents --target-directory ~/.aptcache/ - else - sudo cp --verbose --force --recursive ~/.aptcache/* / - fi - - name: Cache shfmt - uses: actions/cache@v4 - with: - path: /usr/local/bin/shfmt - key: 43439b996942b53dfafa9b6ff084f394555d049c98fb7ec37978f7668b43e1be - - name: Install shfmt - shell: bash - run: | - install_dir=/usr/local/bin - if ! [[ -f "$install_dir"/shfmt ]]; then - shfmt_version=v3.2.1 - shfmt_checksum=43439b996942b53dfafa9b6ff084f394555d049c98fb7ec37978f7668b43e1be - sudo curl --location --silent --fail --tlsv1.2 --proto '=https' \ - --output "$install_dir"/shfmt \ - https://github.com/mvdan/sh/releases/download/"$shfmt_version"/shfmt_"$shfmt_version"_linux_amd64 - sha256sum -c <(echo "$shfmt_checksum $install_dir/shfmt") > /dev/null 2>&1 - sudo chmod a+x "$install_dir"/shfmt - fi - - name: Cache Shellcheck - uses: actions/cache@v4 - with: - path: /usr/local/bin/shellcheck - key: 64f17152d96d7ec261ad3086ed42d18232fcb65148b44571b564d688269d36c8 - - name: Install Shellcheck - shell: bash - run: | - install_dir=/usr/local/bin - if ! [[ -f "$install_dir"/shellcheck ]];then - shellcheck_version=v0.7.1 - shellcheck_checksum=64f17152d96d7ec261ad3086ed42d18232fcb65148b44571b564d688269d36c8 - shellcheck_arname=shellcheck.tar.xz - curl --location --silent --fail --tlsv1.2 --proto '=https' \ - --output "$shellcheck_arname" \ - https://github.com/koalaman/shellcheck/releases/download/"$shellcheck_version"/shellcheck-"$shellcheck_version".linux.x86_64.tar.xz - sha256sum -c <(echo "$shellcheck_checksum $shellcheck_arname") > /dev/null 2>&1 - tar -xf "$shellcheck_arname" --strip-components=1 \ - shellcheck-"$shellcheck_version"/shellcheck - rm "$shellcheck_arname" - chmod a+x shellcheck - sudo chown root:root shellcheck - sudo mv shellcheck "$install_dir" - fi - - name: Setup Python - uses: actions/setup-python@v5 - with: - python-version: '3.12' - - name: Cache Python environment - uses: actions/cache@v4 - id: cache-python - with: - 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 - make .venv/bin/activate - fi + using: "composite" + steps: + - name: Check for Apt updates + shell: bash + run: | + sudo apt-get update -yq + echo "aptVersion=libarchive-tools-$(apt-cache policy libarchive-tools | grep -oP '(?<=Candidate:\s)(.+)')" >> $GITHUB_ENV + - name: Cache Apt packages + uses: actions/cache@v4 + id: cache-apt + with: + path: ~/.aptcache + key: ${{ env.aptVersion }} + - name: Install or restore Apt packages + shell: bash + env: + CACHE_HIT: ${{ steps.cache-apt.outputs.cache-hit }} + run: | + if [[ "$CACHE_HIT" != 'true' ]]; then + sudo apt-get install -yq libarchive-tools + mkdir -p ~/.aptcache + sudo dpkg -L libarchive-tools | while IFS= read -r f; do if test -f $f; then echo $f; fi; done | xargs cp --parents --target-directory ~/.aptcache/ + else + sudo cp --verbose --force --recursive ~/.aptcache/* / + fi + - name: Cache shfmt + uses: actions/cache@v4 + with: + path: /usr/local/bin/shfmt + key: 43439b996942b53dfafa9b6ff084f394555d049c98fb7ec37978f7668b43e1be + - name: Install shfmt + shell: bash + run: | + install_dir=/usr/local/bin + if ! [[ -f "$install_dir"/shfmt ]]; then + shfmt_version=v3.2.1 + shfmt_checksum=43439b996942b53dfafa9b6ff084f394555d049c98fb7ec37978f7668b43e1be + sudo curl --location --silent --fail --tlsv1.2 --proto '=https' \ + --output "$install_dir"/shfmt \ + https://github.com/mvdan/sh/releases/download/"$shfmt_version"/shfmt_"$shfmt_version"_linux_amd64 + sha256sum -c <(echo "$shfmt_checksum $install_dir/shfmt") > /dev/null 2>&1 + sudo chmod a+x "$install_dir"/shfmt + fi + - name: Cache Shellcheck + uses: actions/cache@v4 + with: + path: /usr/local/bin/shellcheck + key: 64f17152d96d7ec261ad3086ed42d18232fcb65148b44571b564d688269d36c8 + - name: Install Shellcheck + shell: bash + run: | + install_dir=/usr/local/bin + if ! [[ -f "$install_dir"/shellcheck ]];then + shellcheck_version=v0.7.1 + shellcheck_checksum=64f17152d96d7ec261ad3086ed42d18232fcb65148b44571b564d688269d36c8 + shellcheck_arname=shellcheck.tar.xz + curl --location --silent --fail --tlsv1.2 --proto '=https' \ + --output "$shellcheck_arname" \ + https://github.com/koalaman/shellcheck/releases/download/"$shellcheck_version"/shellcheck-"$shellcheck_version".linux.x86_64.tar.xz + sha256sum -c <(echo "$shellcheck_checksum $shellcheck_arname") > /dev/null 2>&1 + tar -xf "$shellcheck_arname" --strip-components=1 \ + shellcheck-"$shellcheck_version"/shellcheck + rm "$shellcheck_arname" + chmod a+x shellcheck + sudo chown root:root shellcheck + sudo mv shellcheck "$install_dir" + fi + - name: Setup Python + uses: actions/setup-python@v5 + with: + python-version: "3.12" + - name: Cache Python environment + uses: actions/cache@v4 + id: cache-python + with: + 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 + make .venv/bin/activate + fi diff --git a/.github/actions/sync-repository/action.yml b/.github/actions/sync-repository/action.yml index 01b7aa50a..0f3f7f3f7 100644 --- a/.github/actions/sync-repository/action.yml +++ b/.github/actions/sync-repository/action.yml @@ -23,13 +23,13 @@ runs: - name: rsync packages and index shell: bash run: | - mkdir -p private - chmod 700 private - echo '${{ inputs.ssh-key }}' > private/id_rsa - echo '${{ inputs.ssh-known-hosts }}' > private/known_hosts - chmod 600 private/* - rsync --archive --verbose --compress --delete --hard-links \ - -e "ssh -p ${{ inputs.ssh-port }} -i private/id_rsa -o UserKnownHostsFile=private/known_hosts" \ - '${{ inputs.local-path }}' \ - '${{ inputs.remote-path }}' - rm -r private + mkdir -p private + chmod 700 private + echo '${{ inputs.ssh-key }}' > private/id_rsa + echo '${{ inputs.ssh-known-hosts }}' > private/known_hosts + chmod 600 private/* + rsync --archive --verbose --compress --delete --hard-links \ + -e "ssh -p ${{ inputs.ssh-port }} -i private/id_rsa -o UserKnownHostsFile=private/known_hosts" \ + '${{ inputs.local-path }}' \ + '${{ inputs.remote-path }}' + rm -r private diff --git a/.github/workflows/pr-labels.yml b/.github/workflows/pr-labels.yml index 166d3e256..a38b5098d 100644 --- a/.github/workflows/pr-labels.yml +++ b/.github/workflows/pr-labels.yml @@ -5,9 +5,9 @@ on: jobs: check-labels: name: Check that PRs against the stable branch are labelled correctly - runs-on: ubuntu-22.04 + runs-on: ubuntu-latest steps: - name: Check labels run: | - [[ '${{ github.base_ref }}' != stable ]] \ - || [[ '${{ contains(github.event.pull_request.labels.*.name, 'merge') }}' == true ]] + [[ '${{ github.base_ref }}' != stable ]] \ + || [[ '${{ contains(github.event.pull_request.labels.*.name, 'merge') }}' == true ]] diff --git a/.github/workflows/pr.yml b/.github/workflows/pr.yml index c6b30ff9b..c8b71ee37 100644 --- a/.github/workflows/pr.yml +++ b/.github/workflows/pr.yml @@ -1,44 +1,43 @@ name: pr -on: - pull_request +on: pull_request jobs: - lint: - name: Check that it conforms to the style guide - runs-on: ubuntu-22.04 - steps: - - name: Checkout the Git repository - uses: actions/checkout@v4 - - name: Setup Toltec dependencies - uses: ./.github/actions/setup - - name: Check formatting - run: make format - - name: Check for erroneous constructs - run: make lint - pr: - name: Check that it builds without error - runs-on: ubuntu-22.04 - needs: lint - steps: - - name: Checkout the Git repository - uses: actions/checkout@v4 - - name: Setup Toltec dependencies - uses: ./.github/actions/setup - - name: Build packages - run: FLAGS='--remote-repo https://toltec-dev.org/${{ github.base_ref }}' make repo-new - - name: Save the build output - uses: actions/upload-artifact@v4 - with: - name: repo - path: build/repo - - name: Build packages for experimental - if: ${{ contains(github.event.pull_request.labels.*.name, 'experimental') }} - run: make repo FLAGS='--remote-repo https://toltec-dev.org/${{ github.base_ref }}' - - name: Sync packages with the remote repository - if: ${{ contains(github.event.pull_request.labels.*.name, 'experimental') }} - uses: ./.github/actions/sync-repository - with: - local-path: build/repo/ - ssh-key: ${{ secrets.SSH_PRIVATE_KEY }} - ssh-known-hosts: ${{ secrets.SSH_KNOWN_HOSTS }} - ssh-port: ${{ secrets.SSH_PORT }} - remote-path: ${{ secrets.REMOTE_SSH }}:/srv/toltec/experimental + lint: + name: Check that it conforms to the style guide + runs-on: ubuntu-24.04 + steps: + - name: Checkout the Git repository + uses: actions/checkout@v4 + - name: Setup Toltec dependencies + uses: ./.github/actions/setup + - name: Check formatting + run: make format + - name: Check for erroneous constructs + run: make lint + pr: + name: Check that it builds without error + runs-on: ubuntu-24.04 + needs: lint + steps: + - name: Checkout the Git repository + uses: actions/checkout@v4 + - name: Setup Toltec dependencies + uses: ./.github/actions/setup + - name: Build packages + run: FLAGS='--remote-repo https://toltec-dev.org/${{ github.base_ref }}' make repo-new + - name: Save the build output + uses: actions/upload-artifact@v4 + with: + name: repo + path: build/repo + - name: Build packages for experimental + if: ${{ contains(github.event.pull_request.labels.*.name, 'experimental') }} + run: make repo FLAGS='--remote-repo https://toltec-dev.org/${{ github.base_ref }}' + - name: Sync packages with the remote repository + if: ${{ contains(github.event.pull_request.labels.*.name, 'experimental') }} + uses: ./.github/actions/sync-repository + with: + local-path: build/repo/ + ssh-key: ${{ secrets.SSH_PRIVATE_KEY }} + ssh-known-hosts: ${{ secrets.SSH_KNOWN_HOSTS }} + ssh-port: ${{ secrets.SSH_PORT }} + remote-path: ${{ secrets.REMOTE_SSH }}:/srv/toltec/experimental diff --git a/.github/workflows/stable.yml b/.github/workflows/stable.yml index 2ad14c7bf..cae93c130 100644 --- a/.github/workflows/stable.yml +++ b/.github/workflows/stable.yml @@ -1,48 +1,48 @@ name: stable on: - push: - branches: - - stable + push: + branches: + - stable jobs: - stable: - name: Build and publish the stable channel - runs-on: ubuntu-22.04 - steps: - - name: Checkout the Git repository - uses: actions/checkout@v4 - - name: Setup Toltec dependencies - uses: ./.github/actions/setup - - name: Build packages - run: | - make repo FLAGS='--remote-repo ${{ secrets.REMOTE_HTTP }}/stable' - - name: Sync packages with the remote repository - uses: ./.github/actions/sync-repository - with: - local-path: build/repo/ - ssh-key: ${{ secrets.SSH_PRIVATE_KEY }} - ssh-known-hosts: ${{ secrets.SSH_KNOWN_HOSTS }} - ssh-port: ${{ secrets.SSH_PORT }} - remote-path: ${{ secrets.REMOTE_SSH }}:/srv/toltec/stable - - name: Trigger website rebuild - run: gh api repos/toltec-dev/web/dispatches -f event_type='update-bootstrap-from-stable' - env: - GITHUB_TOKEN: ${{ secrets.RELEASE_TOKEN }} - - name: Create Github Release - continue-on-error: true - run: | - sudo apt-get update && sudo apt-get install -y hub - hub release create -t $SHA -m $MESSAGE $(date +%G-W%V-%u) - env: - SHA: ${{ github.sha }} - GITHUB_TOKEN: ${{ secrets.RELEASE_TOKEN }} - MESSAGE: ${{ github.event.commits[0].message }} - - name: Send notification to Discord - continue-on-error: true - uses: ./.github/actions/discord-send - with: - channel: ${{ secrets.DISCORD_STABLE_CHANNEL_ID }} - token: ${{ secrets.DISCORD_STABLE_CHANNEL_TOKEN }} - title: New Toltec stable update available - link: https://toltec-dev.org/stable - color: 0x2ea043 - message: ${{ github.event.commits[0].message }} + stable: + name: Build and publish the stable channel + runs-on: ubuntu-24.04 + steps: + - name: Checkout the Git repository + uses: actions/checkout@v4 + - name: Setup Toltec dependencies + uses: ./.github/actions/setup + - name: Build packages + run: | + make repo FLAGS='--remote-repo ${{ secrets.REMOTE_HTTP }}/stable' + - name: Sync packages with the remote repository + uses: ./.github/actions/sync-repository + with: + local-path: build/repo/ + ssh-key: ${{ secrets.SSH_PRIVATE_KEY }} + ssh-known-hosts: ${{ secrets.SSH_KNOWN_HOSTS }} + ssh-port: ${{ secrets.SSH_PORT }} + remote-path: ${{ secrets.REMOTE_SSH }}:/srv/toltec/stable + - name: Trigger website rebuild + run: gh api repos/toltec-dev/web/dispatches -f event_type='update-bootstrap-from-stable' + env: + GITHUB_TOKEN: ${{ secrets.RELEASE_TOKEN }} + - name: Create Github Release + continue-on-error: true + run: | + sudo apt-get update && sudo apt-get install -y hub + hub release create -t $SHA -m $MESSAGE $(date +%G-W%V-%u) + env: + SHA: ${{ github.sha }} + GITHUB_TOKEN: ${{ secrets.RELEASE_TOKEN }} + MESSAGE: ${{ github.event.commits[0].message }} + - name: Send notification to Discord + continue-on-error: true + uses: ./.github/actions/discord-send + with: + channel: ${{ secrets.DISCORD_STABLE_CHANNEL_ID }} + token: ${{ secrets.DISCORD_STABLE_CHANNEL_TOKEN }} + title: New Toltec stable update available + link: https://toltec-dev.org/stable + color: 0x2ea043 + message: ${{ github.event.commits[0].message }} diff --git a/.github/workflows/testing.yml b/.github/workflows/testing.yml index 24446c870..57d0d9a8d 100644 --- a/.github/workflows/testing.yml +++ b/.github/workflows/testing.yml @@ -1,35 +1,35 @@ name: testing on: - push: - branches: - - testing + push: + branches: + - testing jobs: - testing: - name: Build and publish the testing channel - runs-on: ubuntu-22.04 - steps: - - name: Checkout the Git repository - uses: actions/checkout@v4 - - name: Setup Toltec dependencies - uses: ./.github/actions/setup - - name: Build packages - run: | - make repo FLAGS='--remote-repo ${{ secrets.REMOTE_HTTP }}/testing' - - name: Sync packages with the remote repository - uses: ./.github/actions/sync-repository - with: - local-path: build/repo/ - ssh-key: ${{ secrets.SSH_PRIVATE_KEY }} - ssh-known-hosts: ${{ secrets.SSH_KNOWN_HOSTS }} - ssh-port: ${{ secrets.SSH_PORT }} - remote-path: ${{ secrets.REMOTE_SSH }}:/srv/toltec/testing - - name: Send notification to Discord - continue-on-error: true - uses: ./.github/actions/discord-send - with: - channel: ${{ secrets.DISCORD_TESTING_CHANNEL_ID }} - token: ${{ secrets.DISCORD_TESTING_CHANNEL_TOKEN }} - title: New Toltec testing update available - link: https://toltec-dev.org/testing - color: 0xe3b341 - message: ${{ github.event.commits[0].message }} + testing: + name: Build and publish the testing channel + runs-on: ubuntu-24.04 + steps: + - name: Checkout the Git repository + uses: actions/checkout@v4 + - name: Setup Toltec dependencies + uses: ./.github/actions/setup + - name: Build packages + run: | + make repo FLAGS='--remote-repo ${{ secrets.REMOTE_HTTP }}/testing' + - name: Sync packages with the remote repository + uses: ./.github/actions/sync-repository + with: + local-path: build/repo/ + ssh-key: ${{ secrets.SSH_PRIVATE_KEY }} + ssh-known-hosts: ${{ secrets.SSH_KNOWN_HOSTS }} + ssh-port: ${{ secrets.SSH_PORT }} + remote-path: ${{ secrets.REMOTE_SSH }}:/srv/toltec/testing + - name: Send notification to Discord + continue-on-error: true + uses: ./.github/actions/discord-send + with: + channel: ${{ secrets.DISCORD_TESTING_CHANNEL_ID }} + token: ${{ secrets.DISCORD_TESTING_CHANNEL_TOKEN }} + title: New Toltec testing update available + link: https://toltec-dev.org/testing + color: 0xe3b341 + message: ${{ github.event.commits[0].message }} From c2605868c7efb2e831a017a87fa5328da309cde7 Mon Sep 17 00:00:00 2001 From: Nathaniel van Diepen Date: Fri, 29 Aug 2025 12:29:01 -0600 Subject: [PATCH 07/12] Update KOReader to v2025.08 (#948) --- package/koreader/package | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/package/koreader/package b/package/koreader/package index c1e56c61f..e4c5ed9f9 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=2025.04-1 -timestamp=2025-04-09T14:07:12Z +pkgver=2025.08-1 +timestamp=2025-08-16T20:20:24Z section="readers" maintainer="raisjn " license=AGPL-3.0-or-later @@ -22,7 +22,7 @@ source=( launcherctl-koreader ) sha256sums=( - 99cb6778af85172d5624e13805ff0a5642ab0ddf9ff2bb6b4056a336270757a7 + 7971436e0e950d1fd3b6e1ef6da702d03f5fa640b363bc5df7013777a97badbf SKIP SKIP SKIP From 29b58c35ee2bc9a5db2af7721b274c80d017be5c Mon Sep 17 00:00:00 2001 From: Tom Parker-Shemilt Date: Sun, 26 Oct 2025 23:35:23 +0000 Subject: [PATCH 08/12] Add fuseki and gnugo (#949) * Use python 3.11 for building * Add fuseki package * Add gnugo package --------- Co-authored-by: Nathaniel van Diepen --- docs/building.md | 2 +- package/fuseki/fuseki-runner | 3 +++ package/fuseki/fuseki-runner.draft | 5 +++++ package/fuseki/package | 36 ++++++++++++++++++++++++++++++ package/gnugo/package | 34 ++++++++++++++++++++++++++++ 5 files changed, 79 insertions(+), 1 deletion(-) create mode 100644 package/fuseki/fuseki-runner create mode 100644 package/fuseki/fuseki-runner.draft create mode 100644 package/fuseki/package create mode 100644 package/gnugo/package diff --git a/docs/building.md b/docs/building.md index b6cb816b4..5448702c0 100644 --- a/docs/building.md +++ b/docs/building.md @@ -18,7 +18,7 @@ Before running the build, make sure you have all the required dependencies: * Docker * bsdtar -* Python 3.10 +* Python 3.11 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)). diff --git a/package/fuseki/fuseki-runner b/package/fuseki/fuseki-runner new file mode 100644 index 000000000..1046ebba2 --- /dev/null +++ b/package/fuseki/fuseki-runner @@ -0,0 +1,3 @@ +#!/bin/bash +export GNUGO_BINARY=/opt/bin/gnugo +/opt/bin/fuseki diff --git a/package/fuseki/fuseki-runner.draft b/package/fuseki/fuseki-runner.draft new file mode 100644 index 000000000..98e0cc91d --- /dev/null +++ b/package/fuseki/fuseki-runner.draft @@ -0,0 +1,5 @@ +name=fuseki +desc=Play go +call=/opt/bin/fuseki-runner +term=killall fuseki +imgFile=fuseki diff --git a/package/fuseki/package b/package/fuseki/package new file mode 100644 index 000000000..13e00517d --- /dev/null +++ b/package/fuseki/package @@ -0,0 +1,36 @@ +#!/usr/bin/env bash +# Copyright (c) 2025 The Toltec Contributors +# SPDX-License-Identifier: MIT + +pkgnames=(fuseki) +pkgdesc="Go frontend using GnuGo" +url="https://github.com/palfrey/fuseki" +pkgver=0.1.0-1 +timestamp=2025-08-25T16:56+0100 +section=games +maintainer="Tom Parker-Shemilt " +license=AGPL-3.0-or-later +image=rust:v3.3 +source=( + https://github.com/palfrey/fuseki/archive/refs/tags/${pkgver%-*}.zip + fuseki-runner.draft + fuseki-runner +) +sha256sums=( + df80c15531ac5bcd18e1af684443454ba29dddacc157c24e0db0eb88e37176d0 + SKIP + SKIP +) + +installdepends=("gnugo") + +build() { + cargo build --release +} + +package() { + install -D -m 755 "$srcdir"/target/armv7-unknown-linux-gnueabihf/release/fuseki "$pkgdir"/opt/bin/fuseki + install -D -m 644 "$srcdir"/fuseki-runner.draft "$pkgdir"/opt/etc/draft/fuseki.draft + install -D -m 755 -t "$pkgdir"/opt/bin "$srcdir"/fuseki-runner + install -D -m 644 "$srcdir"/fuseki.png "$pkgdir"/opt/etc/draft/icons/fuseki.png +} diff --git a/package/gnugo/package b/package/gnugo/package new file mode 100644 index 000000000..7c5f335f6 --- /dev/null +++ b/package/gnugo/package @@ -0,0 +1,34 @@ +#!/usr/bin/env bash +# Copyright (c) 2025 The Toltec Contributors +# SPDX-License-Identifier: MIT + +pkgnames=(gnugo) +pkgdesc="Program that plays the game of Go" +url="https://www.gnu.org/software/gnugo/" +pkgver=3.8.0-1 +timestamp=2025-08-25T16:56+0100 +section=games +maintainer="Tom Parker-Shemilt " +license=GPL-3.0-only +image=base:v3.1 +source=( + https://github.com/palfrey/gnugo/archive/51f99b7a00b7acf295475b56c349c857a9aa2d0e.zip +) +sha256sums=( + 2624c57641c7cb28699df693c6da65f6d192f9867554fcfcf830b17db851a702 +) + +makedepends=("build:autoconf" "build:automake") + +build() { + aclocal + autoheader + automake --add-missing --copy + autoreconf + CFLAGS="-O2 -flto=auto" LDFLAGS="-O2 -flto=auto" ./configure --host arm-remarkable-linux-gnueabihf --build x86_64-linux-gnu --without-curses --without-docs + make +} + +package() { + install -D -m 755 "$srcdir"/interface/gnugo "$pkgdir"/opt/bin/gnugo +} From afb1712443694b127e5ee129f919c426bac85220 Mon Sep 17 00:00:00 2001 From: Alistair Francis Date: Mon, 27 Oct 2025 10:08:01 +1000 Subject: [PATCH 09/12] linux-mainline: Update base image and fix build failures (#904) * linux-mainline: Update base image and fix build failures * linux-mainline: Enable INPUT_UINPUT --------- Signed-off-by: Alistair Francis Co-authored-by: Nathaniel van Diepen --- package/linux-mainline/package | 8 ++++---- package/linux-mainline/remarkable_defconfig | 1 + 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/package/linux-mainline/package b/package/linux-mainline/package index 1db253d36..5939125aa 100644 --- a/package/linux-mainline/package +++ b/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.3.0-2 +pkgver=6.3.0-3 timestamp=2023-08-23T21:50:09Z section=kernel maintainer="Alistair Francis " @@ -22,13 +22,13 @@ source=( ) sha256sums=( 647f6a60adad8c4e37eeaf9114c037888cb33923e364bbf5dc0830b2661c21b7 - f4d8cbb2c0e7bff5b151729b45064eb9e95005cb91899f0a9df038343d95ebf2 + c54921f2a8ad02bfec231adf64a1a6eec9306a6ce596ff0c717bc5131b5521a6 ) build() { cp remarkable_defconfig arch/arm/configs/ ARCH=arm make remarkable_defconfig - ARCH=arm make -j8 + ARCH=arm PKG_CONFIG_PATH=/usr/lib/x86_64-linux-gnu/pkgconfig/ PKG_CONFIG_SYSROOT_DIR="" make -j8 } package() { @@ -40,7 +40,7 @@ package() { cp --no-dereference "$srcdir"/arch/arm/boot/dts/imx7d-remarkable2.dtb \ "$staging"/boot/zero-sugar.dtb - ARCH=arm make -C "$srcdir" modules_install INSTALL_MOD_PATH="$staging" + ARCH=arm PKG_CONFIG_PATH=/usr/lib/x86_64-linux-gnu/pkgconfig/ PKG_CONFIG_SYSROOT_DIR="" make -C "$srcdir" modules_install INSTALL_MOD_PATH="$staging" rm "$staging"/lib/modules/*/{source,build} # Create the kernel archive diff --git a/package/linux-mainline/remarkable_defconfig b/package/linux-mainline/remarkable_defconfig index 00af8d735..bfaa505e8 100644 --- a/package/linux-mainline/remarkable_defconfig +++ b/package/linux-mainline/remarkable_defconfig @@ -485,3 +485,4 @@ CONFIG_DEBUG_FS=y # CONFIG_SLUB_DEBUG is not set # CONFIG_SCHED_DEBUG is not set # CONFIG_FTRACE is not set +CONFIG_INPUT_UINPUT=y From c1e212754d74ccae135272ae9354b723acda5792 Mon Sep 17 00:00:00 2001 From: Tom Parker-Shemilt Date: Sun, 26 Oct 2025 22:02:14 -0400 Subject: [PATCH 10/12] V3 mass upgrade (#951) * Mass upgrade to v3 images * Upgrade examples as well * Fix some known wrong versions * Fix rmkit build * 3.1 -> 3.2 * Upgrade all the relevant pkgver's * Fix openssl build for netsurf * toltecmk 0.3.5 * Downgrade plato as it's broken * Log what we're building * Upgrade folly clang versions * Upgrade chessmarkable for rustc-serialize fix * Upgrade doomarkable for rustc-serialize fix * Downgrade retris * Reset folly due to build issues * Remove break-system-packages Not needed for 3.2 * Upgrade chessmarkable, retris, folly and plato * toltecmk 0.3.7 for add-bind-mount fix * Fix netsurf timestamp * Reset folly version --------- Co-authored-by: Nathaniel van Diepen --- docs/package-guide.md | 2 +- package/bash-completion/package | 4 ++-- package/calculator/package | 4 ++-- package/chessmarkable/package | 12 +++++------- package/display/package | 4 ++-- package/doomarkable/package | 8 ++++---- package/draft/package | 4 ++-- package/evtest/package | 4 ++-- package/fbink/package | 4 ++-- package/fingerterm/package | 4 ++-- package/folly/package | 6 +++--- package/fuse/package | 4 ++-- package/gocryptfs/package | 4 ++-- package/keywriter/package | 4 ++-- package/libdlib/package | 4 ++-- package/libvncserver/package | 4 ++-- package/mmc-utils/package | 4 ++-- package/netevent/package | 4 ++-- package/netsurf/package | 16 +++++++++++----- package/netsurf/ssl-links.patch | 23 +++++++++++++++++++++++ package/plato/package | 16 ++++++++-------- package/puzzles/package | 4 ++-- package/recrossable/package | 4 ++-- package/remarkable-splash/package | 4 ++-- package/remarkable-stylus/package | 4 ++-- package/restream/package | 4 ++-- package/retris/package | 10 ++++------ package/rmfakecloud-proxy/package | 4 ++-- package/rmkit/package | 26 +++++++++++++------------- package/rmservewacominput/package | 4 ++-- package/templatectl/package | 4 ++-- package/vnsee/package | 4 ++-- package/wikipedia/package | 4 ++-- package/zshelf/package | 4 ++-- requirements.txt | 2 +- scripts/package-lib | 2 +- scripts/repo_build.py | 3 +++ 37 files changed, 127 insertions(+), 99 deletions(-) create mode 100644 package/netsurf/ssl-links.patch diff --git a/docs/package-guide.md b/docs/package-guide.md index d8c96e1b6..11e45e2d7 100644 --- a/docs/package-guide.md +++ b/docs/package-guide.md @@ -67,7 +67,7 @@ license= ## Which Docker image to use for building the package # See for available images # The images are debian based and allow you to install additional packages with apt. -# Examples (version may be out of date): base:v1.1, qt:v1.1, python:v1.1, rust:v1.1 +# Examples (version may be out of date): base:v3.2, qt:v3.2, python:v3.2, rust:v3.2 image= ## Whitespace-separated list of source archives that are needed to build the package # Archives will be automatically extracted, stripping any useless containing diff --git a/package/bash-completion/package b/package/bash-completion/package index 403f30456..7320bc9be 100644 --- a/package/bash-completion/package +++ b/package/bash-completion/package @@ -5,7 +5,7 @@ pkgnames=(bash-completion) pkgdesc="Programmable completion functions for bash" url=https://github.com/scop/bash-completion -pkgver=2.11-3 +pkgver=2.11-4 timestamp=2020-07-25T00:00Z section="utils" maintainer="Linus K. " @@ -14,7 +14,7 @@ license=GPL-2.0-only # Based on the ArchLinux PKGBUILD file: # https://github.com/archlinux/svntogit-packages/blob/packages/bash-completion/trunk/PKGBUILD -image=base:v2.1 +image=base:v3.2 source=(https://github.com/scop/bash-completion/releases/download/2.11/bash-completion-2.11.tar.xz) sha256sums=(73a8894bad94dee83ab468fa09f628daffd567e8bef1a24277f1e9a0daf911ac) diff --git a/package/calculator/package b/package/calculator/package index 092ef00d6..d4344ca52 100644 --- a/package/calculator/package +++ b/package/calculator/package @@ -5,7 +5,7 @@ pkgnames=(calculator) pkgdesc="Touch-based calculator" url=https://github.com/reHackable/Calculator -pkgver=0.0.0-16 +pkgver=0.0.0-17 timestamp=2020-08-20T12:28Z section="math" maintainer="Mattéo Delabre " @@ -14,7 +14,7 @@ installdepends=(display) makedepends=(build:imagemagick build:librsvg2-bin) flags=(patch_rm2fb) -image=qt:v2.1 +image=qt:v3.2 source=( https://github.com/reHackable/Calculator/archive/7b8be5de12f1536bc04b6216abbf26f998097bf4.zip calculator.draft diff --git a/package/chessmarkable/package b/package/chessmarkable/package index 6258ab355..40f68a952 100644 --- a/package/chessmarkable/package +++ b/package/chessmarkable/package @@ -5,21 +5,19 @@ pkgnames=(chessmarkable) pkgdesc="Chess game" url=https://github.com/LinusCDE/chessmarkable -pkgver=0.8.0-2 -timestamp=2021-07-22T12:04Z +pkgver=0.8.1-1 +timestamp=2025-09-11T12:04Z section="games" maintainer="Linus K. " license=MIT installdepends=(display) flags=(patch_rm2fb) -image=rust:v2.1 -source=(https://github.com/LinusCDE/chessmarkable/archive/0.8.0-1.zip) -sha256sums=(17675d30bb45050c1db5bc81d3d76b99a1b18e497c9a331177b853a5f9aa12af) +image=rust:v3.3 +source=(https://github.com/LinusCDE/chessmarkable/archive/refs/tags/0.8.1-1.zip) +sha256sums=(9d136e7e96f287b7d5afa96176e934a6922bbced7cf3bdd3b767aa9181874b17) build() { - # Fall back to system-wide config - rm .cargo/config cargo build --release --bin chessmarkable } diff --git a/package/display/package b/package/display/package index 633b4e9f5..d8f144a98 100644 --- a/package/display/package +++ b/package/display/package @@ -8,13 +8,13 @@ timestamp=2023-08-27T02:39:10Z maintainer="raisjn " license=MIT url="https://github.com/ddvk/remarkable2-framebuffer" -pkgver=1:0.0.33-3 +pkgver=1:0.0.33-4 _release="${pkgver%-*}" _release="v${_release#*:}" _libver=1.0.1 section="devel" -image=qt:v2.3 +image=qt:v3.2 source=( "https://github.com/ddvk/remarkable2-framebuffer/archive/$_release.zip" rm2fb.service diff --git a/package/doomarkable/package b/package/doomarkable/package index 3e5ae8735..a5c9a3a70 100644 --- a/package/doomarkable/package +++ b/package/doomarkable/package @@ -5,7 +5,7 @@ pkgnames=(doomarkable) pkgdesc="DOOM game" url=https://github.com/LinusCDE/doomarkable -pkgver=0.4.1-2 +pkgver=0.4.1-3 timestamp=2021-10-31T16:15Z section="games" maintainer="Linus K. " @@ -13,9 +13,9 @@ license=MIT installdepends=(display) flags=(patch_rm2fb) -image=rust:v2.2 -source=(https://github.com/LinusCDE/doomarkable/archive/0.4.1.tar.gz) -sha256sums=(d1cc2a37e769039e6e7a2f3090f77657693591a2c28ac55e51f89607d06e8b02) +image=rust:v3.2 +source=(https://github.com/LinusCDE/doomarkable/archive/7d10769d625fbe733768e39cf5006cde341d2fef.zip) +sha256sums=(df86cc87d2dde7993f47f809faaab8568abe4dd2987e5ab4e00e337caef03706) build() { # Fall back to system-wide config diff --git a/package/draft/package b/package/draft/package index 81610e407..030f682ab 100644 --- a/package/draft/package +++ b/package/draft/package @@ -5,7 +5,7 @@ pkgnames=(draft) pkgdesc="Launcher which wraps around the standard interface" url=https://github.com/dixonary/draft-reMarkable -pkgver=0.2.0-25 +pkgver=0.2.0-26 timestamp=2020-07-20T10:23Z section="launchers" maintainer="Mattéo Delabre " @@ -13,7 +13,7 @@ license=Apache-2.0 installdepends=(xochitl display procps-ng-ps) flags=(patch_rm2fb) -image=qt:v2.1 +image=qt:v3.2 source=( https://github.com/dixonary/draft-reMarkable/archive/5bd660a2fd07eba166c6110d2b48cfc58ee67e58.zip draft.service diff --git a/package/evtest/package b/package/evtest/package index dd037a607..6d458bb69 100644 --- a/package/evtest/package +++ b/package/evtest/package @@ -5,14 +5,14 @@ pkgnames=(evtest) pkgdesc="Kernel evdev device information and monitor" url=https://gitlab.freedesktop.org/libevdev/evtest -pkgver=1.34-3 +pkgver=1.34-4 timestamp=2020-12-30T02:52Z section="utils" maintainer="Linus K. " license=GPL-2.0-only makedepends=(build:automake) -image=base:v2.1 +image=base:v3.2 source=("https://gitlab.freedesktop.org/libevdev/evtest/-/archive/evtest-${pkgver%-*}/evtest-evtest-${pkgver%-*}.zip") sha256sums=(62f7e34c5bab91b5015de5b056d79051c677c5bd5702facb2885f8e4ba0df84c) diff --git a/package/fbink/package b/package/fbink/package index 504bca3f3..30ce47133 100644 --- a/package/fbink/package +++ b/package/fbink/package @@ -4,14 +4,14 @@ pkgnames=(fbink fbdepth fbink-doom) url=https://github.com/NiLuJe/FBInk -pkgver=1.25.0-1 +pkgver=1.25.0-2 timestamp=2022-12-05T02:50:38Z maintainer="Mattéo Delabre " license=GPL-3.0 installdepends=(display) flags=(patch_rm2fb) -image=base:v2.1 +image=base:v3.2 prepare() { git clone --depth=1 --recurse-submodules --branch v${pkgver%-*} https://github.com/NiLuJe/FBInk.git "$srcdir"/FBInk diff --git a/package/fingerterm/package b/package/fingerterm/package index 80a8ea8e7..312956b0f 100644 --- a/package/fingerterm/package +++ b/package/fingerterm/package @@ -5,7 +5,7 @@ pkgnames=(fingerterm) pkgdesc="Terminal emulator with an on-screen touch keyboard" url=https://github.com/dixonary/fingerterm-reMarkable -pkgver=1.3.5-15 +pkgver=1.3.5-16 timestamp=2020-10-27T12:02Z section="admin" maintainer="Mattéo Delabre " @@ -13,7 +13,7 @@ license=GPL-2.0-or-later installdepends=(display) flags=(patch_rm2fb) -image=qt:v2.1 +image=qt:v3.2 source=( https://github.com/dixonary/fingerterm-reMarkable/archive/02c17b5b485743c698e005ca89366c32b66aa044.zip fingerterm.png diff --git a/package/folly/package b/package/folly/package index 80a788d08..fad24c3a2 100644 --- a/package/folly/package +++ b/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-4 +pkgver=0.0.1-5 timestamp=2022-04-18T17:50:16Z section=games maintainer="Ben Kirwin " license=MIT installdepends=(display) -makedepends=(build:libclang-14-dev build:clang-14 build:llvm-14-dev) +makedepends=(build:libclang-13-dev build:clang-13 build:llvm-13-dev) -image=rust:v2.3 +image=rust:v3.3 # Whitespace-separated list of source archives that are needed to build the package source=( diff --git a/package/fuse/package b/package/fuse/package index bb3c88a41..a2b3204e4 100755 --- a/package/fuse/package +++ b/package/fuse/package @@ -6,7 +6,7 @@ archs=(rm1os2 rm2os2) pkgnames=(fuse) pkgdesc="FUSE (Filesystem in Userspace) Kernel Module" url=https://github.com/libfuse/libfuse -pkgver=1.0.0-5 +pkgver=1.0.0-6 timestamp=2021-04-06T22:16Z section=kernel maintainer="plan5 <30434574+plan5@users.noreply.github.com>" @@ -14,7 +14,7 @@ license=GPL-2.0-only makedepends=(build:bc build:lzop build:git) flags=(nostrip) -image=base:v2.1 +image=base:v3.2 source=(fix-multiple-yylloc-definitions.patch) sha256sums=(SKIP) diff --git a/package/gocryptfs/package b/package/gocryptfs/package index c6b4dd8e9..a7c52e843 100644 --- a/package/gocryptfs/package +++ b/package/gocryptfs/package @@ -7,14 +7,14 @@ pkgnames=(gocryptfs) pkgdesc="An encrypted overlay filesystem written in Go." url="https://nuetzlich.net/gocryptfs/" _srcver=2.0-beta2 -pkgver="$_srcver"-3 +pkgver="$_srcver"-4 timestamp=2021-03-22 section=utils maintainer="plan5 <30434574+plan5@users.noreply.github.com>" license=MIT installdepends=(fuse fuse-utils) -image=golang:v2.1 +image=golang:v3.2 source=(https://github.com/rfjakob/gocryptfs/archive/v"$_srcver".zip) sha256sums=(3d66368cfc79a300de5a22fe01788d0c702f9107731db63fcd8850157d105cc0) diff --git a/package/keywriter/package b/package/keywriter/package index 32ab6d891..28d3c9ede 100644 --- a/package/keywriter/package +++ b/package/keywriter/package @@ -5,7 +5,7 @@ pkgnames=(keywriter) pkgdesc="Markdown-enabled free writing app" url=https://github.com/dps/remarkable-keywriter -pkgver=0.2~20-gddc9e73-2 +pkgver=0.2~20-gddc9e73-3 timestamp=2022-02-09T07:05:03Z section="writing" maintainer="Mattéo Delabre " @@ -13,7 +13,7 @@ license=MIT installdepends=(display) flags=(patch_rm2fb) -image=qt:v2.3 +image=qt:v3.2 _sundown=37728fb2d7137ff7c37d0a474cb827a8d6d846d8 source=( https://github.com/dps/remarkable-keywriter/archive/ddc9e7321e0a57a014f19b891dc8104e67d2e447.zip diff --git a/package/libdlib/package b/package/libdlib/package index 76ee546ae..532e4a1bf 100644 --- a/package/libdlib/package +++ b/package/libdlib/package @@ -5,13 +5,13 @@ pkgnames=(libdlib libdlib-dev) pkgdesc="Toolkit for making machine learning and data analysis applications in C++" url=http://dlib.net -pkgver=19.21-2 +pkgver=19.21-3 timestamp=2020-08-08T19:41:07Z section="devel" maintainer="Mattéo Delabre " license=BSL-1.0 -image=base:v2.1 +image=base:v3.2 source=("https://github.com/davisking/dlib/archive/v${pkgver%-*}.tar.gz") sha256sums=(116f52e58be04b47dab52057eaad4b5c4d5c3032d927fe23d55b0741fc4107a0) diff --git a/package/libvncserver/package b/package/libvncserver/package index 2692e2874..ce0efd572 100644 --- a/package/libvncserver/package +++ b/package/libvncserver/package @@ -5,13 +5,13 @@ pkgnames=(libvncserver libvncclient libvncserver-dev) pkgdesc="C libraries for implementing VNC servers or clients" url=https://libvnc.github.io -pkgver=0.9.13-2 +pkgver=0.9.13-3 timestamp=2020-06-13T19:19:11Z section="devel" maintainer="Mattéo Delabre " license=GPL-2.0-or-later -image=base:v2.1 +image=base:v3.2 source=("https://github.com/LibVNC/libvncserver/archive/LibVNCServer-${pkgver%-*}.zip") sha256sums=(d209d70998a9b98f9120eeb82df7a17767796c477eaa8297e0a55856a977c54f) diff --git a/package/mmc-utils/package b/package/mmc-utils/package index 948dffa99..8c57dc85f 100644 --- a/package/mmc-utils/package +++ b/package/mmc-utils/package @@ -6,13 +6,13 @@ archs=(rmall) pkgnames=(mmc-utils) pkgdesc="A tool for monitoring the eMMC protocol" url=https://git.kernel.org/pub/scm/utils/mmc/mmc-utils.git/ -pkgver=1.0-1 +pkgver=1.0-2 timestamp=2021-08-12T19:41:07Z section="devel" maintainer="Alistair Francis " license=GPL-2.0-only -image=base:v2.2 +image=base:v3.2 source=( 0001-Makefile-Remove-Werror.patch ) diff --git a/package/netevent/package b/package/netevent/package index e1efee9ab..14937a260 100644 --- a/package/netevent/package +++ b/package/netevent/package @@ -5,13 +5,13 @@ pkgnames=(netevent) pkgdesc="Input-Event device cloning utility" url="https://github.com/Blub/netevent" -pkgver=2.2.2-1 +pkgver=2.2.2-2 timestamp=2023-04-29T14:21:02Z section=utils maintainer="Salvatore Stella " license=GPL-2.0-only -image=base:v2.2 +image=base:v3.2 source=( "https://github.com/Blub/netevent/archive/refs/tags/${pkgver%-*}.tar.gz" ) diff --git a/package/netsurf/package b/package/netsurf/package index 74d427851..f6d5b411b 100644 --- a/package/netsurf/package +++ b/package/netsurf/package @@ -5,8 +5,8 @@ pkgnames=(netsurf) pkgdesc="Lightweight web browser" url=https://github.com/alex0809/netsurf-reMarkable -pkgver=0.4.0-3 -timestamp=2021-05-31T11:15+00:00 +pkgver=0.4.0-4 +timestamp=2024-09-04T21:14+00:00 maintainer="Alex Friesenhahn " archs=(rmall) license=GPL-2.0-or-later @@ -32,18 +32,24 @@ installdepends=( dejavu-fonts-ttf-DejaVuSansMono dejavu-fonts-ttf-DejaVuSansMono-Bold ) -image=base:v2.1 +image=base:v3.2 flags=(patch_rm2fb) source=( - https://github.com/alex0809/netsurf-reMarkable/archive/refs/tags/v0.4.tar.gz + https://github.com/alex0809/netsurf-reMarkable/archive/11ba4e18c65c687693c03d58da329e90662282e8.zip netsurf.draft + ssl-links.patch ) sha256sums=( - a688ffc634fbbab463f92153b048e643fa6a5a1f92c492ff2005079a73a8de90 + 18813be8d3492bdfc6d498ee62e32c691a329b64388970c04ca4ce8b3e656241 + SKIP SKIP ) +prepare() { + patch -d "$srcdir" -p1 < "$srcdir"/ssl-links.patch +} + build() { ln -s /usr/bin/which /bin scripts/install_dependencies.sh diff --git a/package/netsurf/ssl-links.patch b/package/netsurf/ssl-links.patch new file mode 100644 index 000000000..b2d6dc819 --- /dev/null +++ b/package/netsurf/ssl-links.patch @@ -0,0 +1,23 @@ +# From https://github.com/alex0809/netsurf-reMarkable/pull/39 +From 97d45f3e8fd7320ef3ffbd94c7e796d4e076acfe Mon Sep 17 00:00:00 2001 +From: Leonid Belyaev +Date: Mon, 17 Feb 2025 19:21:51 -0500 +Subject: [PATCH] curl follows links for openssl + +--- + scripts/install_dependencies.sh | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/scripts/install_dependencies.sh b/scripts/install_dependencies.sh +index be1adc699..ae771b639 100755 +--- a/scripts/install_dependencies.sh ++++ b/scripts/install_dependencies.sh +@@ -22,7 +22,7 @@ export DEBIAN_FRONTEND=noninteractive \ + export DEBIAN_FRONTEND=noninteractive \ + && mkdir openssl \ + && cd openssl \ +- && curl https://www.openssl.org/source/openssl-1.1.1k.tar.gz -o openssl.tar.gz \ ++ && curl -L https://www.openssl.org/source/openssl-1.1.1k.tar.gz -o openssl.tar.gz \ + && echo "892a0875b9872acd04a9fde79b1f943075d5ea162415de3047c327df33fbaee5 openssl.tar.gz" > sha256sums \ + && sha256sum -c sha256sums \ + && tar --strip-components=1 -xf openssl.tar.gz \ diff --git a/package/plato/package b/package/plato/package index c58215fcd..a71462528 100644 --- a/package/plato/package +++ b/package/plato/package @@ -5,26 +5,26 @@ pkgnames=(plato) pkgdesc="Document reader" url=https://github.com/LinusCDE/plato -pkgver=0.9.34-2 -timestamp=2023-03-08T17:58Z +pkgver=0.9.44-1 +timestamp=2025-09-16T17:58Z section="readers" maintainer="Linus K. " license=AGPL-3.0-or-later installdepends=(display jq) -makedepends=(build:jq build:unzip build:wget build:patchelf) +makedepends=(build:jq build:unzip build:wget build:patchelf build:git) flags=(patch_rm2fb) -image=rust:v2.3.1 -source=("https://github.com/LinusCDE/plato/archive/${pkgver%-*}-rm-release-13.zip") -sha256sums=(82ef5786704ecdb4fe11ce16e7e4ae10b518a592965c292977bb33962c891d48) +image=rust:v3.3 +source=("https://github.com/LinusCDE/plato/archive/refs/tags/${pkgver%-*}-rm-release-14.zip") +sha256sums=(8fdb9edea98e7cff06bc2144fa314f13a5c521b95565d907ee098e98f70fe62a) build() { # 'cargo pkgid' seems to output something different with most # recent nightly builds. This adjusts the filtering. sed -i "s/version=.*$/version=\'$(cargo pkgid -p plato | cut -d "#" -f 2 | cut -d ":" -f 2)\'/g" download.sh - # Temporary fix until next release (TODO: Remove for next released version as included with commit fbfaf3d7) - sed -i "s/--target=arm-unknown-linux-gnueabihf/--target=armv7-unknown-linux-gnueabihf/g" build.sh + # We want cargo, not cross + sed -i "s/cross build/cargo build/g" build.sh # Use our toolchain export AR=arm-linux-gnueabihf-ar diff --git a/package/puzzles/package b/package/puzzles/package index 8ac7d3e84..11e95cde3 100644 --- a/package/puzzles/package +++ b/package/puzzles/package @@ -6,7 +6,7 @@ pkgnames=(puzzles) timestamp=2021-03-04T14:03-08:00 maintainer="Mattéo Delabre " _ver=0.2.4 -pkgver=${_ver}-4 +pkgver=${_ver}-5 license=MIT pkgdesc="Simon Tatham's Puzzle Package" url="https://github.com/mrichards42/remarkable_puzzles" @@ -14,7 +14,7 @@ section="games" makedepends=(build:git) flags=(patch_rm2fb) -image=python:v2.3.2 +image=python:v3.2 source=( "https://github.com/mrichards42/remarkable_puzzles/releases/download/v${pkgver%-*}/puzzles-source.tar.gz" puzzles.draft diff --git a/package/recrossable/package b/package/recrossable/package index 476b87bef..b584d783d 100644 --- a/package/recrossable/package +++ b/package/recrossable/package @@ -5,7 +5,7 @@ pkgnames=(recrossable) pkgdesc="Solve crossword puzzles" url=https://github.com/sandsmark/recrossable -pkgver=0.0.0-8 +pkgver=0.0.0-9 timestamp=2021-01-15T12:58:22Z section="games" maintainer="Mattéo Delabre " @@ -14,7 +14,7 @@ installdepends=(libdlib display) makedepends=(build:imagemagick build:librsvg2-bin host:libdlib host:libdlib-dev) flags=(patch_rm2fb) -image=qt:v2.1 +image=qt:v3.2 source=( https://github.com/sandsmark/recrossable/archive/234d5744c0b20087a588d0ecead0a9f58c1f323d.zip recrossable.draft diff --git a/package/remarkable-splash/package b/package/remarkable-splash/package index a951fc90b..553788394 100644 --- a/package/remarkable-splash/package +++ b/package/remarkable-splash/package @@ -5,7 +5,7 @@ pkgnames=(remarkable-splash) pkgdesc="Show splashscreens + remarkable-shutdown replacement that does not clear the screen" url=https://github.com/ddvk/remarkable-splash -pkgver=1.0-5 +pkgver=1.0-6 timestamp=2019-12-31T10:07Z section="utils" maintainer="Eeems " @@ -13,7 +13,7 @@ license=MIT installdepends=(display) flags=(patch_rm2fb) -image=qt:v2.1 +image=qt:v3.2 source=(https://github.com/ddvk/remarkable-splash/archive/e6e0b1e1f3604ab99fb7b476cd290b19c5644025.zip) sha256sums=(4aa3988707f9b66752ec9ec2f407cce2ac6e433ae7f06affea9f26957d206b4a) diff --git a/package/remarkable-stylus/package b/package/remarkable-stylus/package index d54f87f97..64b045e73 100644 --- a/package/remarkable-stylus/package +++ b/package/remarkable-stylus/package @@ -4,7 +4,7 @@ archs=(rmallos2) pkgnames=(remarkable-stylus) -pkgver=0.0.3-3 +pkgver=0.0.3-4 pkgdesc="Generate a key press upon pressing the button of a Lamy AL-star EMR pen" timestamp=2020-11-19T20:07:29Z maintainer="Eeems " @@ -13,7 +13,7 @@ url=https://github.com/ddvk/remarkable-stylus section="utils" installdepends=(xochitl ddvk-hacks) -image=qt:v2.1 +image=qt:v3.2 source=( "https://github.com/ddvk/remarkable-stylus/archive/refs/tags/0.0.3.tar.gz" remarkable-stylus.env diff --git a/package/restream/package b/package/restream/package index 3c1bf017c..93f3e5569 100644 --- a/package/restream/package +++ b/package/restream/package @@ -5,13 +5,13 @@ pkgnames=(restream) pkgdesc="Binary framebuffer capture tool for the reStream script" url=https://github.com/rien/reStream -pkgver=1.2.0-1 +pkgver=1.2.0-2 timestamp=2021-11-04T19:09:14Z section="screensharing" maintainer="Dan Shick " license=MIT -image=rust:v2.1 +image=rust:v3.2 source=("https://github.com/rien/reStream/archive/refs/tags/${pkgver%-*}.tar.gz") sha256sums=(4166142b15e1e7363dac302aa92aad5b44e0514cab233abecb51414952c1d5a1) diff --git a/package/retris/package b/package/retris/package index db8a00839..1e05ecb05 100644 --- a/package/retris/package +++ b/package/retris/package @@ -5,7 +5,7 @@ pkgnames=(retris) pkgdesc="Tetris game" url=https://github.com/LinusCDE/retris -pkgver=0.6.3-4 +pkgver=0.6.4-1 timestamp=2021-01-30T02:41Z section="games" maintainer="Linus K. " @@ -13,13 +13,11 @@ license=MIT installdepends=(display) flags=(patch_rm2fb) -image=rust:v2.1 -source=(https://github.com/LinusCDE/retris/archive/0.6.3-1.zip) -sha256sums=(ecc7215098c03e79cd92b1835626e6739a5a932d5aa709899d183347e2a4108e) +image=rust:v3.3 +source=(https://github.com/LinusCDE/retris/archive/0.6.4-1.zip) +sha256sums=(934fa07c962f5b35d4e0c4d40631aa954c72a9d147b40a6bb49c5d3dc0a3684e) build() { - # Fall back to system-wide config - rm .cargo/config cargo build --release } diff --git a/package/rmfakecloud-proxy/package b/package/rmfakecloud-proxy/package index 6c497fb60..99322188e 100644 --- a/package/rmfakecloud-proxy/package +++ b/package/rmfakecloud-proxy/package @@ -7,14 +7,14 @@ pkgdesc="Connect Xochitl to a rmfakecloud server" _url=https://github.com/ddvk/rmfakecloud-proxy url="$_url" _upver=0.0.3 -pkgver="$_upver-5" +pkgver="$_upver-6" timestamp=2022-02-26T22:59Z section="utils" maintainer="Mattéo Delabre " license=MIT installdepends=(procps-ng-pgrep findutils) -image=golang:v2.2 +image=golang:v3.2 source=( "https://github.com/ddvk/rmfakecloud-proxy/archive/v$_upver.zip" rmfakecloudctl diff --git a/package/rmkit/package b/package/rmkit/package index f1839892f..abcd970a4 100644 --- a/package/rmkit/package +++ b/package/rmkit/package @@ -9,7 +9,7 @@ license=MIT installdepends=(display) flags=() -image=python:v2.1 +image=python:v3.2 source=( https://github.com/rmkit-dev/rmkit/archive/7edc291646c4a72b7b8a512205646a9ad6586fd6.zip remux.service @@ -31,7 +31,7 @@ build() { bufshot() { pkgdesc="program for saving the framebuffer as a png" url="https://github.com/rmkit-dev/rmkit/tree/master/src/bufshot" - pkgver=0.1.2-3 + pkgver=0.1.2-4 section="utils" package() { @@ -42,7 +42,7 @@ bufshot() { dumbskull() { pkgdesc="Dungeon Crawl themed Solitaire" url="https://rmkit.dev/apps/dumbskull" - pkgver=0.0.1-4 + pkgver=0.0.1-5 section="games" package() { @@ -54,7 +54,7 @@ dumbskull() { genie() { pkgdesc="Gesture engine that connects commands to gestures" url="https://rmkit.dev/apps/genie" - pkgver=0.1.7-2 + pkgver=0.1.7-3 section="utils" package() { @@ -80,7 +80,7 @@ genie() { harmony() { pkgdesc="Procedural sketching app" url="https://rmkit.dev/apps/harmony" - pkgver=0.2.3-2 + pkgver=0.2.3-3 section="drawing" package() { @@ -97,7 +97,7 @@ harmony() { iago() { pkgdesc="overlay for drawing shapes via stroke injection" url="https://rmkit.dev/apps/iago" - pkgver=0.1.2-2 + pkgver=0.1.2-3 section="utils" installdepends+=("lamp") @@ -109,7 +109,7 @@ iago() { lamp() { pkgdesc="config based stroke injection utility" url="https://rmkit.dev/apps/lamp" - pkgver=0.1.1-3 + pkgver=0.1.1-4 section="utils" package() { @@ -120,7 +120,7 @@ lamp() { mines() { pkgdesc="Mine detection game" url="https://rmkit.dev/apps/minesweeper" - pkgver=0.1.4-4 + pkgver=0.1.4-5 section="games" package() { @@ -133,7 +133,7 @@ mines() { nao() { pkgdesc="Nao Package Manager: opkg UI built with SAS" url="https://rmkit.dev/apps/nao" - pkgver=0.1.2-4 + pkgver=0.1.2-5 section="admin" installdepends+=(simple) @@ -147,7 +147,7 @@ nao() { remux() { pkgdesc="Launcher that supports multi-tasking applications" url="https://rmkit.dev/apps/remux" - pkgver=0.3.0-6 + pkgver=0.3.0-7 section="launchers" installdepends=(procps-ng-ps) @@ -184,7 +184,7 @@ remux() { rpncalc() { pkgdesc="RPN Calculator" url="https://rmkit.dev/apps/rpncalc" - pkgver=0.0.3-4 + pkgver=0.0.3-5 section="math" package() { @@ -197,7 +197,7 @@ rpncalc() { simple() { pkgdesc="Simple app script for writing scripted applications" url="https://rmkit.dev/apps/sas" - pkgver=0.2.1-2 + pkgver=0.2.1-3 section="devel" package() { @@ -208,7 +208,7 @@ simple() { wordlet() { pkgdesc="Wordle clone" url="https://rmkit.dev/apps/wordlet" - pkgver=0.0.2-4 + pkgver=0.0.2-5 section="games" package() { diff --git a/package/rmservewacominput/package b/package/rmservewacominput/package index 2c558e13f..c740ccf66 100644 --- a/package/rmservewacominput/package +++ b/package/rmservewacominput/package @@ -5,14 +5,14 @@ pkgnames=(rmservewacominput) pkgdesc="Serve pen input on port 33333" url=https://github.com/LinusCDE/rmWacomToMouse -pkgver=0.3.0-2 +pkgver=0.3.0-3 timestamp=2021-03-10T18:36Z section="utils" maintainer="Linus K. " license=MIT installdepends=(appmarkable) -image=base:v2.1 +image=base:v3.2 source=( https://github.com/LinusCDE/rmWacomToMouse/archive/fd1c5454b65f456f6e890b99109e50a8f576dad1.zip rmservewacominput.draft diff --git a/package/templatectl/package b/package/templatectl/package index b09b7fc7b..4c57e1029 100644 --- a/package/templatectl/package +++ b/package/templatectl/package @@ -5,13 +5,13 @@ pkgnames=(templatectl) pkgdesc="Tool to add/remove templates for xochitl" url=https://github.com/PeterGrace/templatectl -pkgver=0.1.3-5 +pkgver=0.1.3-6 timestamp=2021-01-15T01:23Z section="templates" maintainer="Peter Grace " license=MIT -image=rust:v2.1 +image=rust:v3.2 source=("https://github.com/PeterGrace/templatectl/archive/v${pkgver%-*}.zip") sha256sums=(1ac1049c7db4f87c113dbc96372f8f4e2b8bd4c60252e3c4f7c1fafb5ee61ae4) diff --git a/package/vnsee/package b/package/vnsee/package index 057220d0c..3030054f1 100644 --- a/package/vnsee/package +++ b/package/vnsee/package @@ -5,7 +5,7 @@ pkgnames=(vnsee) pkgdesc="VNC client allowing you to use the device as a second screen" url=https://github.com/matteodelabre/vnsee -pkgver=0.4.1-2 +pkgver=0.4.1-3 timestamp=2021-08-29T13:45:26Z section="screensharing" maintainer="Mattéo Delabre " @@ -13,7 +13,7 @@ license=GPL-3.0-only installdepends=(display libvncclient nmap simple) makedepends=(host:libvncclient host:libvncserver-dev) -image=base:v2.1 +image=base:v3.2 _boost_pp_ver=5e17804af2496e13ca0cc03d892b5351b637ea43 source=( "https://github.com/matteodelabre/vnsee/archive/v${pkgver%-*}.zip" diff --git a/package/wikipedia/package b/package/wikipedia/package index a03eb4d22..b11686a6b 100644 --- a/package/wikipedia/package +++ b/package/wikipedia/package @@ -5,7 +5,7 @@ pkgnames=(wikipedia) pkgdesc="The free encyclopedia" url=https://github.com/dps/remarkable-wikipedia -pkgver=0.1.0-4 +pkgver=0.1.0-5 timestamp=2021-03-11T04:50Z section="readers" maintainer="David Singleton " @@ -13,7 +13,7 @@ license=MIT installdepends=(display) flags=(patch_rm2fb) -image=qt:v2.1 +image=qt:v3.2 source=( https://github.com/dps/remarkable-wikipedia/archive/eb00876ef49e7deedc127bc6c1486e3ed13aedcc.zip wikipedia.draft diff --git a/package/zshelf/package b/package/zshelf/package index 0562ac3e3..473626868 100644 --- a/package/zshelf/package +++ b/package/zshelf/package @@ -5,7 +5,7 @@ pkgnames=(zshelf) pkgdesc="Z-Library browser and downloader" url=https://github.com/khanhas/zshelf -pkgver=0.3.1-4 +pkgver=0.3.1-5 section=utils timestamp=2021-02-20T01:45Z maintainer="khanhas " @@ -14,7 +14,7 @@ installdepends=(node display) makedepends=(build:imagemagick build:librsvg2-bin) flags=(patch_rm2fb) -image=qt:v2.1 +image=qt:v3.2 source=( https://github.com/khanhas/zshelf/archive/v0.3.1.zip zshelf.draft diff --git a/requirements.txt b/requirements.txt index 7aadcde47..c0321f1b8 100644 --- a/requirements.txt +++ b/requirements.txt @@ -8,7 +8,7 @@ mypy-extensions==1.0.0 mypy==1.7.1 pylint==3.0.3 six==1.16.0 -toltecmk==0.3.3 +toltecmk==0.3.7 toml==0.10.2 types-python-dateutil==2.8.19.14 types-requests==2.31.0.2 diff --git a/scripts/package-lib b/scripts/package-lib index c3ec34a13..0688fb13e 100644 --- a/scripts/package-lib +++ b/scripts/package-lib @@ -401,7 +401,7 @@ package-id() { # # Arguments: # -# $1 - Name and version of the image (e.g. qt:v1.0) +# $1 - Name and version of the image (e.g. qt:v3.2) image-name() { echo "ghcr.io/toltec-dev/$1" } diff --git a/scripts/repo_build.py b/scripts/repo_build.py index 592ce204f..f1787def2 100755 --- a/scripts/repo_build.py +++ b/scripts/repo_build.py @@ -19,6 +19,8 @@ from toltec.repo import make_index # type: ignore from toltec.util import argparse_add_verbose, LOGGING_FORMAT # type: ignore +logger = logging.getLogger(__name__) + parser = argparse.ArgumentParser(description=__doc__) parser.add_argument( @@ -87,6 +89,7 @@ recipe_bundle[arch].packages[pkg_name] for pkg_name in recipe_bundle[arch].packages ] + logger.info("Building %s", name) builder.make(recipe_bundle, build_matrix, False) make_index(paths.REPO_DIR) From ca315e9d8b9946b5a6577816fe3f52468fefb9b6 Mon Sep 17 00:00:00 2001 From: Nathaniel van Diepen Date: Fri, 28 Nov 2025 18:43:02 +0000 Subject: [PATCH 11/12] Update KOReader to v2025.10 (#956) --- package/koreader/package | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/package/koreader/package b/package/koreader/package index e4c5ed9f9..2be81c567 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=2025.08-1 -timestamp=2025-08-16T20:20:24Z +pkgver=2025.10-1 +timestamp=2025-11-01T11:16:36Z section="readers" maintainer="raisjn " license=AGPL-3.0-or-later @@ -22,7 +22,7 @@ source=( launcherctl-koreader ) sha256sums=( - 7971436e0e950d1fd3b6e1ef6da702d03f5fa640b363bc5df7013777a97badbf + 368969ac6d58e59c5eba9789eb952eb239424d2959b903b37a4665e1aff78ea6 SKIP SKIP SKIP From de83a1da6bdfc0bcdd3aadcf7342bc3d50a2998d Mon Sep 17 00:00:00 2001 From: Tom Parker-Shemilt Date: Tue, 9 Dec 2025 03:40:04 +0000 Subject: [PATCH 12/12] Add syncthingctl (#957) * Initial attempt at syncthingctl * Unfudge libcpp-utilities paths * Fix qtutilities build * Fix qtforkawesome * Partial syncthingctl build * Remove qtforkawesome patch * syncthingctl now builds * Timestamp fixes * Use released versions for syncthingctl and qtforkawesome * Add XDG_RUNTIME_DIR wrapper for syncthingctl * Put original syncthingctl in libexec --------- Co-authored-by: Nathaniel van Diepen --- package/libcpp-utilities/package | 55 ++++++++++++++++++ package/libcpp-utilities/targets.cmake.patch | 20 +++++++ package/qtforkawesome/package | 61 ++++++++++++++++++++ package/qtutilities/package | 58 +++++++++++++++++++ package/qtutilities/targets.cmake.patch | 20 +++++++ package/syncthingctl/package | 43 ++++++++++++++ package/syncthingctl/syncthingctl | 5 ++ 7 files changed, 262 insertions(+) create mode 100644 package/libcpp-utilities/package create mode 100644 package/libcpp-utilities/targets.cmake.patch create mode 100644 package/qtforkawesome/package create mode 100644 package/qtutilities/package create mode 100644 package/qtutilities/targets.cmake.patch create mode 100755 package/syncthingctl/package create mode 100644 package/syncthingctl/syncthingctl diff --git a/package/libcpp-utilities/package b/package/libcpp-utilities/package new file mode 100644 index 000000000..a6504d4bf --- /dev/null +++ b/package/libcpp-utilities/package @@ -0,0 +1,55 @@ +#!/usr/bin/env bash +# Copyright (c) 2021 The Toltec Contributors +# SPDX-License-Identifier: MIT + +pkgnames=(libcpp-utilities libcpp-utilities-dev) +pkgdesc="Common C++ classes and routines used by Martchus' applications" +url=https://github.com/Martchus/cpp-utilities +pkgver=5.31.0-1 +timestamp=2025-09-20T23:53Z +section="devel" +maintainer="Tom Parker-Shemilt " +license=GPL-2.0-or-later +image=base:v3.3 +source=( + https://github.com/Martchus/cpp-utilities/archive/refs/tags/v5.31.0.zip + targets.cmake.patch +) +sha256sums=( + cbdf3ef53c47fc3c1d8ee20bb1f65290db878408530afe46a285b401af2839a2 + SKIP +) + +build() { + cmake -B build \ + -DCMAKE_TOOLCHAIN_FILE="/usr/share/cmake/$CHOST.cmake" \ + -DCMAKE_INSTALL_PREFIX="/opt" \ + -DBUILD_SHARED_LIBS=ON + cmake --build build + cmake --build build --target install -- DESTDIR=../install +} + +libcpp-utilities() { + package() { + install -d "$pkgdir"/opt/lib "$pkgdir"/usr/lib + cp --no-dereference "$srcdir"/install/opt/lib/lib*.so* "$pkgdir"/opt/lib + + for file in "$pkgdir"/opt/lib/lib*.so*; do + base="${file#"$pkgdir"}" + ln -s "$base" "${file/\/opt/\/usr}" + done + } +} + +libcpp-utilities-dev() { + pkgdesc="$pkgdesc - development files" + installdepends=("libcpp-utilities=$pkgver") + + package() { + install -d "$pkgdir"/opt/lib + cp -r "$srcdir"/install/opt/lib/pkgconfig "$pkgdir"/opt/lib + cp -r "$srcdir"/install/opt/share "$pkgdir"/opt + (cd $pkgdir/opt/share/c++utilities/cmake && patch -p0 < $srcdir/targets.cmake.patch) + cp -r "$srcdir"/install/opt/include "$pkgdir"/opt + } +} diff --git a/package/libcpp-utilities/targets.cmake.patch b/package/libcpp-utilities/targets.cmake.patch new file mode 100644 index 000000000..b206d0eaf --- /dev/null +++ b/package/libcpp-utilities/targets.cmake.patch @@ -0,0 +1,20 @@ +--- c++utilitiesTargets.cmake.orig 2025-11-03 20:33:08.016186953 +0000 ++++ c++utilitiesTargets.cmake 2025-11-03 20:33:55.701608765 +0000 +@@ -55,7 +55,7 @@ + + set_target_properties(c++utilities PROPERTIES + INTERFACE_COMPILE_DEFINITIONS "CPP_UTILITIES_USE_NATIVE_FILE_BUFFER" +- INTERFACE_INCLUDE_DIRECTORIES "/opt/include" ++ INTERFACE_INCLUDE_DIRECTORIES "${_IMPORT_PREFIX}/include" + ) + + # Create imported target c++utilities-headers +@@ -63,7 +63,7 @@ + + set_target_properties(c++utilities-headers PROPERTIES + INTERFACE_COMPILE_DEFINITIONS "CPP_UTILITIES_USE_NATIVE_FILE_BUFFER" +- INTERFACE_INCLUDE_DIRECTORIES "/opt/include" ++ INTERFACE_INCLUDE_DIRECTORIES "${_IMPORT_PREFIX}/include" + ) + + if(CMAKE_VERSION VERSION_LESS 3.0.0) diff --git a/package/qtforkawesome/package b/package/qtforkawesome/package new file mode 100644 index 000000000..81ef0969b --- /dev/null +++ b/package/qtforkawesome/package @@ -0,0 +1,61 @@ +#!/usr/bin/env bash +# Copyright (c) 2021 The Toltec Contributors +# SPDX-License-Identifier: MIT + +pkgnames=(libqtforkawesome libqtforkawesome-dev) +pkgdesc="Library that bundles ForkAwesome for use within Qt applications" +url=https://github.com/Martchus/qtforkawesome +pkgver=0.3.2-1 +timestamp=2025-11-04T20:54Z +section="devel" +maintainer="Tom Parker-Shemilt " +license=GPL-2.0-or-later +image=qt:v3.3 +source=( + "https://github.com/Martchus/qtforkawesome/archive/refs/tags/v0.3.2.zip" + "https://raw.githubusercontent.com/ForkAwesome/Fork-Awesome/1e3849530d0266ece3a883649e1398414b92241d/fonts/forkawesome-webfont.ttf" + "https://raw.githubusercontent.com/ForkAwesome/Fork-Awesome/0237ab8eafeeacb896e008f744be6d9d717f44b0/src/icons/icons.yml" +) +noextract=(icons.yml forkawesome-webfont.ttf) +sha256sums=( + 945fee08e5de7521571f4abb2fbe37fd3013079b3ffeb1cc6c36aaff538c6d47 + 4f319287827e35f841069eb471c092eccf97d2f7830aa4d8bd7301ded418bf49 + 1e588fc6c93737add8443a98d2bbd6b75537d173da6b613e37aaff3fc1f80c92 +) +makedepends=(build:cmake host:libcpp-utilities-dev host:libcpp-utilities host:libqtutilities host:libqtutilities-dev build:libyaml-libyaml-perl) + +build() { + cmake -B build \ + -DCMAKE_TOOLCHAIN_FILE="/usr/share/cmake/$CHOST.cmake" \ + -DCMAKE_INSTALL_PREFIX="/opt" \ + -DBUILD_SHARED_LIBS=ON \ + -DFORK_AWESOME_ICON_DEFINITIONS=$(realpath $srcdir/icons.yml) + cmake --build build + rm -f build/qtforkawesome/forkawesome-webfont.ttf + cp $(realpath $srcdir/forkawesome-webfont.ttf) build/qtforkawesome/forkawesome-webfont.ttf + cmake --build build --target install -- DESTDIR=../install +} + +libqtforkawesome() { + package() { + install -d "$pkgdir"/opt/lib "$pkgdir"/usr/lib + cp --no-dereference "$srcdir"/install/opt/lib/lib*.so* "$pkgdir"/opt/lib + + for file in "$pkgdir"/opt/lib/lib*.so*; do + base="${file#"$pkgdir"}" + ln -s "$base" "${file/\/opt/\/usr}" + done + } +} + +libqtforkawesome-dev() { + pkgdesc="$pkgdesc - development files" + installdepends=("libqtforkawesome=$pkgver") + + package() { + install -d "$pkgdir"/opt/lib + cp -r "$srcdir"/install/opt/lib/pkgconfig "$pkgdir"/opt/lib + cp -r "$srcdir"/install/opt/share "$pkgdir"/opt + cp -r "$srcdir"/install/opt/include "$pkgdir"/opt + } +} diff --git a/package/qtutilities/package b/package/qtutilities/package new file mode 100644 index 000000000..2fc45ebb2 --- /dev/null +++ b/package/qtutilities/package @@ -0,0 +1,58 @@ +#!/usr/bin/env bash +# Copyright (c) 2021 The Toltec Contributors +# SPDX-License-Identifier: MIT + +pkgnames=(libqtutilities libqtutilities-dev) +pkgdesc="Common Qt related C++ classes and routines used by Martchus' applications" +url=https://github.com/Martchus/qtutilities +pkgver=6.18.2-1 +timestamp=2025-09-24T09:03Z +section="devel" +maintainer="Tom Parker-Shemilt " +license=GPL-2.0-or-later +image=qt:v3.3 +source=( + https://github.com/Martchus/qtutilities/archive/refs/tags/v6.18.2.zip + targets.cmake.patch +) +sha256sums=( + 7a1047622c1a92760aaf448eee7c4a1b3c30c65bffdce7de1322c402ca0e9e1a + SKIP +) +makedepends=(build:cmake host:libcpp-utilities-dev host:libcpp-utilities) + +build() { + cmake -B build \ + -DCMAKE_TOOLCHAIN_FILE="/usr/share/cmake/$CHOST.cmake" \ + -DCMAKE_INSTALL_PREFIX="/opt" \ + -DBUILD_SHARED_LIBS=ON \ + -DENABLE_QT_TRANSLATIONS=OFF \ + -DWIDGETS_GUI=OFF + cmake --build build + cmake --build build --target install -- DESTDIR=../install +} + +libqtutilities() { + package() { + install -d "$pkgdir"/opt/lib "$pkgdir"/usr/lib + cp --no-dereference "$srcdir"/install/opt/lib/lib*.so* "$pkgdir"/opt/lib + + for file in "$pkgdir"/opt/lib/lib*.so*; do + base="${file#"$pkgdir"}" + ln -s "$base" "${file/\/opt/\/usr}" + done + } +} + +libqtutilities-dev() { + pkgdesc="$pkgdesc - development files" + installdepends=("libqtutilities=$pkgver") + + package() { + install -d "$pkgdir"/opt/lib + cp -r "$srcdir"/install/opt/lib/pkgconfig "$pkgdir"/opt/lib + cp -r "$srcdir"/install/opt/share "$pkgdir"/opt + (cd $pkgdir/opt/share/qtutilities/cmake && patch -p0 < $srcdir/targets.cmake.patch) + cp -r "$srcdir"/install/opt/include "$pkgdir"/opt + } +} diff --git a/package/qtutilities/targets.cmake.patch b/package/qtutilities/targets.cmake.patch new file mode 100644 index 000000000..f4f209f3e --- /dev/null +++ b/package/qtutilities/targets.cmake.patch @@ -0,0 +1,20 @@ +--- qtutilitiesTargets.cmake.orig 2025-11-03 22:15:18.324436027 +0000 ++++ qtutilitiesTargets.cmake 2025-11-03 22:15:38.028569434 +0000 +@@ -55,7 +55,7 @@ + + set_target_properties(qtutilities PROPERTIES + INTERFACE_COMPILE_DEFINITIONS "QT_UTILITIES_SUPPORT_DBUS_NOTIFICATIONS" +- INTERFACE_INCLUDE_DIRECTORIES "/opt/include" ++ INTERFACE_INCLUDE_DIRECTORIES "${_IMPORT_PREFIX}/include" + INTERFACE_LINK_LIBRARIES "Qt5::Gui;Qt5::Core" + ) + +@@ -64,7 +64,7 @@ + + set_target_properties(qtutilities-headers PROPERTIES + INTERFACE_COMPILE_DEFINITIONS "QT_UTILITIES_SUPPORT_DBUS_NOTIFICATIONS" +- INTERFACE_INCLUDE_DIRECTORIES "/opt/include" ++ INTERFACE_INCLUDE_DIRECTORIES "${_IMPORT_PREFIX}/include" + ) + + if(CMAKE_VERSION VERSION_LESS 3.0.0) diff --git a/package/syncthingctl/package b/package/syncthingctl/package new file mode 100755 index 000000000..1d6dc4305 --- /dev/null +++ b/package/syncthingctl/package @@ -0,0 +1,43 @@ +#!/usr/bin/env bash +# Copyright (c) 2025 The Toltec Contributors +# SPDX-License-Identifier: MIT + +pkgnames=(syncthingctl) +pkgdesc="CLI that orchestrates syncthing" +url="https://martchus.github.io/syncthingtray/" +pkgver=2.0.3-1 +timestamp=2025-11-04T22:54:13Z +section=utils +maintainer="Tom Parker-Shemilt " +license=GPL-2.0-or-later +image=qt:v3.3 +makedepends=(build:cmake host:libcpp-utilities-dev host:libcpp-utilities host:libqtutilities host:libqtutilities-dev) +installdepends=(libcpp-utilities libqtutilities syncthing) +source=( + https://github.com/Martchus/syncthingtray/archive/refs/tags/v2.0.3.zip + syncthingctl +) +sha256sums=( + 8edeb6e6934ba54f175dccf0e3f7063aa01c2f07bf2e2361334bfe004e3a92ce + SKIP +) + +build() { + cmake -B build \ + -DCMAKE_TOOLCHAIN_FILE="/usr/share/cmake/$CHOST.cmake" \ + -DCMAKE_INSTALL_PREFIX="/opt" \ + -DENABLE_QT_TRANSLATIONS=OFF \ + -DUSE_BOOST_PROCESS=OFF \ + -DNO_MODEL=ON \ + -DNO_FILE_ITEM_ACTION_PLUGIN=ON \ + -DNO_PLASMOID=ON \ + -DNO_WIDGETS=ON \ + -DNO_TRAY=ON + cmake --build build + cmake --build build --target install -- DESTDIR=../install +} + +package() { + install -D -m 755 "$srcdir"/syncthingctl "$pkgdir"/opt/bin/syncthingctl + install -D -m 755 "$srcdir"/install/opt/bin/syncthingctl "$pkgdir"/opt/libexec/syncthingctl +} diff --git a/package/syncthingctl/syncthingctl b/package/syncthingctl/syncthingctl new file mode 100644 index 000000000..2ddd2ebee --- /dev/null +++ b/package/syncthingctl/syncthingctl @@ -0,0 +1,5 @@ +#!/usr/bin/env bash + +export XDG_RUNTIME_DIR=/tmp/runtime-root + +exec /opt/libexec/syncthingctl $@