Merge branch 'testing' into testing

Etn40ff · Nov 27, 2023 · 229a14d · 229a14d
2 parents 0c3964b + 8115ee4
commit 229a14d
Show file tree

Hide file tree

Showing 40 changed files with 1,163 additions and 105 deletions.
diff --git a/docs/package.md b/docs/package.md
@@ -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.
@@ -404,6 +405,21 @@ A list of packages that the current package replaces.
 Setting this field allows the current package to overwrite and take ownership of files from other packages.
 Note that the replaced packages will not be automatically uninstalled unless you also declare a conflict with them using the [`conflicts` field](#conflicts-field).
 
+#### `provides` field
+
+<table>
+ <tr>
+  <th>Required?</th>
+  <td>No, defaults to <code>()</code></th>
+ </tr>
+ <tr>
+  <th>Type</th>
+  <td>Array of strings</td>
+ </tr>
+</table>
+
+A list of virtual packages that the current package provides.
+
 #### `package()` function
 
 The `package()` function populates the `$pkgdir` directory with the files and directories that need to be installed using artifacts from the `$srcdir` directory.
@@ -439,3 +455,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`
diff --git a/package/calculator/package b/package/calculator/package
@@ -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 <spam@delab.re>"

diff --git a/package/rmscreens/package → package/changescrn/package b/package/rmscreens/package → package/changescrn/package
@@ -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 <evon_smith@yahoo.ca>"
@@ -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
+}
diff --git a/package/chessmarkable/package b/package/chessmarkable/package
@@ -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. <linus@cosmos-ink.net>"

diff --git a/package/doomarkable/package b/package/doomarkable/package
@@ -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. <linus@cosmos-ink.net>"

diff --git a/package/fingerterm/package b/package/fingerterm/package
@@ -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 <spam@delab.re>"

diff --git a/package/keywriter/package b/package/keywriter/package
@@ -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 <spam@delab.re>"

diff --git a/package/koreader/package b/package/koreader/package
@@ -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 <of.raisjn@gmail.com>"
@@ -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

diff --git a/package/netsurf/package b/package/netsurf/package
@@ -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 <rm-dev@alexfriesenhahn.de>"
 archs=(rmall)

diff --git a/package/oxide/package b/package/oxide/package
@@ -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 <eeems@eeems.email>"
@@ -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() {
@@ -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() {
@@ -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"
@@ -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() {
@@ -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() {
@@ -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
  }
 }

diff --git a/package/plato/package b/package/plato/package
@@ -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. <linus@cosmos-ink.net>"

diff --git a/package/puzzles/package b/package/puzzles/package
@@ -5,7 +5,7 @@
 pkgnames=(puzzles)
 timestamp=2021-03-04T14:03-08:00
 maintainer="Mattéo Delabre <spam@delab.re>"
-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"

diff --git a/package/reboot-guard/package b/package/reboot-guard/package
@@ -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 <eeems@eeems.email>"
@@ -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
 }
 

diff --git a/package/recrossable/package b/package/recrossable/package
@@ -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 <spam@delab.re>"

diff --git a/package/regenda/package b/package/regenda/package
@@ -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 <jirka.steh@gmail.com>"