From 2bd231ae46ddc6e81525832a49bb8ef1c5c67d65 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Matt=C3=A9o=20Delabre?= <1370040+matteodelabre@users.noreply.github.com> Date: Fri, 9 Jul 2021 16:45:39 +0200 Subject: [PATCH] Update packages for release 2.6 and onwards (#366) This PR updates all the recipes to use the 2.x toolchain. This will make Toltec work with updates 2.6 and onwards (fixes #322), at the price of breaking compatibility with system updates 2.5 and earlier. Co-authored-by: Nathaniel van Diepen --- package/appmarkable/package | 4 +-- package/bash-completion/package | 4 +-- package/calculator/package | 4 +-- package/chessmarkable/package | 4 +-- package/display/package | 4 +-- package/draft/package | 4 +-- package/evtest/package | 4 +-- package/fbink/package | 4 +-- package/fingerterm/package | 4 +-- .../fix-multiple-yylloc-definitions.patch | 26 ++++++++++++++ package/fuse/package | 20 +++++++---- package/gocryptfs/package | 16 +++------ package/innernet/package | 4 +-- package/keywriter/package | 4 +-- package/libdlib/package | 4 +-- package/libvncserver/package | 4 +-- package/oxide/package | 18 +++++++--- package/oxide/support-2.6.patch | 35 +++++++++++++++++++ package/plato/package | 4 +-- package/puzzles/package | 4 +-- package/quickjs/package | 4 +-- package/recrossable/package | 4 +-- package/remarkable-splash/package | 4 +-- package/restream/package | 5 +-- package/retris/package | 4 +-- package/rmkit/package | 20 +++++------ package/rmservewacominput/package | 4 +-- package/templatectl/package | 4 +-- package/toltec-completion/package | 2 +- package/vnsee/package | 4 +-- package/wikipedia/package | 4 +-- .../fix-multiple-yylloc-definitions.patch | 26 ++++++++++++++ package/wireguard/package | 7 ++-- package/yaft/package | 4 +-- package/zoneinfo-utils/package | 4 +-- package/zshelf/package | 4 +-- 36 files changed, 190 insertions(+), 89 deletions(-) create mode 100644 package/fuse/fix-multiple-yylloc-definitions.patch create mode 100644 package/oxide/support-2.6.patch create mode 100644 package/wireguard/fix-multiple-yylloc-definitions.patch diff --git a/package/appmarkable/package b/package/appmarkable/package index acab6f803..136491f19 100644 --- a/package/appmarkable/package +++ b/package/appmarkable/package @@ -5,7 +5,7 @@ pkgnames=(appmarkable) pkgdesc="Front-end for apps that do not have a graphical user interface" url="https://github.com/LinusCDE/appmarkable" -pkgver=0.0.0-10 +pkgver=0.0.0-11 timestamp=2021-03-10T18:36Z section="devel" maintainer="Linus K. " @@ -13,7 +13,7 @@ license=MIT installdepends=(display) flags=(patch_rm2fb) -image=rust:v1.4 +image=rust:v2.1 source=(https://github.com/LinusCDE/appmarkable/archive/c44ee87ea2b1f1e41c9592476c076150c9a1acf4.zip) sha256sums=(76e151aeae0f18b206dd3c6258bf74bcb5256ee2f803e1ed2073278831158f60) diff --git a/package/bash-completion/package b/package/bash-completion/package index f153afd06..403f30456 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-2 +pkgver=2.11-3 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:v1.3.2 +image=base:v2.1 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 867a0c017..072063a15 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-14 +pkgver=0.0.0-15 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:v1.4 +image=qt:v2.1 source=( https://github.com/reHackable/Calculator/archive/7b8be5de12f1536bc04b6216abbf26f998097bf4.zip calculator.draft diff --git a/package/chessmarkable/package b/package/chessmarkable/package index aaea71ab7..890349317 100644 --- a/package/chessmarkable/package +++ b/package/chessmarkable/package @@ -5,7 +5,7 @@ pkgnames=(chessmarkable) pkgdesc="Chess game" url=https://github.com/LinusCDE/chessmarkable -pkgver=0.7.1-1 +pkgver=0.7.1-2 timestamp=2021-06-21T22:30Z section="games" maintainer="Linus K. " @@ -13,7 +13,7 @@ license=MIT installdepends=(display) flags=(patch_rm2fb) -image=rust:v1.6 +image=rust:v2.1 source=(https://github.com/LinusCDE/chessmarkable/archive/0.7.1-1.zip) sha256sums=(fabefb488ef566d37ba730f11c395c5bf4be5e9b24aa5645f62aec5064b9286c) diff --git a/package/display/package b/package/display/package index f9b8cce7f..4c3386abe 100644 --- a/package/display/package +++ b/package/display/package @@ -8,10 +8,10 @@ timestamp=2021-02-21T01:41+00:00 maintainer="raisjn " license=MIT url="https://github.com/ddvk/remarkable2-framebuffer" -pkgver=1.0.1-5 +pkgver=1.0.1-6 section="devel" -image=qt:v1.4 +image=qt:v2.1 source=( https://github.com/ddvk/remarkable2-framebuffer/archive/v0.0.5.zip rm2fb.service diff --git a/package/draft/package b/package/draft/package index 1a09e67e1..0b7e90afb 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-19 +pkgver=0.2.0-20 timestamp=2020-07-20T10:23Z section="launchers" maintainer="Mattéo Delabre " @@ -13,7 +13,7 @@ license=Apache-2.0 installdepends=(xochitl display) flags=(patch_rm2fb) -image=qt:v1.4 +image=qt:v2.1 source=( https://github.com/dixonary/draft-reMarkable/archive/5bd660a2fd07eba166c6110d2b48cfc58ee67e58.zip draft.service diff --git a/package/evtest/package b/package/evtest/package index 4b79fdead..dd037a607 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-2 +pkgver=1.34-3 timestamp=2020-12-30T02:52Z section="utils" maintainer="Linus K. " license=GPL-2.0-only makedepends=(build:automake) -image=base:v1.2.1 +image=base:v2.1 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 4b5394d69..d0f2ddb63 100644 --- a/package/fbink/package +++ b/package/fbink/package @@ -4,12 +4,12 @@ pkgnames=(fbink fbdepth fbink-doom) url=https://github.com/NiLuJe/FBInk -pkgver=1.23.1-3 +pkgver=1.23.1-4 timestamp=2020-12-14T12:30Z maintainer="Mattéo Delabre " license=GPL-3.0 -image=base:v1.2.1 +image=base:v2.1 source=() sha256sums=() diff --git a/package/fingerterm/package b/package/fingerterm/package index 05c5290c1..03dc4956e 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-13 +pkgver=1.3.5-14 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:v1.4 +image=qt:v2.1 source=( https://github.com/dixonary/fingerterm-reMarkable/archive/02c17b5b485743c698e005ca89366c32b66aa044.zip fingerterm.png diff --git a/package/fuse/fix-multiple-yylloc-definitions.patch b/package/fuse/fix-multiple-yylloc-definitions.patch new file mode 100644 index 000000000..b3a63303c --- /dev/null +++ b/package/fuse/fix-multiple-yylloc-definitions.patch @@ -0,0 +1,26 @@ +diff --git a/scripts/dtc/dtc-lexer.l b/scripts/dtc/dtc-lexer.l +index 790fbf6c..e7eab4d7 100644 +--- a/scripts/dtc/dtc-lexer.l ++++ b/scripts/dtc/dtc-lexer.l +@@ -38,7 +38,7 @@ LINECOMMENT "//".*\n + #include "srcpos.h" + #include "dtc-parser.tab.h" + +-YYLTYPE yylloc; ++extern YYLTYPE yylloc; + extern bool treesource_error; + + /* CAUTION: this will stop working if we ever use yyless() or yyunput() */ +diff --git a/scripts/dtc/dtc-lexer.lex.c_shipped b/scripts/dtc/dtc-lexer.lex.c_shipped +index ba525c2f..a2fe8dbc 100644 +--- a/scripts/dtc/dtc-lexer.lex.c_shipped ++++ b/scripts/dtc/dtc-lexer.lex.c_shipped +@@ -637,7 +637,7 @@ char *yytext; + #include "srcpos.h" + #include "dtc-parser.tab.h" + +-YYLTYPE yylloc; ++extern YYLTYPE yylloc; + extern bool treesource_error; + + /* CAUTION: this will stop working if we ever use yyless() or yyunput() */ diff --git a/package/fuse/package b/package/fuse/package index ca9a183fe..783d14eab 100755 --- a/package/fuse/package +++ b/package/fuse/package @@ -6,7 +6,7 @@ archs=(rm1 rm2) pkgnames=(fuse) pkgdesc="FUSE (Filesystem in Userspace) Kernel Module" url=https://github.com/libfuse/libfuse -pkgver=1.0.0-1 +pkgver=1.0.0-2 timestamp=2021-04-06T22:16Z section=utils maintainer="plan5 <30434574+plan5@users.noreply.github.com>" @@ -14,19 +14,27 @@ license=GPL-2.0-only makedepends=(build:bc build:lzop build:git) flags=(nostrip) +image=base:v2.1 +source=(fix-multiple-yylloc-definitions.patch) +sha256sums=(SKIP) + _kernelrepo=https://github.com/remarkable/linux _kernelrev=1774e2a6a091fdc081324e966d3db0aa9df75c0b _defconfig=arch/arm/configs/zero-gravitas_defconfig -image=base:v1.3.2 - -build() { +prepare() { + cd "$srcdir" mkdir pkg git init linux + cd linux + git fetch --depth=1 "$_kernelrepo" "$_kernelrev" + git checkout -f "$_kernelrev" + git apply "$srcdir"/fix-multiple-yylloc-definitions.patch +} + +build() { ( cd linux - git fetch --depth=1 "$_kernelrepo" "$_kernelrev" - git checkout -f "$_kernelrev" make mrproper touch .scmversion cp "$_defconfig" .config diff --git a/package/gocryptfs/package b/package/gocryptfs/package index cf2dad6da..2c7965ae1 100644 --- a/package/gocryptfs/package +++ b/package/gocryptfs/package @@ -6,24 +6,16 @@ pkgnames=(gocryptfs) pkgdesc="An encrypted overlay filesystem written in Go." url="https://nuetzlich.net/gocryptfs/" _srcver=2.0-beta2 -pkgver="$_srcver"-1 +pkgver="$_srcver"-2 timestamp=2021-03-22 section=utils maintainer="plan5 <30434574+plan5@users.noreply.github.com>" license=MIT - -makedepends=() installdepends=(fuse fuse-utils) -image=golang:v1.5 - -source=( - https://github.com/rfjakob/gocryptfs/archive/v"$_srcver".zip -) - -sha256sums=( - 3d66368cfc79a300de5a22fe01788d0c702f9107731db63fcd8850157d105cc0 -) +image=golang:v2.1 +source=(https://github.com/rfjakob/gocryptfs/archive/v"$_srcver".zip) +sha256sums=(3d66368cfc79a300de5a22fe01788d0c702f9107731db63fcd8850157d105cc0) prepare() { # Official build script runs compiled binary to show version. diff --git a/package/innernet/package b/package/innernet/package index 8392a9967..d9ae343b4 100644 --- a/package/innernet/package +++ b/package/innernet/package @@ -5,7 +5,7 @@ pkgnames=(innernet-client) pkgdesc="A private network system that uses WireGuard under the hood." url="https://github.com/tonarino/innernet" -pkgver=1.3.1-1 +pkgver=1.3.1-2 timestamp=2021-06-01T12:50:04Z section="utils" maintainer="plan5 <30434574+plan5@users.noreply.github.com>" @@ -13,7 +13,7 @@ license=MIT installdepends=(wireguard) makedepends=(build:librust-clang-sys-dev build:libclang-dev build:libc6 build:libc6-dev build:clang build:gcc-multilib build:g++-multilib) -image=rust:v1.4 +image=rust:v2.1 source=(https://github.com/tonarino/innernet/archive/refs/tags/v1.3.1.zip) sha256sums=(8a58914fa87d2f465b50fe715a7cf0c17fd4ec995469d675005b8b361630424c) diff --git a/package/keywriter/package b/package/keywriter/package index 219edf0aa..bb38c6be8 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.1.0-2 +pkgver=0.1.0-3 timestamp=2019-07-13T06:27Z section="writing" maintainer="Mattéo Delabre " @@ -13,7 +13,7 @@ license=MIT installdepends=(display) flags=(patch_rm2fb) -image=qt:v1.4 +image=qt:v2.1 _sundown=37728fb2d7137ff7c37d0a474cb827a8d6d846d8 source=( https://github.com/dps/remarkable-keywriter/archive/c77ec3f65d9ff769f3f5dc85cc91abbf05aa163f.zip diff --git a/package/libdlib/package b/package/libdlib/package index 18a215be7..76ee546ae 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-1 +pkgver=19.21-2 timestamp=2020-08-08T19:41:07Z section="devel" maintainer="Mattéo Delabre " license=BSL-1.0 -image=base:v1.3.1 +image=base:v2.1 source=("https://github.com/davisking/dlib/archive/v${pkgver%-*}.tar.gz") sha256sums=(116f52e58be04b47dab52057eaad4b5c4d5c3032d927fe23d55b0741fc4107a0) diff --git a/package/libvncserver/package b/package/libvncserver/package index 5e831bd29..2692e2874 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-1 +pkgver=0.9.13-2 timestamp=2020-06-13T19:19:11Z section="devel" maintainer="Mattéo Delabre " license=GPL-2.0-or-later -image=base:v1.3.1 +image=base:v2.1 source=("https://github.com/LibVNC/libvncserver/archive/LibVNCServer-${pkgver%-*}.zip") sha256sums=(d209d70998a9b98f9120eeb82df7a17767796c477eaa8297e0a55856a977c54f) diff --git a/package/oxide/package b/package/oxide/package index ebad75cac..7a6a75dc5 100644 --- a/package/oxide/package +++ b/package/oxide/package @@ -3,15 +3,25 @@ # SPDX-License-Identifier: MIT pkgnames=(erode fret oxide rot tarnish decay) -pkgver=2.1.2-2 +pkgver=2.1.2-3 timestamp=2021-01-07T03:28Z maintainer="Eeems " license=MIT flags=(patch_rm2fb) -image=qt:v1.4 -source=("https://github.com/Eeems/oxide/archive/30aab3456b9f8b37ffb667cbc8b5e2a686f3e98e.tar.gz") -sha256sums=(1ddd7bcd71aa12855348bde72bd0d0e7f91f1b958b054614c02eaa4b99168644) +image=qt:v2.1 +source=( + "https://github.com/Eeems/oxide/archive/30aab3456b9f8b37ffb667cbc8b5e2a686f3e98e.tar.gz" + support-2.6.patch +) +sha256sums=( + 1ddd7bcd71aa12855348bde72bd0d0e7f91f1b958b054614c02eaa4b99168644 + SKIP +) + +prepare() { + patch -d "$srcdir" -p1 < "$srcdir"/support-2.6.patch +} build() { find . -name "*.pro" -type f -print0 \ diff --git a/package/oxide/support-2.6.patch b/package/oxide/support-2.6.patch new file mode 100644 index 000000000..e667cce35 --- /dev/null +++ b/package/oxide/support-2.6.patch @@ -0,0 +1,35 @@ +diff --git a/applications/launcher/main.qml b/applications/launcher/main.qml +index a54f2b8..ada050e 100755 +--- a/applications/launcher/main.qml ++++ b/applications/launcher/main.qml +@@ -34,7 +34,7 @@ ApplicationWindow { + CustomMenu { + BetterMenu { + id: optionsMenu +- title: ""; ++ title: qsTr("") + font: iconFont.name + width: 310 + Action { text: qsTr(" Reload"); onTriggered: appsView.model = controller.getApps() } +@@ -142,7 +142,7 @@ ApplicationWindow { + CustomMenu { + BetterMenu { + id: powerMenu +- title: ""; ++ title: qsTr("") + font: iconFont.name + width: 260 + Action { +diff --git a/applications/lockscreen/main.qml b/applications/lockscreen/main.qml +index e835268..3fd18c1 100644 +--- a/applications/lockscreen/main.qml ++++ b/applications/lockscreen/main.qml +@@ -94,7 +94,7 @@ ApplicationWindow { + CustomMenu { + BetterMenu { + id: powerMenu +- title: ""; ++ title: qsTr(""); + font: iconFont.name + width: 260 + Action { diff --git a/package/plato/package b/package/plato/package index f0b1568d4..b0cbcbf1a 100644 --- a/package/plato/package +++ b/package/plato/package @@ -5,7 +5,7 @@ pkgnames=(plato) pkgdesc="Document reader" url=https://github.com/LinusCDE/plato -pkgver=0.9.17-1 +pkgver=0.9.17-2 timestamp=2021-05-02T14:39Z section="readers" maintainer="Linus K. " @@ -14,7 +14,7 @@ installdepends=(display jq) makedepends=(build:jq build:unzip build:wget) flags=(patch_rm2fb) -image=rust:v1.6 +image=rust:v2.1 source=("https://github.com/LinusCDE/plato/archive/${pkgver%-*}-rm-release-10.zip") sha256sums=(25aae17979d9e259d228617eb26a0cc89a6251968b8fc355b8cde36fd6b26773) diff --git a/package/puzzles/package b/package/puzzles/package index fce3c2839..4a17ade9a 100644 --- a/package/puzzles/package +++ b/package/puzzles/package @@ -5,14 +5,14 @@ pkgnames=(puzzles) timestamp=2021-03-04T14:03-08:00 maintainer="NONE" -pkgver=0.2.2-1 +pkgver=0.2.2-2 license=MIT pkgdesc="Simon Tatham's Puzzle Package" url="https://github.com/mrichards42/remarkable_puzzles" section="games" flags=(patch_rm2fb) -image=python:v1.4 +image=python:v2.1 source=( https://github.com/mrichards42/remarkable_puzzles/releases/download/v0.2.2/puzzles-source.tar.gz puzzles.draft diff --git a/package/quickjs/package b/package/quickjs/package index f71229ec2..78467226b 100644 --- a/package/quickjs/package +++ b/package/quickjs/package @@ -5,13 +5,13 @@ pkgnames=(quickjs) pkgdesc="A small and embeddable Javascript engine" url=https://bellard.org/quickjs/ -pkgver=2020.11.08-1 +pkgver=2020.11.08-2 section="devel" timestamp=2020-11-08T13:44Z maintainer="khanhas " license=MIT -image=base:v1.3.2 +image=base:v2.1 source=( https://bellard.org/quickjs/quickjs-2020-11-08.tar.xz quickjs.patch diff --git a/package/recrossable/package b/package/recrossable/package index 0c11ac7c3..7b191353b 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-6 +pkgver=0.0.0-7 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:v1.4 +image=qt:v2.1 source=( https://github.com/sandsmark/recrossable/archive/234d5744c0b20087a588d0ecead0a9f58c1f323d.zip recrossable.draft diff --git a/package/remarkable-splash/package b/package/remarkable-splash/package index 39a264e10..a951fc90b 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-4 +pkgver=1.0-5 timestamp=2019-12-31T10:07Z section="utils" maintainer="Eeems " @@ -13,7 +13,7 @@ license=MIT installdepends=(display) flags=(patch_rm2fb) -image=qt:v1.4 +image=qt:v2.1 source=(https://github.com/ddvk/remarkable-splash/archive/e6e0b1e1f3604ab99fb7b476cd290b19c5644025.zip) sha256sums=(4aa3988707f9b66752ec9ec2f407cce2ac6e433ae7f06affea9f26957d206b4a) diff --git a/package/restream/package b/package/restream/package index 9b2d63416..bae5968e0 100644 --- a/package/restream/package +++ b/package/restream/package @@ -5,12 +5,13 @@ pkgnames=(restream) pkgdesc="Binary framebuffer capture tool for the reStream script" url=https://github.com/rien/reStream -pkgver=1.1-1 +pkgver=1.1-2 timestamp=2021-01-28T23:25:40Z section="screensharing" maintainer="Dan Shick " license=MIT -image=rust:v1.3 + +image=rust:v2.1 source=("https://github.com/rien/reStream/archive/${pkgver%-*}.tar.gz") sha256sums=(89fa4c8adfcdfb5266e11d1f8ed4c5d8dac12a68a7ee5622cf21f833bca1704f) diff --git a/package/retris/package b/package/retris/package index 77858643d..173b5d8ba 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-2 +pkgver=0.6.3-3 timestamp=2021-01-30T02:41Z section="games" maintainer="Linus K. " @@ -13,7 +13,7 @@ license=MIT installdepends=(display) flags=(patch_rm2fb) -image=rust:v1.4 +image=rust:v2.1 source=(https://github.com/LinusCDE/retris/archive/0.6.3-1.zip) sha256sums=(ecc7215098c03e79cd92b1835626e6739a5a932d5aa709899d183347e2a4108e) diff --git a/package/rmkit/package b/package/rmkit/package index 0667586df..4733a81ca 100644 --- a/package/rmkit/package +++ b/package/rmkit/package @@ -9,7 +9,7 @@ license=MIT installdepends=(display) flags=(patch_rm2fb) -image=python:v1.1 +image=python:v2.1 source=( https://github.com/rmkit-dev/rmkit/archive/a99b2f70c72539bedc1d201e3899da6e19c197da.zip patch-remux-duplicate-xochitl.diff @@ -36,7 +36,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.0-4 + pkgver=0.1.0-5 section="utils" package() { @@ -47,7 +47,7 @@ bufshot() { genie() { pkgdesc="Gesture engine that connects commands to gestures" url="https://rmkit.dev/apps/genie" - pkgver=0.1.5-2 + pkgver=0.1.5-3 section="utils" package() { @@ -74,7 +74,7 @@ genie() { harmony() { pkgdesc="Procedural sketching app" url="https://rmkit.dev/apps/harmony" - pkgver=0.1.3-2 + pkgver=0.1.3-3 section="drawing" package() { @@ -91,7 +91,7 @@ harmony() { iago() { pkgdesc="overlay for drawing shapes via stroke injection" url="https://rmkit.dev/apps/iago" - pkgver=0.1.0-3 + pkgver=0.1.0-4 section="utils" installdepends+=("lamp") @@ -103,7 +103,7 @@ iago() { lamp() { pkgdesc="config based stroke injection utility" url="https://rmkit.dev/apps/lamp" - pkgver=0.1.0-3 + pkgver=0.1.0-4 section="utils" package() { @@ -114,7 +114,7 @@ lamp() { mines() { pkgdesc="Mine detection game" url="https://rmkit.dev/apps/minesweeper" - pkgver=0.1.2-3 + pkgver=0.1.2-4 section="games" package() { @@ -127,7 +127,7 @@ mines() { nao() { pkgdesc="Nao Package Manager: opkg UI built with SAS" url="https://rmkit.dev/apps/nao" - pkgver=0.1.2-2 + pkgver=0.1.2-3 section="admin" installdepends+=(simple) @@ -141,7 +141,7 @@ nao() { remux() { pkgdesc="Launcher that supports multi-tasking applications" url="https://rmkit.dev/apps/remux" - pkgver=0.1.9-2 + pkgver=0.1.9-3 section="launchers" package() { @@ -173,7 +173,7 @@ remux() { simple() { pkgdesc="Simple app script for writing scripted applications" url="https://rmkit.dev/apps/sas" - pkgver=0.1.4-2 + pkgver=0.1.4-3 section="devel" package() { diff --git a/package/rmservewacominput/package b/package/rmservewacominput/package index aafa9d848..2c558e13f 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-1 +pkgver=0.3.0-2 timestamp=2021-03-10T18:36Z section="utils" maintainer="Linus K. " license=MIT installdepends=(appmarkable) -image=base:v1.4 +image=base:v2.1 source=( https://github.com/LinusCDE/rmWacomToMouse/archive/fd1c5454b65f456f6e890b99109e50a8f576dad1.zip rmservewacominput.draft diff --git a/package/templatectl/package b/package/templatectl/package index eb1e2f095..ee2374bef 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-2 +pkgver=0.1.3-3 timestamp=2021-01-15T01:23Z section="templates" maintainer="Peter Grace " license=MIT -image=rust:v1.2.2 +image=rust:v2.1 source=("https://github.com/PeterGrace/templatectl/archive/v${pkgver%-*}.zip") sha256sums=(1ac1049c7db4f87c113dbc96372f8f4e2b8bd4c60252e3c4f7c1fafb5ee61ae4) diff --git a/package/toltec-completion/package b/package/toltec-completion/package index 662077d52..d2670f2ad 100644 --- a/package/toltec-completion/package +++ b/package/toltec-completion/package @@ -5,7 +5,7 @@ pkgnames=(toltec-completion) pkgdesc="Expands bash-completion with functions for toltec-specific commands" url=https://github.com/toltec-dev/toltec -pkgver=0.1.0-2 +pkgver=0.1.0-3 timestamp=2021-02-07T13:47Z section="utils" maintainer="Linus K. " diff --git a/package/vnsee/package b/package/vnsee/package index fcd10952a..32772d678 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.0-1 +pkgver=0.4.0-2 timestamp=2021-04-24T20:36:31Z 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:v1.4 +image=base:v2.1 _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 cbe57195c..a7c44adf6 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-2 +pkgver=0.1.0-3 timestamp=2021-03-11T04:50Z section="readers" maintainer="David Singleton " @@ -13,7 +13,7 @@ license=MIT installdepends=(display) flags=(patch_rm2fb) -image=qt:v1.4 +image=qt:v2.1 source=( https://github.com/dps/remarkable-wikipedia/archive/eb00876ef49e7deedc127bc6c1486e3ed13aedcc.zip wikipedia.draft diff --git a/package/wireguard/fix-multiple-yylloc-definitions.patch b/package/wireguard/fix-multiple-yylloc-definitions.patch new file mode 100644 index 000000000..b3a63303c --- /dev/null +++ b/package/wireguard/fix-multiple-yylloc-definitions.patch @@ -0,0 +1,26 @@ +diff --git a/scripts/dtc/dtc-lexer.l b/scripts/dtc/dtc-lexer.l +index 790fbf6c..e7eab4d7 100644 +--- a/scripts/dtc/dtc-lexer.l ++++ b/scripts/dtc/dtc-lexer.l +@@ -38,7 +38,7 @@ LINECOMMENT "//".*\n + #include "srcpos.h" + #include "dtc-parser.tab.h" + +-YYLTYPE yylloc; ++extern YYLTYPE yylloc; + extern bool treesource_error; + + /* CAUTION: this will stop working if we ever use yyless() or yyunput() */ +diff --git a/scripts/dtc/dtc-lexer.lex.c_shipped b/scripts/dtc/dtc-lexer.lex.c_shipped +index ba525c2f..a2fe8dbc 100644 +--- a/scripts/dtc/dtc-lexer.lex.c_shipped ++++ b/scripts/dtc/dtc-lexer.lex.c_shipped +@@ -637,7 +637,7 @@ char *yytext; + #include "srcpos.h" + #include "dtc-parser.tab.h" + +-YYLTYPE yylloc; ++extern YYLTYPE yylloc; + extern bool treesource_error; + + /* CAUTION: this will stop working if we ever use yyless() or yyunput() */ diff --git a/package/wireguard/package b/package/wireguard/package index 5ebbc296d..7d52d75f8 100755 --- a/package/wireguard/package +++ b/package/wireguard/package @@ -5,7 +5,7 @@ pkgnames=(wireguard) pkgdesc="Fast, modern, secure VPN tunnel" url=https://www.wireguard.com -pkgver=1.0.20210219-1 +pkgver=1.0.20210219-2 _wireguardtoolsver=1.0.20210223 timestamp=2021-02-19T14:08Z section=utils @@ -24,15 +24,17 @@ _defconfigs=( arch/arm/configs/zero-sugar_defconfig ) -image=base:v1.3.2 +image=base:v2.1 source=( "https://git.zx2c4.com/wireguard-linux-compat/snapshot/wireguard-linux-compat-${pkgver%-*}.tar.xz" "https://git.zx2c4.com/wireguard-tools/snapshot/wireguard-tools-${_wireguardtoolsver}.tar.xz" + fix-multiple-yylloc-definitions.patch ) noextract=("wireguard-tools-${_wireguardtoolsver}.tar.xz") sha256sums=( 99d35296b8d847a0d4db97a4dda96b464311a6354e75fe0bef6e7c4578690f00 1f72da217044622d79e0bab57779e136a3df795e3761a3fc1dc0941a9055877c + SKIP ) prepare() { @@ -54,6 +56,7 @@ build() { cd linux git fetch --depth=1 "$_kernelrepo" "${_kernelrevs[$i]}" git checkout -f "${_kernelrevs[$i]}" + git apply "$srcdir"/fix-multiple-yylloc-definitions.patch || true make mrproper touch .scmversion cp "${_defconfigs[$i]}" .config diff --git a/package/yaft/package b/package/yaft/package index c164167bf..73f1dd1f7 100644 --- a/package/yaft/package +++ b/package/yaft/package @@ -5,12 +5,12 @@ pkgnames=(yaft) pkgdesc="Yet another framebuffer terminal" url=https://github.com/timower/rM2-stuff/tree/master/apps/yaft -pkgver=0.0.4-2 +pkgver=0.0.4-3 timestamp=2021-04-30T10:42Z maintainer="None " license=GPL-3.0 section="admin" -image=base:v1.6 +image=base:v2.1 source=(https://github.com/timower/rM2-stuff/archive/refs/tags/v0.0.4.tar.gz) sha256sums=(dee471ac19ea43ba741f826c9a0a17d7a01bda6472043d400fbcab6fad1931fe) diff --git a/package/zoneinfo-utils/package b/package/zoneinfo-utils/package index 44215d5e6..f31bd7eb8 100644 --- a/package/zoneinfo-utils/package +++ b/package/zoneinfo-utils/package @@ -8,15 +8,15 @@ pkgnames=(zoneinfo-utils) pkgdesc="Utilities for interacting with zoneinfo files" url=https://www.iana.org/time-zones _tzver=2021a -pkgver="$_tzver"-1 +pkgver="$_tzver"-2 timestamp=2020-05-04T06:16Z section=utils maintainer="Eeems " license="custom: public domain" installdepends=(zoneinfo-core) makedepends=(build:gawk) -image=base:v1.3.2 +image=base:v2.1 source=( "https://www.iana.org/time-zones/repository/releases/tzcode${_tzver}.tar.gz" "https://www.iana.org/time-zones/repository/releases/tzdata${_tzver}.tar.gz" diff --git a/package/zshelf/package b/package/zshelf/package index c429f7ece..bd1491464 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-2 +pkgver=0.3.1-3 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:v1.4 +image=qt:v2.1 source=( https://github.com/khanhas/zshelf/archive/v0.3.1.zip zshelf.draft