Merge branch 'testing' into upower

toltec-dev · Sep 15, 2024 · 4b66b43 · 4b66b43
2 parents d7e9e95 + 6e08705
commit 4b66b43
Show file tree

Hide file tree

Showing 9 changed files with 64 additions and 65 deletions.
diff --git a/package/innernet/package b/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 <30434574+plan5@users.noreply.github.com>"
 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/innernet@.service"
     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() {

diff --git a/package/koreader/package b/package/koreader/package
@@ -5,8 +5,8 @@
 pkgnames=(koreader)
 pkgdesc="Ebook reader supporting PDF, DjVu, EPUB, FB2 and many more formats"
 url=https://github.com/koreader/koreader
-pkgver=2024.04-5
-timestamp=2024-04-29T19:56:05Z
+pkgver=2024.07-1
+timestamp=2024-07-15T16:21:26Z
 section="readers"
 maintainer="raisjn <of.raisjn@gmail.com>"
 license=AGPL-3.0-or-later
@@ -22,7 +22,7 @@ source=(
     launcherctl-koreader
 )
 sha256sums=(
-    e6b3a5a2c8cde8ca0c469fe542d6e170502fcf39b9a55e4447a7acd02b4a12c0
+    1040894434421b52076473f7947f139e2c98fcc04b1acadfe29b3362f262f9b7
     SKIP
     SKIP
     SKIP

diff --git a/package/micro/package b/package/micro/package
@@ -5,14 +5,14 @@
 pkgnames=(micro)
 pkgdesc="Modern and intuitive terminal-based text editor"
 url=https://micro-editor.github.io/
-pkgver=2.0.13-2
-timestamp=2023-10-21T22:38:29Z
+pkgver=2.0.14-1
+timestamp=2024-08-27T18:13:07Z
 section="utils"
 maintainer="Eeems <eeems@eeems.email>"
 license=MIT
 
-source=("https://github.com/zyedidia/micro/releases/download/v2.0.13/micro-2.0.13-linux-arm.tar.gz")
-sha256sums=(adb9cf644354a5c85819db40e1a427f0f4951b172597bbcd3ef94ecc4a8c4b75)
+source=("https://github.com/zyedidia/micro/releases/download/v2.0.14/micro-2.0.14-linux-arm.tar.gz")
+sha256sums=(9f490d88bd30a548af99a905f50244dc6c80f3c7a3c6f98faeb5b0a7329f7dea)
 
 package() {
     install -Dm644 "$srcdir"/LICENSE "$pkgdir/opt/usr/share/licenses/$pkgname/LICENSE"

diff --git a/package/mmc-utils/package b/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 <alistair@alistair23.me>"
 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
 }
diff --git a/package/quickjs/package b/package/quickjs/package
@@ -5,29 +5,26 @@
 pkgnames=(quickjs)
 pkgdesc="A small and embeddable Javascript engine"
 url=https://bellard.org/quickjs/
-pkgver=2020.11.08-2
+pkgver=2024.01.13-1
 section="devel"
-timestamp=2020-11-08T13:44Z
+timestamp=2024-01-13T00:00Z
 maintainer="khanhas <xuankhanh963@gmail.com>"
 license=MIT
 
-image=base:v2.1
+image=base:v3.1
 source=(
-    https://bellard.org/quickjs/quickjs-2020-11-08.tar.xz
-    quickjs.patch
+    https://bellard.org/quickjs/quickjs-2024-01-13.tar.xz
 )
 sha256sums=(
-    2e9d63dab390a95ed365238f21d8e9069187f7ed195782027f0ab311bb64187b
-    SKIP
+    3c4bf8f895bfa54beb486c8d1218112771ecfc5ac3be1036851ef41568212e03
 )
 
 build() {
-    patch -u Makefile -i quickjs.patch
-    make qjs.arm
+    make CROSS_PREFIX="$CROSS_COMPILE" qjs qjscalc
 }
 
 package() {
     install -d "$pkgdir"/opt/bin
-    install -D -m 755 -t "$pkgdir"/opt/bin/ "$srcdir"/qjs.arm
-    mv "$pkgdir"/opt/bin/qjs.arm "$pkgdir"/opt/bin/qjs
+    install -D -m 755 -t "$pkgdir"/opt/bin/ "$srcdir"/qjs
+    ln -s qjs "$pkgdir"/opt/bin/qjscalc
 }
diff --git a/package/quickjs/quickjs.patch b/package/quickjs/quickjs.patch
diff --git a/package/tilem/package b/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 <spam@delab.re>"
 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() {

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

diff --git a/package/zerotier-one/package b/package/zerotier-one/package
@@ -4,7 +4,7 @@
 
 pkgnames=(zerotier zerotier-one zerotier-one-doc zerotier-selftest)
 url=https://github.com/zerotier/ZeroTierOne
-_upver=1.12.2
+_upver=1.14.1
 pkgver=${_upver}-1
 timestamp=2023-03-23T17:39:31Z
 maintainer="Eeems <eeems@eeems.email>"
@@ -13,7 +13,7 @@ section="utils"
 image=base:v3.0
 
 source=("https://github.com/zerotier/ZeroTierOne/archive/refs/tags/${_upver}.zip")
-sha256sums=(2089fc824c84985610f0bd60186c72e94e2592d8f38259a1c80ea8f696edd16b)
+sha256sums=(fcf30ce797dbca757f3e882e004a3f953ebe12ae13f03d804b3fb184ee3c9714)
 
 build() {
     sed -i \