Skip to content

Commit 231fc3a

Browse files
authored
Stable merge window for week 47 of 2023 (#754)
### New Packages - `template-daily-planner`, `template-weekly-planner`, `template-journal`, `template-meeting-notes`, `template-smart-goals`, and `template-good-time-journal` - 0.0.0-1 (#712) - `splashscreen-starting-wavey-lines`, `splashscreen-suspended-wavey-lines`, `splashscreen-poweroff-gallifreyan`, `splashscreen-suspended-gallifreyan`, `splashscreen-suspended-gallifreyan-dark`, `splashscreen-starting-gallifreyan`, `splashscreen-suspended-gallifreyan-2`, `splashscreen-suspended-flower-pause`, `splashscreen-batteryempty-barnsley_fern`, `splashscreen-poweroff-barnsley_fern`, `splashscreen-starting-barnsley_fern`, `splashscreen-suspended-barnsley_fern`, `splashscreen-batteryempty-chaotic_ribbon`, `splashscreen-poweroff-chaotic_ribbon`, `splashscreen-starting-chaotic_ribbon`, `splashscreen-suspended-chaotic_ribbon`, `splashscreen-batteryempty-collatz_sea_weed`, `splashscreen-poweroff-collatz_sea_weed`, `splashscreen-starting-collatz_sea_weed`, `splashscreen-suspended-collatz_sea_weed`, `splashscreen-batteryempty-dragon_curve`, `splashscreen-poweroff-dragon_curve`, `splashscreen-starting-dragon_curve`, `splashscreen-suspended-dragon_curve`, `splashscreen-batteryempty-fire`, `splashscreen-poweroff-fire`, `splashscreen-starting-fire`, `splashscreen-suspended-fire`, `splashscreen-batteryempty-fractal_tree`, `splashscreen-poweroff-fractal_tree`, `splashscreen-starting-fractal_tree`, `splashscreen-suspended-fractal_tree`, `splashscreen-batteryempty-sacks_spiral`, `splashscreen-poweroff-sacks_spiral`, `splashscreen-starting-sacks_spiral`, `splashscreen-suspended-sacks_spiral`, `splashscreen-batteryempty-sierpinski_triangle`, `splashscreen-poweroff-sierpinski_triangle`, `splashscreen-starting-sierpinski_triangle`, `splashscreen-suspended-sierpinski_triangle`, `splashscreen-batteryempty-snowy_hills`, `splashscreen-poweroff-snowy_hills`, `splashscreen-starting-snowy_hills`, `splashscreen-suspended-snowy_hills`, `splashscreen-batteryempty-starr`, `splashscreen-poweroff-starr`, `splashscreen-starting-starr`, and `splashscreen-suspended-starr` - 0.0.0-1 (#724) - Installing a splashscreen will automatically enable it - Removing a splashscreen will automatically revert to the previous splashscreen ### Updated Packages - `toltec-bootstrap` - 0.2.3-1 (#740) - `rmfm` - 1.5.0-2 (#700 #746) - `whiteboard-hypercard` - 0.3.7-2 (#700 #747) - `yaft` - 0.0.10-2 (#700 #736) - `xochitl` - 0.0.0-16 (#700 #707) - `reboot-guard` - 1.0.1-7 (#689) - `calculator` - 0.0.0-16 (#700) - `chessmarkable` - 0.8.0-2 (#700) - `doomarkable` - 0.4.1-2 (#700) - `fingerterm` - 1.3.5-15 (#700) - `keywriter` - 0.2~20-gddc9e73-2 (#700) - `koreader` - 2023.08-2 (#700) - `netsurf` - 0.4.0-3 (#700) - `erode`, `fret`, `oxide`, `rot`, `tarnish`, `decay`, `corrupt`, `anxiety`, `oxide-utils`, `inject_evdev`, and `liboxide` - 0.2.6-2 (#700 #745) - `plato` - 0.9.34-2 (#700) - `puzzles` - 0.2.2-4 (#700) - `recrossable` - 0.0.0-8 (#700) - `regenda` - 0.0.2-2 (#700) - `reterm` - 20230628.1927-2 (#700) - `retris` - 0.6.3-4 (#700) - `dumbskull` - 0.0.1-3 (#700) - `harmony` - 0.2.2-2 (#700) - `mines` - 0.1.4-3 (#700) - `nao` - 0.1.2-4 (#700) - `rpncalc` - 0.0.3-3 (#700) - `wordlet` - 0.0.2-3 (#700) - `sill` - 0.1.1-1 (#700) - `vnsee` - 0.4.1-2 (#700) - `wikipedia` - 0.1.0-4 (#700) - `zshelf` - 0.4.0-4 (#700) - `changescrn` - 1.0.0-2 (#724) ### Tooling - Packages that contain files in `/opt/etc/draft` or `/opt/usr/share/applications` will now automatically reload oxide applications as part of install, upgrade, and remove. ### Documentation - Add documentation for the reload-oxide-apps hook. - Update category list to include the new splashscreens category. ### Known Issues - lowbattery and starting splashscreens don't work since they need to be in a specific bmp format and put in `/var/lib/uboot` (pr0fsmith/rMscreens#7) - Installing two splashscreens of the same type will error instead of replacing the previously installed splashscreen (#761) - Fingerterm icon is incorrect (#762)
1 parent 7911eac commit 231fc3a

File tree

39 files changed

+1115
-107
lines changed

39 files changed

+1115
-107
lines changed

docs/package.md

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -328,6 +328,7 @@ math | Apps to assist the user in performing mathematical tasks.
328328
readers | Apps for reading and annotating documents (PDF, EPUB, …).
329329
screensharing | Apps for streaming the display between the PC and tablet.
330330
templates | Templates for xochitl notebooks.
331+
splashscreens | Splashscreens for device startup, poweroff, suspend, etc.
331332
utils | System tools and various apps.
332333

333334
If the package does not fit into one of the existing sections, you are free to create a new one and document it here.
@@ -439,3 +440,12 @@ When upgrading a package from version A to B, the following happens:
439440
* `postupgrade B`, if it exists, is called from version A
440441
* New package files are unpacked and installed
441442
* `configure`, if it exists, is called from version B
443+
444+
445+
### reload-oxide-apps hook
446+
447+
If a package contains one or more files in `/opt/etc/draft` or `/opt/usr/share/applications` the `reload-oxide-apps` method in `install-lib` will be appended to the following:
448+
449+
* `configure`
450+
* `postupgrade`
451+
* `postremove`

package/calculator/package

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
pkgnames=(calculator)
66
pkgdesc="Touch-based calculator"
77
url=https://github.com/reHackable/Calculator
8-
pkgver=0.0.0-15
8+
pkgver=0.0.0-16
99
timestamp=2020-08-20T12:28Z
1010
section="math"
1111
maintainer="Mattéo Delabre <[email protected]>"

package/rmscreens/package renamed to package/changescrn/package

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
pkgnames=(changescrn)
66
pkgdesc="Change sleep/suspend/poweroff/reboot screens"
77
url=https://github.com/pr0fsmith/rMscreens/
8-
pkgver=1.0.0-1
8+
pkgver=1.0.0-2
99
timestamp=2022-03-15T01:28:33Z
1010
section="utils"
1111
maintainer="pr0fsmith <[email protected]>"
@@ -17,3 +17,13 @@ sha256sums=(3c2e8b0952d848d7326c0a4ce45da625dd7fd0fbc6b564a2d40c3b97015138e3)
1717
package() {
1818
install -Dm755 "$srcdir"/changescrn "$pkgdir/opt/bin/changescrn"
1919
}
20+
21+
configure() {
22+
if [ ! -d /opt/usr/share/backupscrns ] || [ -z "$(ls -A /opt/usr/share/backupscrns)" ]; then
23+
changescrn -b
24+
fi
25+
}
26+
27+
preremove() {
28+
changescrn -r all
29+
}

package/chessmarkable/package

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
pkgnames=(chessmarkable)
66
pkgdesc="Chess game"
77
url=https://github.com/LinusCDE/chessmarkable
8-
pkgver=0.8.0-1
8+
pkgver=0.8.0-2
99
timestamp=2021-07-22T12:04Z
1010
section="games"
1111
maintainer="Linus K. <[email protected]>"

package/doomarkable/package

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
pkgnames=(doomarkable)
66
pkgdesc="DOOM game"
77
url=https://github.com/LinusCDE/doomarkable
8-
pkgver=0.4.1-1
8+
pkgver=0.4.1-2
99
timestamp=2021-10-31T16:15Z
1010
section="games"
1111
maintainer="Linus K. <[email protected]>"

package/fingerterm/package

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
pkgnames=(fingerterm)
66
pkgdesc="Terminal emulator with an on-screen touch keyboard"
77
url=https://github.com/dixonary/fingerterm-reMarkable
8-
pkgver=1.3.5-14
8+
pkgver=1.3.5-15
99
timestamp=2020-10-27T12:02Z
1010
section="admin"
1111
maintainer="Mattéo Delabre <[email protected]>"

package/keywriter/package

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
pkgnames=(keywriter)
66
pkgdesc="Markdown-enabled free writing app"
77
url=https://github.com/dps/remarkable-keywriter
8-
pkgver=0.2~20-gddc9e73-1
8+
pkgver=0.2~20-gddc9e73-2
99
timestamp=2022-02-09T07:05:03Z
1010
section="writing"
1111
maintainer="Mattéo Delabre <[email protected]>"

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=2023.08-1
8+
pkgver=2023.08-2
99
timestamp=2023-08-29T16:21:01Z
1010
section="readers"
1111
maintainer="raisjn <[email protected]>"
@@ -14,7 +14,7 @@ installdepends=(fbink fbdepth display rm2fb-client)
1414

1515
_srcver="v${pkgver%-*}"
1616
source=(
17-
"https://build.koreader.rocks/download/stable/$_srcver/koreader-remarkable-$_srcver.zip"
17+
"https://github.com/koreader/koreader/releases/download/$_srcver/koreader-remarkable-$_srcver.zip"
1818
koreader.draft
1919
KOReader.oxide
2020
koreader-toltec.service

package/netsurf/package

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
pkgnames=(netsurf)
66
pkgdesc="Lightweight web browser"
77
url=https://github.com/alex0809/netsurf-reMarkable
8-
pkgver=0.4.0-2
8+
pkgver=0.4.0-3
99
timestamp=2021-05-31T11:15+00:00
1010
maintainer="Alex Friesenhahn <[email protected]>"
1111
archs=(rmall)

package/oxide/package

Lines changed: 2 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44

55
pkgnames=(erode fret oxide rot tarnish decay corrupt anxiety oxide-utils inject_evdev liboxide libsentry)
66
_oxidever=2.6
7-
pkgver=$_oxidever-1
7+
pkgver=$_oxidever-2
88
_sentryver=0.5.0
99
timestamp=2023-06-05T23:27:53Z
1010
maintainer="Eeems <[email protected]>"
@@ -49,10 +49,6 @@ fret() {
4949
install -D -m 755 -t "$pkgdir"/opt/bin "$srcdir"/release/opt/bin/fret
5050
install -D -m 644 -t "$pkgdir"/opt/usr/share/applications "$srcdir"/release/opt/usr/share/applications/codes.eeems.fret.oxide
5151
}
52-
53-
configure() {
54-
update-desktop-database
55-
}
5652
}
5753

5854
oxide() {
@@ -66,9 +62,6 @@ oxide() {
6662
install -D -m 644 -t "$pkgdir"/opt/usr/share/applications "$srcdir"/release/opt/usr/share/applications/codes.eeems.oxide.oxide
6763
install -D -m 644 -t "$pkgdir"/opt/usr/share/icons/oxide/702x702/splash "$srcdir"/release/opt/usr/share/icons/oxide/702x702/splash/oxide.png
6864
}
69-
configure() {
70-
update-desktop-database
71-
}
7265
}
7366

7467
rot() {
@@ -128,10 +121,6 @@ decay() {
128121
install -D -m 755 -t "$pkgdir"/opt/bin "$srcdir"/release/opt/bin/decay
129122
install -D -m 644 -t "$pkgdir"/opt/usr/share/applications "$srcdir"/release/opt/usr/share/applications/codes.eeems.decay.oxide
130123
}
131-
132-
configure() {
133-
update-desktop-database
134-
}
135124
}
136125
corrupt() {
137126
pkgdesc="Task Switcher for Oxide"
@@ -142,10 +131,6 @@ corrupt() {
142131
install -D -m 755 -t "$pkgdir"/opt/bin "$srcdir"/release/opt/bin/corrupt
143132
install -D -m 644 -t "$pkgdir"/opt/usr/share/applications "$srcdir"/release/opt/usr/share/applications/codes.eeems.corrupt.oxide
144133
}
145-
146-
configure() {
147-
update-desktop-database
148-
}
149134
}
150135

151136
anxiety() {
@@ -159,10 +144,6 @@ anxiety() {
159144
install -D -m 644 -t "$pkgdir"/opt/usr/share/icons/oxide/48x48/apps "$srcdir"/release/opt/usr/share/icons/oxide/48x48/apps/image.png
160145
install -D -m 644 -t "$pkgdir"/opt/usr/share/icons/oxide/702x702/splash "$srcdir"/release/opt/usr/share/icons/oxide/702x702/splash/anxiety.png
161146
}
162-
163-
configure() {
164-
update-desktop-database
165-
}
166147
}
167148

168149
oxide-utils() {
@@ -179,6 +160,7 @@ oxide-utils() {
179160
install -D -m 755 -t "$pkgdir"/opt/bin "$srcdir"/release/opt/bin/xdg-desktop-menu
180161
install -D -m 755 -t "$pkgdir"/opt/bin "$srcdir"/release/opt/bin/xdg-desktop-icon
181162
install -D -m 755 -t "$pkgdir"/opt/bin "$srcdir"/release/opt/bin/xdg-open
163+
install -D -m 755 -t "$pkgdir"/opt/bin "$srcdir"/release/opt/bin/xdg-settings
182164
install -D -m 755 -t "$pkgdir"/opt/bin "$srcdir"/release/opt/bin/gio
183165
}
184166
}

0 commit comments

Comments
 (0)