Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update packages for release 2.6 and onwards #366

Merged
merged 10 commits into from
Jul 9, 2021
4 changes: 2 additions & 2 deletions package/appmarkable/package
Original file line number Diff line number Diff line change
Expand Up @@ -5,15 +5,15 @@
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. <[email protected]>"
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)

Expand Down
4 changes: 2 additions & 2 deletions package/bash-completion/package
Original file line number Diff line number Diff line change
Expand Up @@ -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. <[email protected]>"
Expand All @@ -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)

Expand Down
4 changes: 2 additions & 2 deletions package/calculator/package
Original file line number Diff line number Diff line change
Expand Up @@ -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 <[email protected]>"
Expand All @@ -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
Expand Down
4 changes: 2 additions & 2 deletions package/chessmarkable/package
Original file line number Diff line number Diff line change
Expand Up @@ -5,15 +5,15 @@
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. <[email protected]>"
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)

Expand Down
4 changes: 2 additions & 2 deletions package/display/package
Original file line number Diff line number Diff line change
Expand Up @@ -8,10 +8,10 @@ timestamp=2021-02-21T01:41+00:00
maintainer="raisjn <[email protected]>"
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
Expand Down
4 changes: 2 additions & 2 deletions package/draft/package
Original file line number Diff line number Diff line change
Expand Up @@ -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-19
pkgver=0.2.0-20
timestamp=2020-07-20T10:23Z
section="launchers"
maintainer="Mattéo Delabre <[email protected]>"
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
Expand Down
4 changes: 2 additions & 2 deletions package/evtest/package
Original file line number Diff line number Diff line change
Expand Up @@ -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. <[email protected]>"
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)

Expand Down
4 changes: 2 additions & 2 deletions package/fbink/package
Original file line number Diff line number Diff line change
Expand Up @@ -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 <[email protected]>"
license=GPL-3.0

image=base:v1.2.1
image=base:v2.1
source=()
sha256sums=()

Expand Down
4 changes: 2 additions & 2 deletions package/fingerterm/package
Original file line number Diff line number Diff line change
Expand Up @@ -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-13
pkgver=1.3.5-14
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:v1.4
image=qt:v2.1
source=(
https://github.com/dixonary/fingerterm-reMarkable/archive/02c17b5b485743c698e005ca89366c32b66aa044.zip
fingerterm.png
Expand Down
26 changes: 26 additions & 0 deletions package/fuse/fix-multiple-yylloc-definitions.patch
Original file line number Diff line number Diff line change
@@ -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() */
20 changes: 14 additions & 6 deletions package/fuse/package
Original file line number Diff line number Diff line change
Expand Up @@ -6,27 +6,35 @@ 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 <[email protected]>"
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
Expand Down
16 changes: 4 additions & 12 deletions package/gocryptfs/package
Original file line number Diff line number Diff line change
Expand Up @@ -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 <[email protected]>"
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.
Expand Down
4 changes: 2 additions & 2 deletions package/innernet/package
Original file line number Diff line number Diff line change
Expand Up @@ -5,15 +5,15 @@
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 <[email protected]>"
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)

Expand Down
4 changes: 2 additions & 2 deletions package/keywriter/package
Original file line number Diff line number Diff line change
Expand Up @@ -5,15 +5,15 @@
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 <[email protected]>"
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
Expand Down
4 changes: 2 additions & 2 deletions package/libdlib/package
Original file line number Diff line number Diff line change
Expand Up @@ -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 <[email protected]>"
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)

Expand Down
4 changes: 2 additions & 2 deletions package/libvncserver/package
Original file line number Diff line number Diff line change
Expand Up @@ -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 <[email protected]>"
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)

Expand Down
18 changes: 14 additions & 4 deletions package/oxide/package
Original file line number Diff line number Diff line change
Expand Up @@ -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 <[email protected]>"
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 \
Expand Down
35 changes: 35 additions & 0 deletions package/oxide/support-2.6.patch
Original file line number Diff line number Diff line change
@@ -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 {
Loading