From 15ef15386f03d0d539efee185a4e96d6122434c9 Mon Sep 17 00:00:00 2001 From: Pierre Fenoll Date: Thu, 12 Sep 2024 19:54:33 +0200 Subject: [PATCH 1/3] Update whiteboard-hypercard to 0.5.0 (#917) * Update whiteboard-hypercard to 0.4.0 * Update whiteboard-hypercard to 0.5.0 Signed-off-by: Pierre Fenoll --------- Signed-off-by: Pierre Fenoll Co-authored-by: Nathaniel van Diepen --- package/whiteboard-hypercard/package | 16 ++++++++-------- .../whiteboard-hypercard.draft | 2 +- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/package/whiteboard-hypercard/package b/package/whiteboard-hypercard/package index 581882d83..9cb9a468b 100644 --- a/package/whiteboard-hypercard/package +++ b/package/whiteboard-hypercard/package @@ -1,25 +1,25 @@ #!/usr/bin/env bash -# Copyright (c) 2023 The Toltec Contributors +# Copyright (c) 2024 The Toltec Contributors # SPDX-License-Identifier: MIT pkgnames=(whiteboard-hypercard) pkgdesc="Real-time collaboration, drawing or whiteboarding" url=https://github.com/fenollp/reMarkable-tools -pkgver=0.3.7-2 -timestamp=2023-10-11T12:57Z +pkgver=0.5.0-1 +timestamp=2024-09-12T19:00:22Z section="drawing" maintainer="Pierre Fenoll " license=CC-BY-NC-ND installdepends=(display) flags=(patch_rm2fb) -image=rust:v3.1 +image=rust:v3.2 source=( - https://github.com/fenollp/reMarkable-tools/archive/v0.3.7.zip + https://github.com/fenollp/reMarkable-tools/archive/refs/tags/v0.5.0.zip whiteboard-hypercard.draft ) sha256sums=( - 642fd954ec4f9a1d132b10cc7f7dfbee3467e9c08b1253cc32d1e372178d168b + 668f0b1dbc6027f6f6b8ab69f65c844a718f38115f79b9ce79e060a1cef3edfb SKIP ) @@ -27,11 +27,11 @@ build() { pushd marauder rustup component add rustfmt cargo fetch - cargo build --release --bin whiteboard --locked --frozen --offline + cargo build --release --package=marauder --bin=whiteboard --locked --frozen --offline --target=armv7-unknown-linux-gnueabihf popd } package() { - install -D -m 755 -t "$pkgdir"/opt/bin "$srcdir"/marauder/target/armv7-unknown-linux-gnueabihf/release/whiteboard + install -D -m 755 -t "$pkgdir"/opt/bin "$srcdir"/target/armv7-unknown-linux-gnueabihf/release/whiteboard install -D -m 644 -t "$pkgdir"/opt/etc/draft "$srcdir"/whiteboard-hypercard.draft } diff --git a/package/whiteboard-hypercard/whiteboard-hypercard.draft b/package/whiteboard-hypercard/whiteboard-hypercard.draft index c1565788e..11c499816 100644 --- a/package/whiteboard-hypercard/whiteboard-hypercard.draft +++ b/package/whiteboard-hypercard/whiteboard-hypercard.draft @@ -1,4 +1,4 @@ -# Copyright (c) 2023 The Toltec Contributors +# Copyright (c) 2024 The Toltec Contributors # SPDX-License-Identifier: MIT name=whiteboard From 0d48822b5ecce22529bdf037ad5a4a3b833a84b5 Mon Sep 17 00:00:00 2001 From: Nathaniel van Diepen Date: Fri, 13 Sep 2024 18:54:28 -0600 Subject: [PATCH 2/3] Bump toltec-deletions version as master is out of sync (#919) --- package/toltec-deletions/package | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/toltec-deletions/package b/package/toltec-deletions/package index b5c383713..4d78a343c 100644 --- a/package/toltec-deletions/package +++ b/package/toltec-deletions/package @@ -6,7 +6,7 @@ archs=(rm1os2 rm1os3 rm2os2 rm2os3) pkgnames=(toltec-deletions) pkgdesc="Metapackage to handle package deletions between OS versions" url=https://toltec-dev.org/ -pkgver=0.1-8 +pkgver=0.1-9 timestamp=2023-12-03T04:51:58Z section="utils" maintainer="Eeems " From 5ba126848fe44a0a7434c44f9436c18bae92dae8 Mon Sep 17 00:00:00 2001 From: Nathaniel van Diepen Date: Fri, 13 Sep 2024 19:44:12 -0600 Subject: [PATCH 3/3] Fix builds (#921) * Fix linux build again * Update package --- package/linux-mainline/package | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package/linux-mainline/package b/package/linux-mainline/package index 754fa6591..1db253d36 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-1 +pkgver=6.3.0-2 timestamp=2023-08-23T21:50:09Z section=kernel maintainer="Alistair Francis " @@ -15,7 +15,7 @@ installdepends=(kernelctl) license=GPL-2.0-only flags=(nostrip) -image=base:v2.3 +image=base:v3.2 source=( https://github.com/alistair23/linux/archive/1698a3bdd8d66e58873c5bb3ce370b7d48b004cf.tar.gz remarkable_defconfig