Skip to content

Commit f0954b4

Browse files
EeemsrM-self-serveNeilInnes
authored
Stable merge for week 10 of 2023 (#667)
* Update KOReader to v2022.11 (#659) * Update oxide to v2.5 (#662) Update the following applications to 2.5: - erode - fret - oxide - rot - tarnish - decay - corrupt - anxiety - liboxide Update libsentry to 0.5.0 Add new notify-send package * Add package: webinterface-wifi (#664) * Add package: webinterface-wifi --------- Co-authored-by: Nathaniel van Diepen <[email protected]> * Add package: neofetch (#665) * Update KOReader to v2023.01 (#663) * Update display and rm2fb-client to v0.0.29 (#656) * Update display and rm2fb-client to v0.0.28 Fixes bug with Remarkable desktop app screen share freezing (ddvk/remarkable2-framebuffer#71) * Update rm2fb to v0.0.29 --------- Co-authored-by: Nathaniel van Diepen <[email protected]> * Update rm2fb to v0.0.30 (#666) Fix crash due to invalid notify address for 3.0.4.1305. --------- Co-authored-by: rM-self-serve <[email protected]> Co-authored-by: Neil Innes <[email protected]>
1 parent a6baac2 commit f0954b4

File tree

6 files changed

+117
-12
lines changed

6 files changed

+117
-12
lines changed

‎package/display/package‎

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

55
archs=(rm1 rm2)
66
pkgnames=(display rm2fb-client)
7-
timestamp=2022-10-28T15:36:16Z
7+
timestamp=2023-02-20T15:49:05Z
88
maintainer="raisjn <[email protected]>"
99
license=MIT
1010
url="https://github.com/ddvk/remarkable2-framebuffer"
11-
pkgver=1:0.0.27-1
11+
pkgver=1:0.0.30-1
1212
_release="${pkgver%-*}"
1313
_release="v${_release#*:}"
1414
_libver=1.0.1
@@ -23,7 +23,7 @@ source=(
2323
rm2fb-preload.env
2424
)
2525
sha256sums=(
26-
f4bf553f2bc868a04452f67881d7a1053f791da7d29fecbb2c5fc4075facf282
26+
bbd2acf8bc7d15082307c362985980e78cf1b48a69799aa602cf7dc3973339c7
2727
SKIP
2828
SKIP
2929
SKIP

‎package/koreader/package‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
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=2022.10-1
8+
pkgver=2023.01-1
99
timestamp=2022-07-31T13:31:10Z
1010
section="readers"
1111
maintainer="raisjn <[email protected]>"
@@ -21,7 +21,7 @@ source=(
2121
koreader
2222
)
2323
sha256sums=(
24-
29a477028079aeaaf669c9e31f5d3f5f3c492e19695642f3f49be0ea12d25bc4
24+
f052d01e9be9c65883e1f8c00bae87b37ba6e47d3bf7b9bbbd746f58acc640c2
2525
SKIP
2626
SKIP
2727
SKIP

‎package/neofetch/package‎

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,24 @@
1+
#!/usr/bin/env bash
2+
# Copyright (c) 2021 The Toltec Contributors
3+
# SPDX-License-Identifier: MIT
4+
5+
pkgnames=(neofetch)
6+
pkgdesc="A command-line system information tool"
7+
url="https://github.com/rM-self-serve/neofetch-rM"
8+
pkgver=0.0.0-1
9+
timestamp=2023-02-09T11:43:00Z
10+
section="utils"
11+
maintainer="rM-self-serve <[email protected]>"
12+
license=MIT
13+
14+
source=(
15+
https://github.com/rM-self-serve/neofetch-rM/archive/c497597ba4b481042cbb48b7c2c55e45dda25543.zip
16+
)
17+
18+
sha256sums=(
19+
06492898eac6fb4f2cc95ca52c65f8f4f580ada57b4fe433722dabeae884b633
20+
)
21+
22+
package() {
23+
install -D -m 755 -t "$pkgdir"/opt/bin "$srcdir"/neofetch
24+
}

‎package/oxide/package‎

Lines changed: 17 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -2,21 +2,21 @@
22
# Copyright (c) 2021 The Toltec Contributors
33
# SPDX-License-Identifier: MIT
44

5-
pkgnames=(erode fret oxide rot tarnish decay corrupt anxiety liboxide libsentry)
6-
pkgver=2.4-2
7-
_sentryver=0.4.17
8-
timestamp=2022-05-22T03:18:32Z
5+
pkgnames=(erode fret oxide rot tarnish decay corrupt anxiety liboxide libsentry notify-send)
6+
pkgver=2.5-1
7+
_sentryver=0.5.0
8+
timestamp=2023-01-26T22:52:14Z
99
maintainer="Eeems <[email protected]>"
1010
url=https://oxide.eeems.codes
1111
license=MIT
1212
flags=(patch_rm2fb)
1313
image=qt:v2.3
1414
source=(
15-
"https://github.com/Eeems-Org/oxide/archive/e6c62a6860b52cd1cbd47e21377f8d1ecf72bb0a.tar.gz"
15+
"https://github.com/Eeems-Org/oxide/archive/refs/tags/v2.5.zip"
1616
toltec-override.conf
1717
)
1818
sha256sums=(
19-
a29cf455d5f66fee4ee67722c6f1d20627930920286398932c3d5c813d58ebee
19+
07bfb84e5adaebdebd2ce55b22f3764a1d4887c2b18364f5ec1053f171e3ecbe
2020
SKIP
2121
)
2222

@@ -159,9 +159,19 @@ libsentry() {
159159
section=devel
160160
url=https://github.com/getsentry/sentry-native
161161
pkgver="$_sentryver"
162-
timestamp="2021-12-20T14:25:11Z"
162+
timestamp="2022-08-02T14:40:22Z"
163163

164164
package() {
165165
install -D -m 755 -t "$pkgdir"/opt/lib "$srcdir"/release/opt/lib/libsentry.so
166166
}
167167
}
168+
169+
notify-send() {
170+
pkgdesc="A program to send desktop notifications for Oxide"
171+
section=utils
172+
installdepends=("tarnish=$pkgver" "liboxide=$pkgver" "libsentry=$_sentryver")
173+
174+
package() {
175+
install -D -m 755 -t "$pkgdir"/opt/bin "$srcdir"/release/opt/bin/notify-send
176+
}
177+
}

‎package/webinterface-wifi/package‎

Lines changed: 57 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,57 @@
1+
#!/usr/bin/env bash
2+
# Copyright (c) 2020 The Toltec Contributors
3+
# SPDX-License-Identifier: MIT
4+
5+
pkgnames=(webinterface-wifi)
6+
pkgdesc="View the web interface if running, over wifi"
7+
url="https://github.com/rM-self-serve/webinterface-wifi"
8+
pkgver=1.0.2-1
9+
timestamp=2023-02-06T12:23:17Z
10+
section="utils"
11+
maintainer="rM-self-serve <[email protected]>"
12+
license=MIT
13+
14+
image=rust:v2.3
15+
16+
source=(
17+
https://github.com/rM-self-serve/webinterface-wifi/archive/2e29855303a0806ee51e71bc836bc4b16204fa14.zip
18+
webinterface-wifi-toltec.service
19+
)
20+
21+
sha256sums=(
22+
629bab244a387086ce2a8f8118b8d1017cf993bf97b13da72573f52572ed526e
23+
SKIP
24+
)
25+
26+
build() {
27+
RUSTFLAGS="-Zcrate-attr=feature(const_fn_trait_bound)" cargo build --release
28+
}
29+
30+
package() {
31+
install -D -m 755 -t "$pkgdir"/opt/bin \
32+
"$srcdir"/target/armv7-unknown-linux-gnueabihf/release/webinterface-wifi
33+
install -D -m 644 "$srcdir"/webinterface-wifi-toltec.service "$pkgdir"/lib/systemd/system/webinterface-wifi.service
34+
}
35+
36+
configure() {
37+
systemctl daemon-reload
38+
39+
echo ""
40+
echo "Run the following command to use $pkgname"
41+
how-to-enable "$pkgname.service"
42+
}
43+
44+
preremove() {
45+
if is-active "$pkgname"; then
46+
echo "Stopping $pkgname"
47+
systemctl stop "$pkgname"
48+
fi
49+
if is-enabled "$pkgname"; then
50+
echo "Disabling $pkgname"
51+
systemctl disable "$pkgname"
52+
fi
53+
}
54+
55+
postremove() {
56+
systemctl daemon-reload
57+
}

‎package/webinterface-wifi/webinterface-wifi-toltec.service‎

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
[Unit]
2+
Description=View the web interface if running, over wifi
3+
StartLimitIntervalSec=600
4+
StartLimitBurst=4
5+
After=home.mount
6+
7+
[Service]
8+
Environment=HOME=/home/root
9+
Type=simple
10+
ExecStart=/opt/bin/webinterface-wifi --run 80
11+
Restart=on-failure
12+
13+
[Install]
14+
WantedBy=multi-user.target

0 commit comments

Comments
 (0)