V3 mass upgrade

docs/package-guide.md

@@ -67,7 +67,7 @@ license=<project license>
 ## Which Docker image to use for building the package
 # See <https://github.com/toltec-dev/toolchain> 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=<build image>
 ## Whitespace-separated list of source archives that are needed to build the package
 # Archives will be automatically extracted, stripping any useless containing

package/bash-completion/package

@@ -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)
 

package/calculator/package

@@ -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

package/chessmarkable/package

@@ -13,7 +13,7 @@ license=MIT
 installdepends=(display)
 flags=(patch_rm2fb)
 
-image=rust:v2.1
+image=rust:v3.2
 source=(https://github.com/LinusCDE/chessmarkable/archive/0.8.0-1.zip)
 sha256sums=(17675d30bb45050c1db5bc81d3d76b99a1b18e497c9a331177b853a5f9aa12af)
 

package/display/package

@@ -14,7 +14,7 @@ _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

package/doomarkable/package

@@ -13,7 +13,7 @@ license=MIT
 installdepends=(display)
 flags=(patch_rm2fb)
 
-image=rust:v2.2
+image=rust:v3.2
 source=(https://github.com/LinusCDE/doomarkable/archive/0.4.1.tar.gz)
 sha256sums=(d1cc2a37e769039e6e7a2f3090f77657693591a2c28ac55e51f89607d06e8b02)
 

package/draft/package

@@ -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

package/evtest/package

@@ -12,7 +12,7 @@ maintainer="Linus K. <[email protected]>"
 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)
 

package/fbink/package

@@ -11,7 +11,7 @@ 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

package/fingerterm/package

@@ -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

package/folly/package

@@ -13,7 +13,7 @@ license=MIT
 installdepends=(display)
 makedepends=(build:libclang-14-dev build:clang-14 build:llvm-14-dev)
 
-image=rust:v2.3
+image=rust:v3.2
 
 # Whitespace-separated list of source archives that are needed to build the package
 source=(

package/fuse/package

@@ -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)
 

package/gocryptfs/package

@@ -14,7 +14,7 @@ maintainer="plan5 <[email protected]>"
 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)
 

package/keywriter/package

@@ -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

package/libdlib/package

@@ -11,7 +11,7 @@ section="devel"
 maintainer="Mattéo Delabre <[email protected]>"
 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)
 

package/libvncserver/package

@@ -11,7 +11,7 @@ section="devel"
 maintainer="Mattéo Delabre <[email protected]>"
 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)
 

package/mmc-utils/package

@@ -12,7 +12,7 @@ section="devel"
 maintainer="Alistair Francis <[email protected]>"
 license=GPL-2.0-only
 
-image=base:v2.2
+image=base:v3.2
 source=(
     0001-Makefile-Remove-Werror.patch
 )

package/netevent/package

@@ -11,7 +11,7 @@ section=utils
 maintainer="Salvatore Stella <[email protected]>"
 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"
 )

package/netsurf/package

@@ -32,15 +32,15 @@ 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
 )
 sha256sums=(
-    a688ffc634fbbab463f92153b048e643fa6a5a1f92c492ff2005079a73a8de90
+    18813be8d3492bdfc6d498ee62e32c691a329b64388970c04ca4ce8b3e656241
     SKIP
 )
 

package/plato/package

@@ -11,10 +11,10 @@ section="readers"
 maintainer="Linus K. <[email protected]>"
 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
+image=rust:v3.2
 source=("https://github.com/LinusCDE/plato/archive/${pkgver%-*}-rm-release-13.zip")
 sha256sums=(82ef5786704ecdb4fe11ce16e7e4ae10b518a592965c292977bb33962c891d48)
 

package/puzzles/package

@@ -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
@@ -25,7 +25,7 @@ sha256sums=(
 )
 
 build() {
-    pip3 install okp
+    pip3 install --break-system-packages okp
 
     # do the build
     make puzzles ARCH=rm BUILD=release RMP_VERSION="${_ver}"

package/recrossable/package

@@ -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

package/remarkable-splash/package

@@ -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)
 

package/remarkable-stylus/package

@@ -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

package/restream/package

@@ -11,7 +11,7 @@ section="screensharing"
 maintainer="Dan Shick <[email protected]>"
 license=MIT
 
-image=rust:v2.1
+image=rust:v3.2
 source=("https://github.com/rien/reStream/archive/refs/tags/${pkgver%-*}.tar.gz")
 sha256sums=(4166142b15e1e7363dac302aa92aad5b44e0514cab233abecb51414952c1d5a1)
 

package/retris/package

@@ -13,7 +13,7 @@ license=MIT
 installdepends=(display)
 flags=(patch_rm2fb)
 
-image=rust:v2.1
+image=rust:v3.2
 source=(https://github.com/LinusCDE/retris/archive/0.6.3-1.zip)
 sha256sums=(ecc7215098c03e79cd92b1835626e6739a5a932d5aa709899d183347e2a4108e)
 

package/rmfakecloud-proxy/package

@@ -14,7 +14,7 @@ maintainer="Mattéo Delabre <[email protected]>"
 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

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
@@ -24,7 +24,7 @@ sha256sums=(
 )
 
 build() {
-    pip3 install okp
+    pip3 install --break-system-packages okp
     ARCH="rm" make
 }
 

package/rmservewacominput/package

@@ -12,7 +12,7 @@ maintainer="Linus K. <[email protected]>"
 license=MIT
 installdepends=(appmarkable)
 
-image=base:v2.1
+image=base:v3.2
 source=(
     https://github.com/LinusCDE/rmWacomToMouse/archive/fd1c5454b65f456f6e890b99109e50a8f576dad1.zip
     rmservewacominput.draft

package/templatectl/package

@@ -11,7 +11,7 @@ section="templates"
 maintainer="Peter Grace <[email protected]>"
 license=MIT
 
-image=rust:v2.1
+image=rust:v3.2
 source=("https://github.com/PeterGrace/templatectl/archive/v${pkgver%-*}.zip")
 sha256sums=(1ac1049c7db4f87c113dbc96372f8f4e2b8bd4c60252e3c4f7c1fafb5ee61ae4)
 

package/vnsee/package

@@ -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"

package/wikipedia/package

@@ -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

package/zshelf/package

@@ -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

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"
 }