Merge branch 'testing' into Eeems-patch-15

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`

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 <[email protected]>"

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 <[email protected]>"
@@ -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
+}

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. <[email protected]>"

package/display/package

@@ -4,11 +4,11 @@
 
 archs=(rm1 rm2)
 pkgnames=(display rm2fb-client)
-timestamp=2023-04-16T20:53:38Z
+timestamp=2023-08-27T02:39:10Z
 maintainer="raisjn <[email protected]>"
 license=MIT
 url="https://github.com/ddvk/remarkable2-framebuffer"
-pkgver=1:0.0.31-3
+pkgver=1:0.0.32-2
 _release="${pkgver%-*}"
 _release="v${_release#*:}"
 _libver=1.0.1
@@ -23,7 +23,7 @@ source=(
     rm2fb-preload.env
 )
 sha256sums=(
-    c27081be9b4fa000e41489b42d53fb8254bd8bf348a34756799488827dbc0f0b
+    603eef1688a8c3adb1df23f4f00fe12b80938fe99801b515cd74f84c8cede5b1
     SKIP
     SKIP
     SKIP

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. <[email protected]>"

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 <[email protected]>"

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 <[email protected]>"

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 <[email protected]>"
@@ -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

package/linux-stracciatella/package

@@ -6,17 +6,37 @@ archs=(rm1 rm2)
 pkgnames=(linux-stracciatella)
 pkgdesc="RemarkableAS's vanilla kernel with a few extra flakes"
 url=https://github.com/Etn40ff/linux-remarkable
-pkgver=5.4.70-2
-timestamp=2022-09-26T21:23:39Z
+pkgver=5.4.70-3
+timestamp=2023-09-23T00:12:00Z
 section="kernel"
 maintainer="Salvatore Stella <[email protected]>"
 makedepends=(build:flex build:bison build:libssl-dev build:bc build:lzop build:libgmp-dev build:libmpc-dev build:kmod)
 license=GPL-2.0-only
 flags=(nostrip)
 installdepends=(kernelctl)
-image=base:v2.3
-source=(https://github.com/Etn40ff/linux-remarkable/archive/41121ea10ed2235c441cfe717461988859d7f5b6.tar.gz)
-sha256sums=(ade87a10bfa7069222cbf8eb1d00ca460d38aab9685223d2fa3ee4f363a75cfa)
+image=base:v3.1
+_wireguard_version=1.0.20220627
+source=(
+    https://github.com/Etn40ff/linux-remarkable/archive/c908b16d6b848964ecc9b116a024f247c290a1bf.tar.gz
+    "https://git.zx2c4.com/wireguard-linux-compat/snapshot/wireguard-linux-compat-$_wireguard_version.tar.xz"
+)
+sha256sums=(
+    2075b9eb69172751b3e8e0d3a40d63c0c05982e79a2724ed7c3bdfc4f7988eea
+    362d412693c8fe82de00283435818d5c5def7f15e2433a07a9fe99d0518f63c0
+)
+noextract=("wireguard-linux-compat-$_wireguard_version.tar.xz")
+
+prepare() {
+    # Jury-rig the wireguard module into sources and enable it
+    mkdir "$srcdir/net/wireguard"
+    bsdtar --strip-components 2 -xJ -C "$srcdir/net/wireguard" \
+        -f "$srcdir/wireguard-linux-compat-$_wireguard_version.tar.xz" \
+        "wireguard-linux-compat-$_wireguard_version/src"
+    sed -i "/^obj-\\\$(CONFIG_NETFILTER).*+=/a obj-\$(CONFIG_WIREGUARD) += wireguard/" "$srcdir/net/Makefile"
+    sed -i "/^if INET\$/a source \"net/wireguard/Kconfig\"" "$srcdir/net/Kconfig"
+    echo "CONFIG_WIREGUARD=m" >> "$srcdir/arch/arm/configs/zero-gravitas_defconfig"
+    echo "CONFIG_WIREGUARD=m" >> "$srcdir/arch/arm/configs/zero-sugar_defconfig"
+}
 
 build() {
     if [[ $arch = rm1 ]]; then

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 <[email protected]>"
 archs=(rmall)

package/oxide/package

@@ -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() {

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. <[email protected]>"

package/puzzles/package

@@ -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"

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 <[email protected]>"
@@ -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
 }
 

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 <[email protected]>"

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 <[email protected]>"