diff --git a/docs/package-guide.md b/docs/package-guide.md index d8c96e1b6..11e45e2d7 100644 --- a/docs/package-guide.md +++ b/docs/package-guide.md @@ -67,7 +67,7 @@ license= ## Which Docker image to use for building the package # See 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= ## Whitespace-separated list of source archives that are needed to build the package # Archives will be automatically extracted, stripping any useless containing diff --git a/package/bash-completion/package b/package/bash-completion/package index 403f30456..7320bc9be 100644 --- a/package/bash-completion/package +++ b/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. " @@ -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) diff --git a/package/calculator/package b/package/calculator/package index 092ef00d6..d4344ca52 100644 --- a/package/calculator/package +++ b/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 " @@ -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 diff --git a/package/chessmarkable/package b/package/chessmarkable/package index 6258ab355..40f68a952 100644 --- a/package/chessmarkable/package +++ b/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. " 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 } diff --git a/package/display/package b/package/display/package index 633b4e9f5..d8f144a98 100644 --- a/package/display/package +++ b/package/display/package @@ -8,13 +8,13 @@ timestamp=2023-08-27T02:39:10Z maintainer="raisjn " 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 diff --git a/package/doomarkable/package b/package/doomarkable/package index 3e5ae8735..a5c9a3a70 100644 --- a/package/doomarkable/package +++ b/package/doomarkable/package @@ -5,7 +5,7 @@ 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. " @@ -13,9 +13,9 @@ 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 diff --git a/package/draft/package b/package/draft/package index 81610e407..030f682ab 100644 --- a/package/draft/package +++ b/package/draft/package @@ -5,7 +5,7 @@ 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 " @@ -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 diff --git a/package/evtest/package b/package/evtest/package index dd037a607..6d458bb69 100644 --- a/package/evtest/package +++ b/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. " 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) diff --git a/package/fbink/package b/package/fbink/package index 504bca3f3..30ce47133 100644 --- a/package/fbink/package +++ b/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 " 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 diff --git a/package/fingerterm/package b/package/fingerterm/package index 80a8ea8e7..312956b0f 100644 --- a/package/fingerterm/package +++ b/package/fingerterm/package @@ -5,7 +5,7 @@ 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 " @@ -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 diff --git a/package/folly/package b/package/folly/package index 80a788d08..52a0d9091 100644 --- a/package/folly/package +++ b/package/folly/package @@ -5,24 +5,24 @@ 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 " 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=( - https://github.com/bkirwi/folly/archive/fe47fedbc9b77207de89c34c8133fa0d66e5079b.zip + https://github.com/bkirwi/folly/archive/97f5813086a9adabb70114b12aa5a2073458bc91.zip folly.draft ) # SHA-256 checksums of the source archives above sha256sums=( - 16d572cbe78605baa7df66e148e2a5083efd5a9642e2a033bf626207a1568a87 + 0d8f254660b760a5f4a6361b4c1bd2afa008274a2bcaf5838b3561f219954259 SKIP ) diff --git a/package/fuse/package b/package/fuse/package index bb3c88a41..a2b3204e4 100755 --- a/package/fuse/package +++ b/package/fuse/package @@ -6,7 +6,7 @@ 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 <30434574+plan5@users.noreply.github.com>" @@ -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) diff --git a/package/gocryptfs/package b/package/gocryptfs/package index c6b4dd8e9..a7c52e843 100644 --- a/package/gocryptfs/package +++ b/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 <30434574+plan5@users.noreply.github.com>" 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) diff --git a/package/keywriter/package b/package/keywriter/package index 32ab6d891..28d3c9ede 100644 --- a/package/keywriter/package +++ b/package/keywriter/package @@ -5,7 +5,7 @@ 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 " @@ -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 diff --git a/package/libdlib/package b/package/libdlib/package index 76ee546ae..532e4a1bf 100644 --- a/package/libdlib/package +++ b/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 " 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) diff --git a/package/libvncserver/package b/package/libvncserver/package index 2692e2874..ce0efd572 100644 --- a/package/libvncserver/package +++ b/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 " 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) diff --git a/package/mmc-utils/package b/package/mmc-utils/package index 948dffa99..8c57dc85f 100644 --- a/package/mmc-utils/package +++ b/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 " license=GPL-2.0-only -image=base:v2.2 +image=base:v3.2 source=( 0001-Makefile-Remove-Werror.patch ) diff --git a/package/netevent/package b/package/netevent/package index e1efee9ab..14937a260 100644 --- a/package/netevent/package +++ b/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 " 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" ) diff --git a/package/netsurf/package b/package/netsurf/package index 74d427851..8c7abfe5a 100644 --- a/package/netsurf/package +++ b/package/netsurf/package @@ -5,7 +5,7 @@ pkgnames=(netsurf) pkgdesc="Lightweight web browser" url=https://github.com/alex0809/netsurf-reMarkable -pkgver=0.4.0-3 +pkgver=0.4.0-4 timestamp=2021-05-31T11:15+00:00 maintainer="Alex Friesenhahn " archs=(rmall) @@ -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 diff --git a/package/netsurf/ssl-links.patch b/package/netsurf/ssl-links.patch new file mode 100644 index 000000000..b2d6dc819 --- /dev/null +++ b/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 +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 \ diff --git a/package/plato/package b/package/plato/package index c58215fcd..a71462528 100644 --- a/package/plato/package +++ b/package/plato/package @@ -5,26 +5,26 @@ pkgnames=(plato) pkgdesc="Document reader" url=https://github.com/LinusCDE/plato -pkgver=0.9.34-2 -timestamp=2023-03-08T17:58Z +pkgver=0.9.44-1 +timestamp=2025-09-16T17:58Z section="readers" maintainer="Linus K. " 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 -source=("https://github.com/LinusCDE/plato/archive/${pkgver%-*}-rm-release-13.zip") -sha256sums=(82ef5786704ecdb4fe11ce16e7e4ae10b518a592965c292977bb33962c891d48) +image=rust:v3.3 +source=("https://github.com/LinusCDE/plato/archive/refs/tags/${pkgver%-*}-rm-release-14.zip") +sha256sums=(8fdb9edea98e7cff06bc2144fa314f13a5c521b95565d907ee098e98f70fe62a) build() { # 'cargo pkgid' seems to output something different with most # recent nightly builds. This adjusts the filtering. sed -i "s/version=.*$/version=\'$(cargo pkgid -p plato | cut -d "#" -f 2 | cut -d ":" -f 2)\'/g" download.sh - # Temporary fix until next release (TODO: Remove for next released version as included with commit fbfaf3d7) - sed -i "s/--target=arm-unknown-linux-gnueabihf/--target=armv7-unknown-linux-gnueabihf/g" build.sh + # We want cargo, not cross + sed -i "s/cross build/cargo build/g" build.sh # Use our toolchain export AR=arm-linux-gnueabihf-ar diff --git a/package/puzzles/package b/package/puzzles/package index 8ac7d3e84..11e95cde3 100644 --- a/package/puzzles/package +++ b/package/puzzles/package @@ -6,7 +6,7 @@ pkgnames=(puzzles) timestamp=2021-03-04T14:03-08:00 maintainer="Mattéo Delabre " _ver=0.2.4 -pkgver=${_ver}-4 +pkgver=${_ver}-5 license=MIT pkgdesc="Simon Tatham's Puzzle Package" url="https://github.com/mrichards42/remarkable_puzzles" @@ -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 diff --git a/package/recrossable/package b/package/recrossable/package index 476b87bef..b584d783d 100644 --- a/package/recrossable/package +++ b/package/recrossable/package @@ -5,7 +5,7 @@ pkgnames=(recrossable) pkgdesc="Solve crossword puzzles" url=https://github.com/sandsmark/recrossable -pkgver=0.0.0-8 +pkgver=0.0.0-9 timestamp=2021-01-15T12:58:22Z section="games" maintainer="Mattéo Delabre " @@ -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 diff --git a/package/remarkable-splash/package b/package/remarkable-splash/package index a951fc90b..553788394 100644 --- a/package/remarkable-splash/package +++ b/package/remarkable-splash/package @@ -5,7 +5,7 @@ pkgnames=(remarkable-splash) pkgdesc="Show splashscreens + remarkable-shutdown replacement that does not clear the screen" url=https://github.com/ddvk/remarkable-splash -pkgver=1.0-5 +pkgver=1.0-6 timestamp=2019-12-31T10:07Z section="utils" maintainer="Eeems " @@ -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) diff --git a/package/remarkable-stylus/package b/package/remarkable-stylus/package index d54f87f97..64b045e73 100644 --- a/package/remarkable-stylus/package +++ b/package/remarkable-stylus/package @@ -4,7 +4,7 @@ archs=(rmallos2) pkgnames=(remarkable-stylus) -pkgver=0.0.3-3 +pkgver=0.0.3-4 pkgdesc="Generate a key press upon pressing the button of a Lamy AL-star EMR pen" timestamp=2020-11-19T20:07:29Z maintainer="Eeems " @@ -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 diff --git a/package/restream/package b/package/restream/package index 3c1bf017c..93f3e5569 100644 --- a/package/restream/package +++ b/package/restream/package @@ -5,13 +5,13 @@ pkgnames=(restream) pkgdesc="Binary framebuffer capture tool for the reStream script" url=https://github.com/rien/reStream -pkgver=1.2.0-1 +pkgver=1.2.0-2 timestamp=2021-11-04T19:09:14Z section="screensharing" maintainer="Dan Shick " license=MIT -image=rust:v2.1 +image=rust:v3.2 source=("https://github.com/rien/reStream/archive/refs/tags/${pkgver%-*}.tar.gz") sha256sums=(4166142b15e1e7363dac302aa92aad5b44e0514cab233abecb51414952c1d5a1) diff --git a/package/retris/package b/package/retris/package index db8a00839..1e05ecb05 100644 --- a/package/retris/package +++ b/package/retris/package @@ -5,7 +5,7 @@ pkgnames=(retris) pkgdesc="Tetris game" url=https://github.com/LinusCDE/retris -pkgver=0.6.3-4 +pkgver=0.6.4-1 timestamp=2021-01-30T02:41Z section="games" maintainer="Linus K. " @@ -13,13 +13,11 @@ license=MIT installdepends=(display) flags=(patch_rm2fb) -image=rust:v2.1 -source=(https://github.com/LinusCDE/retris/archive/0.6.3-1.zip) -sha256sums=(ecc7215098c03e79cd92b1835626e6739a5a932d5aa709899d183347e2a4108e) +image=rust:v3.3 +source=(https://github.com/LinusCDE/retris/archive/0.6.4-1.zip) +sha256sums=(934fa07c962f5b35d4e0c4d40631aa954c72a9d147b40a6bb49c5d3dc0a3684e) build() { - # Fall back to system-wide config - rm .cargo/config cargo build --release } diff --git a/package/rmfakecloud-proxy/package b/package/rmfakecloud-proxy/package index 6c497fb60..99322188e 100644 --- a/package/rmfakecloud-proxy/package +++ b/package/rmfakecloud-proxy/package @@ -7,14 +7,14 @@ pkgdesc="Connect Xochitl to a rmfakecloud server" _url=https://github.com/ddvk/rmfakecloud-proxy url="$_url" _upver=0.0.3 -pkgver="$_upver-5" +pkgver="$_upver-6" timestamp=2022-02-26T22:59Z section="utils" maintainer="Mattéo Delabre " 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 diff --git a/package/rmkit/package b/package/rmkit/package index f1839892f..abcd970a4 100644 --- a/package/rmkit/package +++ b/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 @@ -31,7 +31,7 @@ build() { bufshot() { pkgdesc="program for saving the framebuffer as a png" url="https://github.com/rmkit-dev/rmkit/tree/master/src/bufshot" - pkgver=0.1.2-3 + pkgver=0.1.2-4 section="utils" package() { @@ -42,7 +42,7 @@ bufshot() { dumbskull() { pkgdesc="Dungeon Crawl themed Solitaire" url="https://rmkit.dev/apps/dumbskull" - pkgver=0.0.1-4 + pkgver=0.0.1-5 section="games" package() { @@ -54,7 +54,7 @@ dumbskull() { genie() { pkgdesc="Gesture engine that connects commands to gestures" url="https://rmkit.dev/apps/genie" - pkgver=0.1.7-2 + pkgver=0.1.7-3 section="utils" package() { @@ -80,7 +80,7 @@ genie() { harmony() { pkgdesc="Procedural sketching app" url="https://rmkit.dev/apps/harmony" - pkgver=0.2.3-2 + pkgver=0.2.3-3 section="drawing" package() { @@ -97,7 +97,7 @@ harmony() { iago() { pkgdesc="overlay for drawing shapes via stroke injection" url="https://rmkit.dev/apps/iago" - pkgver=0.1.2-2 + pkgver=0.1.2-3 section="utils" installdepends+=("lamp") @@ -109,7 +109,7 @@ iago() { lamp() { pkgdesc="config based stroke injection utility" url="https://rmkit.dev/apps/lamp" - pkgver=0.1.1-3 + pkgver=0.1.1-4 section="utils" package() { @@ -120,7 +120,7 @@ lamp() { mines() { pkgdesc="Mine detection game" url="https://rmkit.dev/apps/minesweeper" - pkgver=0.1.4-4 + pkgver=0.1.4-5 section="games" package() { @@ -133,7 +133,7 @@ mines() { nao() { pkgdesc="Nao Package Manager: opkg UI built with SAS" url="https://rmkit.dev/apps/nao" - pkgver=0.1.2-4 + pkgver=0.1.2-5 section="admin" installdepends+=(simple) @@ -147,7 +147,7 @@ nao() { remux() { pkgdesc="Launcher that supports multi-tasking applications" url="https://rmkit.dev/apps/remux" - pkgver=0.3.0-6 + pkgver=0.3.0-7 section="launchers" installdepends=(procps-ng-ps) @@ -184,7 +184,7 @@ remux() { rpncalc() { pkgdesc="RPN Calculator" url="https://rmkit.dev/apps/rpncalc" - pkgver=0.0.3-4 + pkgver=0.0.3-5 section="math" package() { @@ -197,7 +197,7 @@ rpncalc() { simple() { pkgdesc="Simple app script for writing scripted applications" url="https://rmkit.dev/apps/sas" - pkgver=0.2.1-2 + pkgver=0.2.1-3 section="devel" package() { @@ -208,7 +208,7 @@ simple() { wordlet() { pkgdesc="Wordle clone" url="https://rmkit.dev/apps/wordlet" - pkgver=0.0.2-4 + pkgver=0.0.2-5 section="games" package() { diff --git a/package/rmservewacominput/package b/package/rmservewacominput/package index 2c558e13f..c740ccf66 100644 --- a/package/rmservewacominput/package +++ b/package/rmservewacominput/package @@ -5,14 +5,14 @@ pkgnames=(rmservewacominput) pkgdesc="Serve pen input on port 33333" url=https://github.com/LinusCDE/rmWacomToMouse -pkgver=0.3.0-2 +pkgver=0.3.0-3 timestamp=2021-03-10T18:36Z section="utils" maintainer="Linus K. " license=MIT installdepends=(appmarkable) -image=base:v2.1 +image=base:v3.2 source=( https://github.com/LinusCDE/rmWacomToMouse/archive/fd1c5454b65f456f6e890b99109e50a8f576dad1.zip rmservewacominput.draft diff --git a/package/templatectl/package b/package/templatectl/package index b09b7fc7b..4c57e1029 100644 --- a/package/templatectl/package +++ b/package/templatectl/package @@ -5,13 +5,13 @@ pkgnames=(templatectl) pkgdesc="Tool to add/remove templates for xochitl" url=https://github.com/PeterGrace/templatectl -pkgver=0.1.3-5 +pkgver=0.1.3-6 timestamp=2021-01-15T01:23Z section="templates" maintainer="Peter Grace " license=MIT -image=rust:v2.1 +image=rust:v3.2 source=("https://github.com/PeterGrace/templatectl/archive/v${pkgver%-*}.zip") sha256sums=(1ac1049c7db4f87c113dbc96372f8f4e2b8bd4c60252e3c4f7c1fafb5ee61ae4) diff --git a/package/vnsee/package b/package/vnsee/package index 057220d0c..3030054f1 100644 --- a/package/vnsee/package +++ b/package/vnsee/package @@ -5,7 +5,7 @@ pkgnames=(vnsee) pkgdesc="VNC client allowing you to use the device as a second screen" url=https://github.com/matteodelabre/vnsee -pkgver=0.4.1-2 +pkgver=0.4.1-3 timestamp=2021-08-29T13:45:26Z section="screensharing" maintainer="Mattéo Delabre " @@ -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" diff --git a/package/wikipedia/package b/package/wikipedia/package index a03eb4d22..b11686a6b 100644 --- a/package/wikipedia/package +++ b/package/wikipedia/package @@ -5,7 +5,7 @@ pkgnames=(wikipedia) pkgdesc="The free encyclopedia" url=https://github.com/dps/remarkable-wikipedia -pkgver=0.1.0-4 +pkgver=0.1.0-5 timestamp=2021-03-11T04:50Z section="readers" maintainer="David Singleton " @@ -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 diff --git a/package/zshelf/package b/package/zshelf/package index 0562ac3e3..473626868 100644 --- a/package/zshelf/package +++ b/package/zshelf/package @@ -5,7 +5,7 @@ pkgnames=(zshelf) pkgdesc="Z-Library browser and downloader" url=https://github.com/khanhas/zshelf -pkgver=0.3.1-4 +pkgver=0.3.1-5 section=utils timestamp=2021-02-20T01:45Z maintainer="khanhas " @@ -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 diff --git a/requirements.txt b/requirements.txt index 7aadcde47..c0321f1b8 100644 --- a/requirements.txt +++ b/requirements.txt @@ -8,7 +8,7 @@ mypy-extensions==1.0.0 mypy==1.7.1 pylint==3.0.3 six==1.16.0 -toltecmk==0.3.3 +toltecmk==0.3.7 toml==0.10.2 types-python-dateutil==2.8.19.14 types-requests==2.31.0.2 diff --git a/scripts/package-lib b/scripts/package-lib index c3ec34a13..0688fb13e 100644 --- a/scripts/package-lib +++ b/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" } diff --git a/scripts/repo_build.py b/scripts/repo_build.py index 592ce204f..f1787def2 100755 --- a/scripts/repo_build.py +++ b/scripts/repo_build.py @@ -19,6 +19,8 @@ from toltec.repo import make_index # type: ignore from toltec.util import argparse_add_verbose, LOGGING_FORMAT # type: ignore +logger = logging.getLogger(__name__) + parser = argparse.ArgumentParser(description=__doc__) parser.add_argument( @@ -87,6 +89,7 @@ recipe_bundle[arch].packages[pkg_name] for pkg_name in recipe_bundle[arch].packages ] + logger.info("Building %s", name) builder.make(recipe_bundle, build_matrix, False) make_index(paths.REPO_DIR)