Skip to content

Commit

Permalink
Stable merge window for week 47 of 2023 (#754)
Browse files Browse the repository at this point in the history
### 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)
  • Loading branch information
Eeems authored Dec 6, 2023
1 parent 7911eac commit 231fc3a
Show file tree
Hide file tree
Showing 39 changed files with 1,115 additions and 107 deletions.
10 changes: 10 additions & 0 deletions docs/package.md
Original file line number Diff line number Diff line change
Expand Up @@ -328,6 +328,7 @@ math | Apps to assist the user in performing mathematical tasks.
readers | Apps for reading and annotating documents (PDF, EPUB, …).
screensharing | Apps for streaming the display between the PC and tablet.
templates | Templates for xochitl notebooks.
splashscreens | Splashscreens for device startup, poweroff, suspend, etc.
utils | System tools and various apps.

If the package does not fit into one of the existing sections, you are free to create a new one and document it here.
Expand Down Expand Up @@ -439,3 +440,12 @@ When upgrading a package from version A to B, the following happens:
* `postupgrade B`, if it exists, is called from version A
* New package files are unpacked and installed
* `configure`, if it exists, is called from version B


### reload-oxide-apps hook

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:

* `configure`
* `postupgrade`
* `postremove`
2 changes: 1 addition & 1 deletion 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-15
pkgver=0.0.0-16
timestamp=2020-08-20T12:28Z
section="math"
maintainer="Mattéo Delabre <[email protected]>"
Expand Down
12 changes: 11 additions & 1 deletion package/rmscreens/package → package/changescrn/package
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
pkgnames=(changescrn)
pkgdesc="Change sleep/suspend/poweroff/reboot screens"
url=https://github.com/pr0fsmith/rMscreens/
pkgver=1.0.0-1
pkgver=1.0.0-2
timestamp=2022-03-15T01:28:33Z
section="utils"
maintainer="pr0fsmith <[email protected]>"
Expand All @@ -17,3 +17,13 @@ sha256sums=(3c2e8b0952d848d7326c0a4ce45da625dd7fd0fbc6b564a2d40c3b97015138e3)
package() {
install -Dm755 "$srcdir"/changescrn "$pkgdir/opt/bin/changescrn"
}

configure() {
if [ ! -d /opt/usr/share/backupscrns ] || [ -z "$(ls -A /opt/usr/share/backupscrns)" ]; then
changescrn -b
fi
}

preremove() {
changescrn -r all
}
2 changes: 1 addition & 1 deletion package/chessmarkable/package
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
pkgnames=(chessmarkable)
pkgdesc="Chess game"
url=https://github.com/LinusCDE/chessmarkable
pkgver=0.8.0-1
pkgver=0.8.0-2
timestamp=2021-07-22T12:04Z
section="games"
maintainer="Linus K. <[email protected]>"
Expand Down
2 changes: 1 addition & 1 deletion package/doomarkable/package
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
pkgnames=(doomarkable)
pkgdesc="DOOM game"
url=https://github.com/LinusCDE/doomarkable
pkgver=0.4.1-1
pkgver=0.4.1-2
timestamp=2021-10-31T16:15Z
section="games"
maintainer="Linus K. <[email protected]>"
Expand Down
2 changes: 1 addition & 1 deletion package/fingerterm/package
Original file line number Diff line number Diff line change
Expand Up @@ -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-14
pkgver=1.3.5-15
timestamp=2020-10-27T12:02Z
section="admin"
maintainer="Mattéo Delabre <[email protected]>"
Expand Down
2 changes: 1 addition & 1 deletion package/keywriter/package
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
pkgnames=(keywriter)
pkgdesc="Markdown-enabled free writing app"
url=https://github.com/dps/remarkable-keywriter
pkgver=0.2~20-gddc9e73-1
pkgver=0.2~20-gddc9e73-2
timestamp=2022-02-09T07:05:03Z
section="writing"
maintainer="Mattéo Delabre <[email protected]>"
Expand Down
4 changes: 2 additions & 2 deletions package/koreader/package
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
pkgnames=(koreader)
pkgdesc="Ebook reader supporting PDF, DjVu, EPUB, FB2 and many more formats"
url=https://github.com/koreader/koreader
pkgver=2023.08-1
pkgver=2023.08-2
timestamp=2023-08-29T16:21:01Z
section="readers"
maintainer="raisjn <[email protected]>"
Expand All @@ -14,7 +14,7 @@ installdepends=(fbink fbdepth display rm2fb-client)

_srcver="v${pkgver%-*}"
source=(
"https://build.koreader.rocks/download/stable/$_srcver/koreader-remarkable-$_srcver.zip"
"https://github.com/koreader/koreader/releases/download/$_srcver/koreader-remarkable-$_srcver.zip"
koreader.draft
KOReader.oxide
koreader-toltec.service
Expand Down
2 changes: 1 addition & 1 deletion package/netsurf/package
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
pkgnames=(netsurf)
pkgdesc="Lightweight web browser"
url=https://github.com/alex0809/netsurf-reMarkable
pkgver=0.4.0-2
pkgver=0.4.0-3
timestamp=2021-05-31T11:15+00:00
maintainer="Alex Friesenhahn <[email protected]>"
archs=(rmall)
Expand Down
22 changes: 2 additions & 20 deletions package/oxide/package
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

pkgnames=(erode fret oxide rot tarnish decay corrupt anxiety oxide-utils inject_evdev liboxide libsentry)
_oxidever=2.6
pkgver=$_oxidever-1
pkgver=$_oxidever-2
_sentryver=0.5.0
timestamp=2023-06-05T23:27:53Z
maintainer="Eeems <[email protected]>"
Expand Down Expand Up @@ -49,10 +49,6 @@ fret() {
install -D -m 755 -t "$pkgdir"/opt/bin "$srcdir"/release/opt/bin/fret
install -D -m 644 -t "$pkgdir"/opt/usr/share/applications "$srcdir"/release/opt/usr/share/applications/codes.eeems.fret.oxide
}

configure() {
update-desktop-database
}
}

oxide() {
Expand All @@ -66,9 +62,6 @@ oxide() {
install -D -m 644 -t "$pkgdir"/opt/usr/share/applications "$srcdir"/release/opt/usr/share/applications/codes.eeems.oxide.oxide
install -D -m 644 -t "$pkgdir"/opt/usr/share/icons/oxide/702x702/splash "$srcdir"/release/opt/usr/share/icons/oxide/702x702/splash/oxide.png
}
configure() {
update-desktop-database
}
}

rot() {
Expand Down Expand Up @@ -128,10 +121,6 @@ decay() {
install -D -m 755 -t "$pkgdir"/opt/bin "$srcdir"/release/opt/bin/decay
install -D -m 644 -t "$pkgdir"/opt/usr/share/applications "$srcdir"/release/opt/usr/share/applications/codes.eeems.decay.oxide
}

configure() {
update-desktop-database
}
}
corrupt() {
pkgdesc="Task Switcher for Oxide"
Expand All @@ -142,10 +131,6 @@ corrupt() {
install -D -m 755 -t "$pkgdir"/opt/bin "$srcdir"/release/opt/bin/corrupt
install -D -m 644 -t "$pkgdir"/opt/usr/share/applications "$srcdir"/release/opt/usr/share/applications/codes.eeems.corrupt.oxide
}

configure() {
update-desktop-database
}
}

anxiety() {
Expand All @@ -159,10 +144,6 @@ anxiety() {
install -D -m 644 -t "$pkgdir"/opt/usr/share/icons/oxide/48x48/apps "$srcdir"/release/opt/usr/share/icons/oxide/48x48/apps/image.png
install -D -m 644 -t "$pkgdir"/opt/usr/share/icons/oxide/702x702/splash "$srcdir"/release/opt/usr/share/icons/oxide/702x702/splash/anxiety.png
}

configure() {
update-desktop-database
}
}

oxide-utils() {
Expand All @@ -179,6 +160,7 @@ oxide-utils() {
install -D -m 755 -t "$pkgdir"/opt/bin "$srcdir"/release/opt/bin/xdg-desktop-menu
install -D -m 755 -t "$pkgdir"/opt/bin "$srcdir"/release/opt/bin/xdg-desktop-icon
install -D -m 755 -t "$pkgdir"/opt/bin "$srcdir"/release/opt/bin/xdg-open
install -D -m 755 -t "$pkgdir"/opt/bin "$srcdir"/release/opt/bin/xdg-settings
install -D -m 755 -t "$pkgdir"/opt/bin "$srcdir"/release/opt/bin/gio
}
}
Expand Down
2 changes: 1 addition & 1 deletion package/plato/package
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
pkgnames=(plato)
pkgdesc="Document reader"
url=https://github.com/LinusCDE/plato
pkgver=0.9.34-1
pkgver=0.9.34-2
timestamp=2023-03-08T17:58Z
section="readers"
maintainer="Linus K. <[email protected]>"
Expand Down
2 changes: 1 addition & 1 deletion package/puzzles/package
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
pkgnames=(puzzles)
timestamp=2021-03-04T14:03-08:00
maintainer="Mattéo Delabre <[email protected]>"
pkgver=0.2.2-3
pkgver=0.2.2-4
license=MIT
pkgdesc="Simon Tatham's Puzzle Package"
url="https://github.com/mrichards42/remarkable_puzzles"
Expand Down
11 changes: 8 additions & 3 deletions package/reboot-guard/package
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
pkgnames=(reboot-guard)
pkgdesc="Block systemd-initiated poweroff/reboot/halt until configurable condition checks pass"
url=https://github.com/stephanritscher/reboot-guard
pkgver=1.0.1-6
pkgver=1.0.1-7
timestamp=2020-05-04T06:16Z
section="devel"
maintainer="Eeems <[email protected]>"
Expand Down Expand Up @@ -34,8 +34,13 @@ configure() {
}

preremove() {
if systemctl list-units --full -all | grep -Fq 'rguard.service'; then
systemctl disable --now rguard
if is-active rguard.service; then
echo "Stopping rguard.service"
systemctl stop rguard.service
fi
if is-enabled rguard.service; then
echo "Disabling rguard.service"
systemctl disable rguard.service
fi
}

Expand Down
2 changes: 1 addition & 1 deletion package/recrossable/package
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
pkgnames=(recrossable)
pkgdesc="Solve crossword puzzles"
url=https://github.com/sandsmark/recrossable
pkgver=0.0.0-7
pkgver=0.0.0-8
timestamp=2021-01-15T12:58:22Z
section="games"
maintainer="Mattéo Delabre <[email protected]>"
Expand Down
2 changes: 1 addition & 1 deletion package/regenda/package
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
pkgnames=(regenda)
pkgdesc="Caldav agenda app"
url=https://github.com/tenJirka/reGenda
pkgver=0.0.2-1
pkgver=0.0.2-2
timestamp=2023-09-06T06:45Z
section="utils"
maintainer="tenJirka <[email protected]>"
Expand Down
142 changes: 142 additions & 0 deletions package/remarkable_templates/package
Original file line number Diff line number Diff line change
@@ -0,0 +1,142 @@
#!/usr/bin/env bash
# Copyright (c) 2023 The Toltec Contributors
# SPDX-License-Identifier: MIT

pkgnames=(
template-daily-planner
template-weekly-planner
template-journal
template-meeting-notes
template-smart-goals
template-good-time-journal
)
url=https://github.com/msencer/remarkable_templates
pkgver=0.0.0-1
timestamp=2023-07-27T12:28:59Z
section="templates"
maintainer="Eeems <[email protected]>"
license=MIT
installdepends=(templatectl)

source=("https://github.com/msencer/remarkable_templates/archive/03282d34b905e7e6431132b022b5a9cb3af116a2.zip")
sha256sums=(7a39d53767963f59c8d5b8a7ebda411b60d1256fe1077a3864cc43cd59281e03)

template-daily-planner() {
pkgdesc="Daily Planner template"
package() {
install -D -m 755 \
-t "$pkgdir"/opt/share/remarkable/templates \
"$srcdir"/templates/pngs/daily_planner.png
}
configure() {
templatectl add \
--name "Daily Planner" \
--filename "daily_planner" \
--category "Custom" \
--category "Life/organize" \
--icon_code "e9da"
}
preremove() {
templatectl remove --name "Daily Planner"
}
}

template-weekly-planner() {
pkgdesc="Weekly Planner template"
package() {
install -D -m 755 \
-t "$pkgdir"/opt/share/remarkable/templates \
"$srcdir"/templates/pngs/weekly_planner.png
}
configure() {
templatectl add \
--name "Weekly Planner" \
--filename "weekly_planner" \
--category "Custom" \
--category "Life/organize" \
--icon_code "e997"
}
preremove() {
templatectl remove --name "Weekly Planner"
}
}

template-journal() {
pkgdesc="Journal template"
package() {
install -D -m 755 \
-t "$pkgdir"/opt/share/remarkable/templates \
"$srcdir"/templates/pngs/journal.png
}
configure() {
templatectl add \
--name "Journal" \
--filename "journal" \
--category "Custom" \
--category "Life/organize" \
--icon_code "e991"
}
preremove() {
templatectl remove --name "Journal"
}
}

template-meeting-notes() {
pkgdesc="Meeting Notes template"
package() {
install -D -m 755 \
-t "$pkgdir"/opt/share/remarkable/templates \
"$srcdir"/templates/pngs/meeting_notes.png
}
configure() {
templatectl add \
--name "1:1 / Meeting Notes" \
--filename "meeting_notes" \
--category "Custom" \
--category "Life/organize" \
--icon_code "e9d8"
}
preremove() {
templatectl remove --name "1:1 / Meeting Notes"
}
}

template-smart-goals() {
pkgdesc="Smart Goals template"
package() {
install -D -m 755 \
-t "$pkgdir"/opt/share/remarkable/templates \
"$srcdir"/templates/pngs/goals.png
}
configure() {
templatectl add \
--name "Smart Goals" \
--filename "goals" \
--category "Custom" \
--category "Life/organize" \
--icon_code "e98f"
}
preremove() {
templatectl remove --name "Smart Goals"
}
}

template-good-time-journal() {
pkgdesc="Smart Goals template"
package() {
install -D -m 755 \
-t "$pkgdir"/opt/share/remarkable/templates \
"$srcdir"/templates/pngs/gt_journal.png
}
configure() {
templatectl add \
--name "Good Time Journal" \
--filename "gt_journal" \
--category "Custom" \
--category "Life/organize" \
--icon_code "e9b2"
}
preremove() {
templatectl remove --name "Good Time Journal"
}
}
Loading

0 comments on commit 231fc3a

Please sign in to comment.