Skip to content

Commit 57f496e

Browse files
palfreyEeems
andauthored
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 <Eeems@users.noreply.github.com>
1 parent f009a27 commit 57f496e

37 files changed

Lines changed: 127 additions & 99 deletions

File tree

docs/package-guide.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@ license=<project license>
6767
## Which Docker image to use for building the package
6868
# See <https://github.com/toltec-dev/toolchain> for available images
6969
# The images are debian based and allow you to install additional packages with apt.
70-
# Examples (version may be out of date): base:v1.1, qt:v1.1, python:v1.1, rust:v1.1
70+
# Examples (version may be out of date): base:v3.2, qt:v3.2, python:v3.2, rust:v3.2
7171
image=<build image>
7272
## Whitespace-separated list of source archives that are needed to build the package
7373
# Archives will be automatically extracted, stripping any useless containing

package/bash-completion/package

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
pkgnames=(bash-completion)
66
pkgdesc="Programmable completion functions for bash"
77
url=https://github.com/scop/bash-completion
8-
pkgver=2.11-3
8+
pkgver=2.11-4
99
timestamp=2020-07-25T00:00Z
1010
section="utils"
1111
maintainer="Linus K. <linus@cosmos-ink.net>"
@@ -14,7 +14,7 @@ license=GPL-2.0-only
1414
# Based on the ArchLinux PKGBUILD file:
1515
# https://github.com/archlinux/svntogit-packages/blob/packages/bash-completion/trunk/PKGBUILD
1616

17-
image=base:v2.1
17+
image=base:v3.2
1818
source=(https://github.com/scop/bash-completion/releases/download/2.11/bash-completion-2.11.tar.xz)
1919
sha256sums=(73a8894bad94dee83ab468fa09f628daffd567e8bef1a24277f1e9a0daf911ac)
2020

package/calculator/package

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
pkgnames=(calculator)
66
pkgdesc="Touch-based calculator"
77
url=https://github.com/reHackable/Calculator
8-
pkgver=0.0.0-16
8+
pkgver=0.0.0-17
99
timestamp=2020-08-20T12:28Z
1010
section="math"
1111
maintainer="Mattéo Delabre <spam@delab.re>"
@@ -14,7 +14,7 @@ installdepends=(display)
1414
makedepends=(build:imagemagick build:librsvg2-bin)
1515
flags=(patch_rm2fb)
1616

17-
image=qt:v2.1
17+
image=qt:v3.2
1818
source=(
1919
https://github.com/reHackable/Calculator/archive/7b8be5de12f1536bc04b6216abbf26f998097bf4.zip
2020
calculator.draft

package/chessmarkable/package

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -5,21 +5,19 @@
55
pkgnames=(chessmarkable)
66
pkgdesc="Chess game"
77
url=https://github.com/LinusCDE/chessmarkable
8-
pkgver=0.8.0-2
9-
timestamp=2021-07-22T12:04Z
8+
pkgver=0.8.1-1
9+
timestamp=2025-09-11T12:04Z
1010
section="games"
1111
maintainer="Linus K. <linus@cosmos-ink.net>"
1212
license=MIT
1313
installdepends=(display)
1414
flags=(patch_rm2fb)
1515

16-
image=rust:v2.1
17-
source=(https://github.com/LinusCDE/chessmarkable/archive/0.8.0-1.zip)
18-
sha256sums=(17675d30bb45050c1db5bc81d3d76b99a1b18e497c9a331177b853a5f9aa12af)
16+
image=rust:v3.3
17+
source=(https://github.com/LinusCDE/chessmarkable/archive/refs/tags/0.8.1-1.zip)
18+
sha256sums=(9d136e7e96f287b7d5afa96176e934a6922bbced7cf3bdd3b767aa9181874b17)
1919

2020
build() {
21-
# Fall back to system-wide config
22-
rm .cargo/config
2321
cargo build --release --bin chessmarkable
2422
}
2523

package/display/package

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,13 +8,13 @@ timestamp=2023-08-27T02:39:10Z
88
maintainer="raisjn <of.raisjn@gmail.com>"
99
license=MIT
1010
url="https://github.com/ddvk/remarkable2-framebuffer"
11-
pkgver=1:0.0.33-3
11+
pkgver=1:0.0.33-4
1212
_release="${pkgver%-*}"
1313
_release="v${_release#*:}"
1414
_libver=1.0.1
1515
section="devel"
1616

17-
image=qt:v2.3
17+
image=qt:v3.2
1818
source=(
1919
"https://github.com/ddvk/remarkable2-framebuffer/archive/$_release.zip"
2020
rm2fb.service

package/doomarkable/package

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,17 +5,17 @@
55
pkgnames=(doomarkable)
66
pkgdesc="DOOM game"
77
url=https://github.com/LinusCDE/doomarkable
8-
pkgver=0.4.1-2
8+
pkgver=0.4.1-3
99
timestamp=2021-10-31T16:15Z
1010
section="games"
1111
maintainer="Linus K. <linus@cosmos-ink.net>"
1212
license=MIT
1313
installdepends=(display)
1414
flags=(patch_rm2fb)
1515

16-
image=rust:v2.2
17-
source=(https://github.com/LinusCDE/doomarkable/archive/0.4.1.tar.gz)
18-
sha256sums=(d1cc2a37e769039e6e7a2f3090f77657693591a2c28ac55e51f89607d06e8b02)
16+
image=rust:v3.2
17+
source=(https://github.com/LinusCDE/doomarkable/archive/7d10769d625fbe733768e39cf5006cde341d2fef.zip)
18+
sha256sums=(df86cc87d2dde7993f47f809faaab8568abe4dd2987e5ab4e00e337caef03706)
1919

2020
build() {
2121
# Fall back to system-wide config

package/draft/package

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,15 +5,15 @@
55
pkgnames=(draft)
66
pkgdesc="Launcher which wraps around the standard interface"
77
url=https://github.com/dixonary/draft-reMarkable
8-
pkgver=0.2.0-25
8+
pkgver=0.2.0-26
99
timestamp=2020-07-20T10:23Z
1010
section="launchers"
1111
maintainer="Mattéo Delabre <spam@delab.re>"
1212
license=Apache-2.0
1313
installdepends=(xochitl display procps-ng-ps)
1414
flags=(patch_rm2fb)
1515

16-
image=qt:v2.1
16+
image=qt:v3.2
1717
source=(
1818
https://github.com/dixonary/draft-reMarkable/archive/5bd660a2fd07eba166c6110d2b48cfc58ee67e58.zip
1919
draft.service

package/evtest/package

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,14 +5,14 @@
55
pkgnames=(evtest)
66
pkgdesc="Kernel evdev device information and monitor"
77
url=https://gitlab.freedesktop.org/libevdev/evtest
8-
pkgver=1.34-3
8+
pkgver=1.34-4
99
timestamp=2020-12-30T02:52Z
1010
section="utils"
1111
maintainer="Linus K. <linus@cosmos-ink.net>"
1212
license=GPL-2.0-only
1313
makedepends=(build:automake)
1414

15-
image=base:v2.1
15+
image=base:v3.2
1616
source=("https://gitlab.freedesktop.org/libevdev/evtest/-/archive/evtest-${pkgver%-*}/evtest-evtest-${pkgver%-*}.zip")
1717
sha256sums=(62f7e34c5bab91b5015de5b056d79051c677c5bd5702facb2885f8e4ba0df84c)
1818

package/fbink/package

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,14 +4,14 @@
44

55
pkgnames=(fbink fbdepth fbink-doom)
66
url=https://github.com/NiLuJe/FBInk
7-
pkgver=1.25.0-1
7+
pkgver=1.25.0-2
88
timestamp=2022-12-05T02:50:38Z
99
maintainer="Mattéo Delabre <spam@delab.re>"
1010
license=GPL-3.0
1111
installdepends=(display)
1212
flags=(patch_rm2fb)
1313

14-
image=base:v2.1
14+
image=base:v3.2
1515

1616
prepare() {
1717
git clone --depth=1 --recurse-submodules --branch v${pkgver%-*} https://github.com/NiLuJe/FBInk.git "$srcdir"/FBInk

package/fingerterm/package

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,15 +5,15 @@
55
pkgnames=(fingerterm)
66
pkgdesc="Terminal emulator with an on-screen touch keyboard"
77
url=https://github.com/dixonary/fingerterm-reMarkable
8-
pkgver=1.3.5-15
8+
pkgver=1.3.5-16
99
timestamp=2020-10-27T12:02Z
1010
section="admin"
1111
maintainer="Mattéo Delabre <spam@delab.re>"
1212
license=GPL-2.0-or-later
1313
installdepends=(display)
1414
flags=(patch_rm2fb)
1515

16-
image=qt:v2.1
16+
image=qt:v3.2
1717
source=(
1818
https://github.com/dixonary/fingerterm-reMarkable/archive/02c17b5b485743c698e005ca89366c32b66aa044.zip
1919
fingerterm.png

0 commit comments

Comments
 (0)