Skip to content

Commit 9c1aa92

Browse files
EeemsEeems
authored
Stable merge for week 30 of 2023 (#710)
### New Packages - `tailscale-systemd` - 0.0.0-1 (#706) - Necessary configuration for tailscale to work on the reMarkable - `7zip` - 22.01-1 (#699) ### Updated Packages - `koreader` - 2023.06-1 (#696 #705) - `plato` - 0.9.34-1 (#669) - `erode` `fret` `oxide` `rot` `tarnish` `decay` `corrupt` `anxiety` `liboxide` `notify-send` - 2.5-2 (#697) - Remove rm2fb runtime dependency for reMarkable 1 devices
1 parent f559516 commit 9c1aa92

9 files changed

Lines changed: 122 additions & 27 deletions

File tree

‎package/7zip/package‎

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
1+
#!/usr/bin/env bash
2+
# Copyright (c) 2021 The Toltec Contributors
3+
# SPDX-License-Identifier: MIT
4+
pkgnames=(7zip)
5+
pkgdesc="A file archiver with a high compression ratio."
6+
url="https://www.7-zip.org/"
7+
section="util"
8+
pkgver=22.01-1
9+
timestamp=2022-07-15T00:00:00Z
10+
maintainer="Eeems <eeems@eeems.email>"
11+
license=LGPL-2.1-or-later
12+
source=(
13+
https://www.7-zip.org/a/7z2201-linux-arm.tar.xz
14+
)
15+
sha256sums=(
16+
428c11efd91fe1809c4750e8cd5d6eddfbed2826d8a5399ffcacb849f0d21cf8
17+
)
18+
19+
package() {
20+
install -dm 755 "$pkgdir"/opt/usr/share/licenses/7zip
21+
install -D -m 755 -t "$pkgdir"/opt/bin "$srcdir"/7zz
22+
cp -dr --no-preserve='ownership' "$srcdir"/License.txt "$pkgdir"/opt/usr/share/licenses/7zip
23+
}

‎package/koreader/package‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@
55
pkgnames=(koreader)
66
pkgdesc="Ebook reader supporting PDF, DjVu, EPUB, FB2 and many more formats"
77
url=https://github.com/koreader/koreader
8-
pkgver=2023.04-1
9-
timestamp=2023-04-27T20:53:54Z
8+
pkgver=2023.06.1-1
9+
timestamp=2023-07-09T08:17:26Z
1010
section="readers"
1111
maintainer="raisjn <of.raisjn@gmail.com>"
1212
license=AGPL-3.0-or-later
@@ -21,7 +21,7 @@ source=(
2121
koreader
2222
)
2323
sha256sums=(
24-
7149beb95ee561c488491d723acbb2c641c99733abc1036de7064241a5f32813
24+
a24f334983060b5cfee7b87484529b77fe4adffd646e8fd55447750e73309ef0
2525
SKIP
2626
SKIP
2727
SKIP

‎package/oxide/package‎

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
# SPDX-License-Identifier: MIT
44

55
pkgnames=(erode fret oxide rot tarnish decay corrupt anxiety liboxide libsentry notify-send)
6-
pkgver=2.5-1
6+
pkgver=2.5-2
77
_sentryver=0.5.0
88
timestamp=2023-01-26T22:52:14Z
99
maintainer="Eeems <eeems@eeems.email>"
@@ -13,7 +13,7 @@ flags=(patch_rm2fb)
1313
image=qt:v2.3
1414
source=(
1515
"https://github.com/Eeems-Org/oxide/archive/refs/tags/v2.5.zip"
16-
toltec-override.conf
16+
toltec-rm2-override.conf
1717
)
1818
sha256sums=(
1919
07bfb84e5adaebdebd2ce55b22f3764a1d4887c2b18364f5ec1053f171e3ecbe
@@ -90,8 +90,10 @@ tarnish() {
9090
install -D -m 644 -t "$pkgdir"/etc/dbus-1/system.d "$srcdir"/release/etc/dbus-1/system.d/codes.eeems.oxide.conf
9191
install -D -m 644 -t "$pkgdir"/lib/systemd/system "$srcdir"/release/etc/systemd/system/tarnish.service
9292
install -D -m 755 -t "$pkgdir"/opt/bin "$srcdir"/release/opt/bin/tarnish
93-
install -D -m 644 -t "$pkgdir"/etc/systemd/system/tarnish.service.d \
94-
"$srcdir"/toltec-override.conf
93+
if [[ $arch = rm2 ]]; then
94+
install -D -m 644 -t "$pkgdir"/etc/systemd/system/tarnish.service.d \
95+
"$srcdir"/toltec-rm2-override.conf
96+
fi
9597
}
9698
configure() {
9799
systemctl daemon-reload

‎package/oxide/toltec-override.conf‎

Lines changed: 0 additions & 6 deletions
This file was deleted.

‎package/oxide/toltec-rm2-override.conf‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
# Copyright (c) 2023 The Toltec Contributors
2+
# SPDX-License-Identifier: MIT
3+
4+
[Unit]
5+
After=rm2fb.service
6+
Requires=rm2fb.service
7+
OnFailure=xochitl.service

‎package/plato/package‎

Lines changed: 10 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -5,32 +5,31 @@
55
pkgnames=(plato)
66
pkgdesc="Document reader"
77
url=https://github.com/LinusCDE/plato
8-
pkgver=0.9.25-2
9-
timestamp=2022-02-08T23:54Z
8+
pkgver=0.9.34-1
9+
timestamp=2023-03-08T17:58Z
1010
section="readers"
1111
maintainer="Linus K. <linus@cosmos-ink.net>"
1212
license=AGPL-3.0-or-later
1313
installdepends=(display jq)
14-
makedepends=(build:jq build:unzip build:wget)
14+
makedepends=(build:jq build:unzip build:wget build:patchelf)
1515
flags=(patch_rm2fb)
1616

17-
image=rust:v2.2.2
18-
source=("https://github.com/LinusCDE/plato/archive/${pkgver%-*}-rm-release-12.zip")
19-
sha256sums=(42e18e882e7e6853e299234a44eea9b9e3c4170076eec0577a0644dcf7005cf9)
17+
image=rust:v2.3.1
18+
source=("https://github.com/LinusCDE/plato/archive/${pkgver%-*}-rm-release-13.zip")
19+
sha256sums=(82ef5786704ecdb4fe11ce16e7e4ae10b518a592965c292977bb33962c891d48)
2020

2121
build() {
22-
# Fall back to system-wide config
23-
rm .cargo/config
24-
2522
# 'cargo pkgid' seems to output something different with most
2623
# recent nightly builds. This adjusts the filtering.
27-
sed -i "s/version=.*$/version=\'$(cargo pkgid | cut -d "#" -f 2 | cut -d ":" -f 2)\'/g" download.sh
24+
sed -i "s/version=.*$/version=\'$(cargo pkgid -p plato | cut -d "#" -f 2 | cut -d ":" -f 2)\'/g" download.sh
25+
26+
# Temporary fix until next release (TODO: Remove for next released version as included with commit fbfaf3d7)
27+
sed -i "s/--target=arm-unknown-linux-gnueabihf/--target=armv7-unknown-linux-gnueabihf/g" build.sh
2828

2929
# Use our toolchain
3030
export AR=arm-linux-gnueabihf-ar
3131
export CC=arm-linux-gnueabihf-gcc
3232
export STRIP=arm-linux-gnueabihf-strip
33-
sed -i '/source \/usr\/local\/oecore-x86_64/d' src/mupdf_wrapper/build-kobo.sh
3433

3534
# Compile all to dist/
3635
./clean.sh

‎package/rmfm/package‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,16 +4,16 @@
44

55
pkgnames=(rmfm)
66
pkgdesc="Bare-bones file manager using Node.js and sas"
7-
url="https://codeberg.org/sun/rmFM"
8-
pkgver=1.4.0-2
7+
url="https://forgejo.sny.sh/sun/rmFM"
8+
pkgver=1.4.0-3
99
timestamp=2022-08-19T11:20:10+02:00
1010
section=utils
1111
maintainer="Sunny <roesch.eric@protonmail.com>"
1212
license=MIT
1313
installdepends=(node simple)
1414

1515
source=(
16-
https://codeberg.org/sun/rmFM/archive/1.4.0.zip
16+
https://forgejo.sny.sh/sun/rmFM/archive/1.4.0.zip
1717
path_fix.patch
1818
)
1919
sha256sums=(

‎package/tailscale-systemd/package‎

Lines changed: 46 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,46 @@
1+
#!/usr/bin/env bash
2+
# Copyright (c) 2020 The Toltec Contributors
3+
# SPDX-License-Identifier: MIT
4+
5+
pkgnames=(tailscale-systemd)
6+
pkgdesc="SystemD configuration for tailscale"
7+
url=https://tailscale.com
8+
pkgver=0.0.0-1
9+
section="utils"
10+
timestamp=2023-07-12T00:00Z
11+
maintainer="Kai <z@kwi.li>"
12+
license="BSD 3-Clause"
13+
installdepends=(tailscale)
14+
15+
source=(
16+
tailscaled.service
17+
)
18+
sha256sums=(
19+
SKIP
20+
)
21+
22+
package() {
23+
install -D -m 644 -t "$pkgdir"/etc/systemd/system "$srcdir"/tailscaled.service
24+
}
25+
26+
configure() {
27+
systemctl daemon-reload
28+
systemctl enable tailscaled
29+
systemctl start tailscaled
30+
}
31+
32+
preremove() {
33+
if is-active tailscaled; then
34+
echo "Stopping tailscaled"
35+
systemctl stop tailscaled
36+
fi
37+
38+
if is-enabled tailscaled; then
39+
echo "Disabling tailscaled"
40+
systemctl disable tailscaled
41+
fi
42+
}
43+
44+
postremove() {
45+
systemctl daemon-reload
46+
}

‎package/tailscale-systemd/tailscaled.service‎

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,24 @@
1+
[Unit]
2+
Description=Tailscale node agent
3+
Documentation=https://tailscale.com/kb/
4+
Wants=network-pre.target
5+
After=network-pre.target
6+
7+
[Service]
8+
Environment="HOME=/home/root"
9+
ExecStartPre=/opt/bin/tailscaled --cleanup
10+
ExecStart=/opt/bin/tailscaled --state=/opt/var/lib/tailscale/tailscaled.state --socket=/opt/var/run/tailscale/tailscaled.sock --tun=userspace-networking --socks5-server=localhost:1055 --outbound-http-proxy-listen=localhost:1055
11+
ExecStopPost=/opt/bin/tailscaled --cleanup
12+
13+
Restart=on-failure
14+
15+
RuntimeDirectory=tailscale
16+
RuntimeDirectoryMode=0755
17+
StateDirectory=tailscale
18+
StateDirectoryMode=0700
19+
CacheDirectory=tailscale
20+
CacheDirectoryMode=0750
21+
Type=notify
22+
23+
[Install]
24+
WantedBy=multi-user.target

0 commit comments

Comments
 (0)