Merge branch 'testing' into Eeems-patch-17

docs/package.md

@@ -336,6 +336,7 @@ 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.
+writing         | Apps for writing text.
 
 If the package does not fit into one of the existing sections, you are free to create a new one and document it here.
 

package/innernet/package

@@ -1,26 +1,26 @@
 #!/usr/bin/env bash
-# Copyright (c) 2021 The Toltec Contributors
+# Copyright (c) 2024 The Toltec Contributors
 # SPDX-License-Identifier: MIT
 
 archs=(rmallos2)
 pkgnames=(innernet-client)
 pkgdesc="A private network system that uses WireGuard under the hood."
 url="https://github.com/tonarino/innernet"
-pkgver=1.5.3-3
-timestamp=2022-01-31T20:08:43Z
+pkgver=1.6.1-1
+timestamp=2024-01-19T14:24:40Z
 section="utils"
 maintainer="plan5 <[email protected]>"
 license=MIT
 installdepends=(wireguard)
 makedepends=(build:librust-clang-sys-dev build:libclang-dev build:libc6 build:libc6-dev build:clang)
 
-image=rust:v2.2.2
+image=rust:v3.1
 _srcver="v${pkgver%-*}"
 source=(
     "https://github.com/tonarino/innernet/archive/refs/tags/$_srcver.zip"
 )
 sha256sums=(
-    2f7ca1d802d898b1c4fd090cba9e0562a1e80d617b55f23ba596e81c99441a1c
+    fd9ec6eb75dcc46c818696e7fcb87eb772dc024e0c326360f0f8c473c937c37c
 )
 
 prepare() {
@@ -43,9 +43,6 @@ package() {
     install -D -m 700 -t "$pkgdir"/opt/bin "$srcdir"/target/armv7-unknown-linux-gnueabihf/release/innernet
     install -D -m 644 -t "$pkgdir"/lib/systemd/system "$srcdir/client/[email protected]"
     install -D -m 644 -t "$pkgdir"/lib/systemd/system "$srcdir/client/innernet.target"
-
-    # Link /opt/bin/innernet to /opt/bin/inn
-    ln -s /opt/bin/innernet "$pkgdir"/opt/bin/inn
 }
 
 configure() {

package/launcherctl/package

@@ -5,9 +5,9 @@
 pkgnames=(launcherctl)
 pkgdesc="Manage your installed launcher"
 url=https://toltec-dev.org/
-pkgver=0.0.1-2
+pkgver=0.0.1-3
 timestamp=2023-12-18T03:32Z
-section="launcher"
+section="launchers"
 maintainer="Eeems <[email protected]>"
 license=MIT
 

package/mmc-utils/package

@@ -6,32 +6,40 @@ archs=(rmall)
 pkgnames=(mmc-utils)
 pkgdesc="A tool for monitoring the eMMC protocol"
 url=https://git.kernel.org/pub/scm/utils/mmc/mmc-utils.git/
-pkgver=1.0-0
+pkgver=1.0-1
 timestamp=2021-08-12T19:41:07Z
 section="devel"
 maintainer="Alistair Francis <[email protected]>"
 license=GPL-2.0-only
 
 image=base:v2.2
 source=(
-    "https://git.kernel.org/pub/scm/utils/mmc/mmc-utils.git/snapshot/mmc-utils-7769a4d7abe339ce273c13a203394a79a11fcff9.tar.gz"
     0001-Makefile-Remove-Werror.patch
 )
 sha256sums=(
-    0578e546d8893b6207180def7966e7314cae54c237a931b8f94779ce5c7d0668
     SKIP
 )
+_commit=7769a4d7abe339ce273c13a203394a79a11fcff9
+
+prepare() {
+    cd "$srcdir"
+    mkdir mmc-utils
+    cd mmc-utils
+    git init
+    git fetch --depth=1 "https://git.kernel.org/pub/scm/utils/mmc/mmc-utils.git" "$_commit"
+    git checkout -f "$_commit"
+    patch < "$srcdir"/0001-Makefile-Remove-Werror.patch
+}
 
 build() {
     # Use our toolchain
     export AR=arm-linux-gnueabihf-ar
     export CC=arm-linux-gnueabihf-gcc
     export STRIP=arm-linux-gnueabihf-strip
 
-    patch < "$srcdir"/0001-Makefile-Remove-Werror.patch
-    make -j4
+    make -C "$srcdir"/mmc-utils -j4
 }
 
 package() {
-    DESTDIR="$pkgdir" make -C "$srcdir" install
+    DESTDIR="$pkgdir" make -C "$srcdir"/mmc-utils install
 }

package/sysfs_preload/package

@@ -5,9 +5,9 @@
 pkgnames=(sysfs_preload)
 pkgdesc="A simple preload that forces any calls to /sys/power/state to use systemd instead."
 url="https://github.com/Eeems-Org/sysfs_preload"
-pkgver=1.0.1-1
+pkgver=1.0.1-2
 timestamp=2024-06-22T05:19Z
-section=util
+section=utils
 maintainer="Eeems <[email protected]>"
 license=MIT
 

package/tilem/package

@@ -5,14 +5,15 @@
 pkgnames=(tilem)
 pkgdesc="TI-84+ calculator emulator"
 url=https://github.com/timower/rM2-stuff/tree/master/apps/tilem
-_tag=0.1.1
+_tag=0.1.2
 pkgver=${_tag}-1
-timestamp=2023-11-25T20:49:48Z
+timestamp=2024-05-29T17:05:56Z
 maintainer="Mattéo Delabre <[email protected]>"
 license=GPL-3.0
 section="utils"
 image=base:v3.1
 installdepends=(display)
+flags=(nostrip)
 
 source=()
 sha256sums=()
@@ -31,14 +32,18 @@ prepare() {
 }
 
 build() {
-    mkdir build
+    cd "$srcdir"
     mkdir install
-    cd build
-    cmake -DCMAKE_TOOLCHAIN_FILE="/usr/share/cmake/$CHOST.cmake" \
-        -DCMAKE_INSTALL_PREFIX="../install" -DCMAKE_BUILD_TYPE=Release ../tilem
-    cd apps/tilem
-    make
-    make install
+    cd tilem
+    cmake --preset release-toltec
+    cmake \
+        --build build/release-toltec \
+        --target tilem
+    cmake \
+        --install build/release-toltec \
+        --prefix ../install \
+        --component tilem \
+        --strip
 }
 
 package() {

package/yaft/package

@@ -5,14 +5,15 @@
 pkgnames=(yaft)
 pkgdesc="Yet another framebuffer terminal"
 url=https://github.com/timower/rM2-stuff/tree/master/apps/yaft
-_tag=0.1.1
+_tag=0.1.2
 pkgver=${_tag}-1
-timestamp=2023-11-25T20:49:48Z
+timestamp=2024-05-29T17:05:56Z
 maintainer="Mattéo Delabre <[email protected]>"
 license=GPL-3.0
 section="admin"
 image=base:v3.1
 installdepends=(display terminfo)
+flags=(nostrip)
 
 source=()
 sha256sums=()
@@ -31,14 +32,18 @@ prepare() {
 }
 
 build() {
-    mkdir build
+    cd "$srcdir"
     mkdir install
-    cd build
-    cmake -DCMAKE_TOOLCHAIN_FILE="/usr/share/cmake/$CHOST.cmake" \
-        -DCMAKE_INSTALL_PREFIX="../install" -DCMAKE_BUILD_TYPE=Release ../yaft
-    cd apps/yaft
-    make
-    make install
+    cd yaft
+    cmake --preset release-toltec
+    cmake \
+        --build build/release-toltec \
+        --target yaft
+    cmake \
+        --install build/release-toltec \
+        --prefix ../install \
+        --component yaft \
+        --strip
 }
 
 package() {