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

@@ -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. <[email protected]>"
@@ -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

@@ -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 <[email protected]>"
@@ -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

@@ -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. <[email protected]>"
 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
 }
 

package/display/package

@@ -8,13 +8,13 @@ timestamp=2023-08-27T02:39:10Z
 maintainer="raisjn <[email protected]>"
 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

package/doomarkable/package

@@ -5,17 +5,17 @@
 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. <[email protected]>"
 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

package/draft/package

@@ -5,15 +5,15 @@
 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 <[email protected]>"
 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

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

@@ -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 <[email protected]>"
 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

@@ -5,15 +5,15 @@
 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 <[email protected]>"
 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

@@ -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 <[email protected]>"
 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=(

package/fuse/package

@@ -6,15 +6,15 @@ 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 <[email protected]>"
 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

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

@@ -5,15 +5,15 @@
 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 <[email protected]>"
 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

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

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

@@ -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 <[email protected]>"
 license=GPL-2.0-only
 
-image=base:v2.2
+image=base:v3.2
 source=(
     0001-Makefile-Remove-Werror.patch
 )

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

@@ -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 <[email protected]>"
 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

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 <[email protected]>
+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 \