Merge branch 'testing' into upower

toltec-dev · Sep 14, 2024 · 4b9568e · 4b9568e
2 parents 81925d8 + 5ba1268
commit 4b9568e
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 12 deletions.
diff --git 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 <alistair@alistair23.me>"
@@ -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

diff --git 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 <eeems@eeems.email>"

diff --git a/package/whiteboard-hypercard/package b/package/whiteboard-hypercard/package
@@ -1,37 +1,37 @@
 #!/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 <pierrefenoll@gmail.com>"
 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
 )
 
 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
@@ -1,4 +1,4 @@
-# Copyright (c) 2023 The Toltec Contributors
+# Copyright (c) 2024 The Toltec Contributors
 # SPDX-License-Identifier: MIT
 
 name=whiteboard