From 453c1146b3f685c6aedcad82400e7c73b1bc1c72 Mon Sep 17 00:00:00 2001 From: Nathaniel van Diepen Date: Mon, 5 Jun 2023 17:41:35 -0600 Subject: [PATCH 01/24] Update oxide to v2.6 --- package/oxide/package | 94 ++++++++++++++++++++++++++++++++----------- 1 file changed, 70 insertions(+), 24 deletions(-) diff --git a/package/oxide/package b/package/oxide/package index a9b7a4010..491df8ade 100644 --- a/package/oxide/package +++ b/package/oxide/package @@ -3,20 +3,21 @@ # SPDX-License-Identifier: MIT pkgnames=(erode fret oxide rot tarnish decay corrupt anxiety liboxide libsentry notify-send) -pkgver=2.5-2 +_oxidever=2.6 +pkgver=$_oxidever-1 _sentryver=0.5.0 -timestamp=2023-01-26T22:52:14Z +timestamp=2023-06-05T23:27:53Z maintainer="Eeems " url=https://oxide.eeems.codes license=MIT flags=(patch_rm2fb) image=qt:v2.3 source=( - "https://github.com/Eeems-Org/oxide/archive/refs/tags/v2.5.zip" + "https://github.com/Eeems-Org/oxide/archive/refs/tags/v$_oxidever.zip" toltec-rm2-override.conf ) sha256sums=( - 07bfb84e5adaebdebd2ce55b22f3764a1d4887c2b18364f5ec1053f171e3ecbe + bbcf83302f530afe069974121496be6f8118eadba3c00633f834db026e41ae95 SKIP ) @@ -42,18 +43,24 @@ erode() { fret() { pkgdesc="Take screenshots" section="utils" - installdepends=("tarnish=$pkgver" "liboxide=$pkgver" "libsentry=$_sentryver") + installdepends=("tarnish=$pkgver" "oxide-utils=$pkgver" "liboxide=$pkgver" "libsentry=$_sentryver") package() { 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() { + if is-active "tarnish.service"; then + update-desktop-database + fi + } } oxide() { pkgdesc="Launcher application" section="launchers" - installdepends=("erode=$pkgver" "fret=$pkgver" "tarnish=$pkgver" "rot=$pkgver" "decay=$pkgver" "liboxide=$pkgver" "libsentry=$_sentryver") + installdepends=("erode=$pkgver" "fret=$pkgver" "tarnish=$pkgver" "rot=$pkgver" "decay=$pkgver" "oxide-utils=$pkgver" "liboxide=$pkgver" "libsentry=$_sentryver") package() { install -D -m 755 -t "$pkgdir"/opt/bin "$srcdir"/release/opt/bin/oxide @@ -62,11 +69,8 @@ oxide() { install -D -m 644 -t "$pkgdir"/opt/usr/share/applications "$srcdir"/release/opt/usr/share/applications/codes.eeems.oxide.oxide } configure() { - if ! is-enabled "tarnish.service"; then - echo "" - echo "Run the following command(s) to use $pkgname as your launcher" - how-to-enable "tarnish.service" - echo "" + if is-active "tarnish.service"; then + update-desktop-database fi } } @@ -97,6 +101,12 @@ tarnish() { } configure() { systemctl daemon-reload + if ! is-enabled "tarnish.service"; then + echo "" + echo "Run the following command(s) to use $pkgname as your launcher" + how-to-enable "tarnish.service" + echo "" + fi } preremove() { if is-active tarnish; then @@ -116,28 +126,40 @@ tarnish() { decay() { pkgdesc="Lockscreen application" section="utils" - installdepends=(display "tarnish=$pkgver" "liboxide=$pkgver" "libsentry=$_sentryver") + installdepends=(display "tarnish=$pkgver" "oxide-utils=$pkgver" "liboxide=$pkgver" "libsentry=$_sentryver") package() { 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() { + if is-active "tarnish.service"; then + update-desktop-database + fi + } } corrupt() { pkgdesc="Task Switcher for Oxide" section="utils" - installdepends=(display "tarnish=$pkgver" "liboxide=$pkgver" "libsentry=$_sentryver") + installdepends=(display "tarnish=$pkgver" "oxide-utils=$pkgver" "liboxide=$pkgver" "libsentry=$_sentryver") package() { 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() { + if is-active "tarnish.service"; then + update-desktop-database + fi + } } anxiety() { pkgdesc="Screenshot viewer for Oxide" section="utils" - installdepends=(display "tarnish=$pkgver" "liboxide=$pkgver" "libsentry=$_sentryver") + installdepends=(display "tarnish=$pkgver" "oxide-utils=$pkgver" "liboxide=$pkgver" "libsentry=$_sentryver") package() { install -D -m 755 -t "$pkgdir"/opt/bin "$srcdir"/release/opt/bin/anxiety @@ -145,6 +167,40 @@ anxiety() { install -D -m 644 -t "$pkgdir"/opt/etc/draft/icons "$srcdir"/release/opt/etc/draft/icons/image.svg install -D -m 644 -t "$pkgdir"/opt/etc/draft/icons "$srcdir"/release/opt/etc/draft/icons/anxiety-splash.png } + + configure() { + if is-active "tarnish.service"; then + update-desktop-database + fi + } +} + +oxide-utils() { + pkgdesc="Command line tools for Oxide" + section=admin + installdepends=("tarnish=$pkgver" "liboxide=$pkgver" "libsentry=$_sentryver") + replaces=(notify-send) + conflicts=(notify-send) + + package() { + install -D -m 755 -t "$pkgdir"/opt/bin "$srcdir"/release/opt/bin/notify-send + install -D -m 755 -t "$pkgdir"/opt/bin "$srcdir"/release/opt/bin/update-desktop-database + install -D -m 755 -t "$pkgdir"/opt/bin "$srcdir"/release/opt/bin/desktop-file-validate + 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/gio + } +} + +inject_evdev() { + pkgdesc="Inject input events" + section=utils + installdepends=("liboxide=$pkgver" "libsentry=$_sentryver") + + package() { + install -D -m 755 -t "$pkgdir"/opt/bin "$srcdir"/release/opt/bin/inject_evdev + } } liboxide() { @@ -167,13 +223,3 @@ libsentry() { install -D -m 755 -t "$pkgdir"/opt/lib "$srcdir"/release/opt/lib/libsentry.so } } - -notify-send() { - pkgdesc="A program to send desktop notifications for Oxide" - section=utils - installdepends=("tarnish=$pkgver" "liboxide=$pkgver" "libsentry=$_sentryver") - - package() { - install -D -m 755 -t "$pkgdir"/opt/bin "$srcdir"/release/opt/bin/notify-send - } -} From fb0880f9399f961415e2495acaa9fd170cbee8f1 Mon Sep 17 00:00:00 2001 From: Nathaniel van Diepen Date: Mon, 5 Jun 2023 17:47:11 -0600 Subject: [PATCH 02/24] Style fixes --- package/oxide/package | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/package/oxide/package b/package/oxide/package index 491df8ade..ee1bb8977 100644 --- a/package/oxide/package +++ b/package/oxide/package @@ -177,7 +177,7 @@ anxiety() { oxide-utils() { pkgdesc="Command line tools for Oxide" - section=admin + section="admin" installdepends=("tarnish=$pkgver" "liboxide=$pkgver" "libsentry=$_sentryver") replaces=(notify-send) conflicts=(notify-send) @@ -195,7 +195,7 @@ oxide-utils() { inject_evdev() { pkgdesc="Inject input events" - section=utils + section="utils" installdepends=("liboxide=$pkgver" "libsentry=$_sentryver") package() { @@ -205,7 +205,7 @@ inject_evdev() { liboxide() { pkgdesc="Shared library for oxide applications" - section=devel + section="devel" package() { install -D -m 755 -t "$pkgdir"/opt/usr/lib "$srcdir"/release/opt/usr/lib/libliboxide.so* @@ -214,7 +214,7 @@ liboxide() { libsentry() { pkgdesc="Sentry SDK for C, C++ and native applications." - section=devel + section="devel" url=https://github.com/getsentry/sentry-native pkgver="$_sentryver" timestamp="2022-08-02T14:40:22Z" From 57299ecbc6b34bec0284879193c6165ffae24c52 Mon Sep 17 00:00:00 2001 From: Nathaniel van Diepen Date: Mon, 5 Jun 2023 17:49:24 -0600 Subject: [PATCH 03/24] Add missing pkgnames --- package/oxide/package | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/oxide/package b/package/oxide/package index ee1bb8977..66622f92e 100644 --- a/package/oxide/package +++ b/package/oxide/package @@ -2,7 +2,7 @@ # Copyright (c) 2021 The Toltec Contributors # SPDX-License-Identifier: MIT -pkgnames=(erode fret oxide rot tarnish decay corrupt anxiety liboxide libsentry notify-send) +pkgnames=(erode fret oxide rot tarnish decay corrupt anxiety oxide-utils inject_evdev liboxide libsentry) _oxidever=2.6 pkgver=$_oxidever-1 _sentryver=0.5.0 From 1bb631d26c8628f4fb61b105ff33da4569cf676a Mon Sep 17 00:00:00 2001 From: Nathaniel van Diepen Date: Mon, 5 Jun 2023 18:07:33 -0600 Subject: [PATCH 04/24] Update image paths --- package/oxide/package | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/package/oxide/package b/package/oxide/package index 66622f92e..8c72901fc 100644 --- a/package/oxide/package +++ b/package/oxide/package @@ -34,8 +34,8 @@ erode() { package() { install -D -m 755 -t "$pkgdir"/opt/bin "$srcdir"/release/opt/bin/erode - install -D -m 644 -t "$pkgdir"/opt/etc/draft/icons "$srcdir"/release/opt/etc/draft/icons/erode.svg - install -D -m 644 -t "$pkgdir"/opt/etc/draft/icons "$srcdir"/release/opt/etc/draft/icons/erode-splash.png + install -D -m 644 -t "$pkgdir"/opt/usr/share/icons/oxide/48x48/apps "$srcdir"/release/opt/usr/share/icons/oxide/48x48/apps/erode.png + install -D -m 644 -t "$pkgdir"/opt/usr/share/icons/oxide/702x702/splash "$srcdir"/release/opt/usr/share/icons/oxide/702x702/splash/erode.png install -D -m 644 -t "$pkgdir"/opt/usr/share/applications "$srcdir"/release/opt/usr/share/applications/codes.eeems.erode.oxide } } @@ -65,8 +65,8 @@ oxide() { package() { install -D -m 755 -t "$pkgdir"/opt/bin "$srcdir"/release/opt/bin/oxide install -D -m 644 -t "$pkgdir"/opt/etc "$srcdir"/release/opt/etc/oxide.conf - install -D -m 644 -t "$pkgdir"/opt/etc/draft/icons "$srcdir"/release/opt/etc/draft/icons/oxide-splash.png 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() { if is-active "tarnish.service"; then @@ -164,8 +164,8 @@ anxiety() { package() { install -D -m 755 -t "$pkgdir"/opt/bin "$srcdir"/release/opt/bin/anxiety install -D -m 644 -t "$pkgdir"/opt/usr/share/applications "$srcdir"/release/opt/usr/share/applications/codes.eeems.anxiety.oxide - install -D -m 644 -t "$pkgdir"/opt/etc/draft/icons "$srcdir"/release/opt/etc/draft/icons/image.svg - install -D -m 644 -t "$pkgdir"/opt/etc/draft/icons "$srcdir"/release/opt/etc/draft/icons/anxiety-splash.png + 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() { From 9732329a9f5abf1eedca58143617fd6190d67bcc Mon Sep 17 00:00:00 2001 From: Nathaniel van Diepen Date: Mon, 5 Jun 2023 18:16:09 -0600 Subject: [PATCH 05/24] Fix liboxide path --- package/oxide/package | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/oxide/package b/package/oxide/package index 8c72901fc..123e1a595 100644 --- a/package/oxide/package +++ b/package/oxide/package @@ -208,7 +208,7 @@ liboxide() { section="devel" package() { - install -D -m 755 -t "$pkgdir"/opt/usr/lib "$srcdir"/release/opt/usr/lib/libliboxide.so* + install -D -m 755 -t "$pkgdir"/opt/lib "$srcdir"/release/opt/lib/libliboxide.so* } } From 96efba85e1ff5bd3111adaa988c1a1e71448a1d3 Mon Sep 17 00:00:00 2001 From: Nathaniel van Diepen Date: Wed, 7 Jun 2023 13:47:10 -0600 Subject: [PATCH 06/24] Don't check to see if tarnish is active update-desktop-database safely handles tarnish not running. --- package/oxide/package | 20 +++++--------------- 1 file changed, 5 insertions(+), 15 deletions(-) diff --git a/package/oxide/package b/package/oxide/package index 123e1a595..c4e25b486 100644 --- a/package/oxide/package +++ b/package/oxide/package @@ -51,9 +51,7 @@ fret() { } configure() { - if is-active "tarnish.service"; then - update-desktop-database - fi + update-desktop-database } } @@ -69,9 +67,7 @@ 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() { - if is-active "tarnish.service"; then - update-desktop-database - fi + update-desktop-database } } @@ -134,9 +130,7 @@ decay() { } configure() { - if is-active "tarnish.service"; then - update-desktop-database - fi + update-desktop-database } } corrupt() { @@ -150,9 +144,7 @@ corrupt() { } configure() { - if is-active "tarnish.service"; then - update-desktop-database - fi + update-desktop-database } } @@ -169,9 +161,7 @@ anxiety() { } configure() { - if is-active "tarnish.service"; then - update-desktop-database - fi + update-desktop-database } } From 94af2a18ebbabd0f98f64af9c3d9a0807260f075 Mon Sep 17 00:00:00 2001 From: Nathaniel van Diepen Date: Wed, 7 Jun 2023 14:08:28 -0600 Subject: [PATCH 07/24] update-desktop-database for all applicaitons --- package/calculator/package | 6 +++++- package/chessmarkable/package | 6 +++++- package/doomarkable/package | 6 +++++- package/fingerterm/package | 6 +++++- package/folly/package | 6 +++++- package/keywriter/package | 3 ++- package/koreader/package | 3 ++- package/netsurf/package | 6 +++++- package/plato/package | 3 ++- package/puzzles/package | 6 +++++- package/recrossable/package | 6 +++++- package/retris/package | 6 +++++- package/rmfm/package | 6 +++++- package/rmkit/package | 30 ++++++++++++++++++++++------ package/tilem/package | 6 +++++- package/whiteboard-hypercard/package | 6 +++++- package/wikipedia/package | 6 +++++- package/xochitl/package | 5 ++++- package/yaft/package | 6 +++++- package/zshelf/package | 6 +++++- 20 files changed, 109 insertions(+), 25 deletions(-) diff --git a/package/calculator/package b/package/calculator/package index 072063a15..ae225c63e 100644 --- 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 " @@ -37,3 +37,7 @@ package() { install -D -m 644 -t "$pkgdir"/opt/etc/draft "$srcdir"/calculator.draft install -D -m 644 -t "$pkgdir"/opt/etc/draft/icons "$srcdir"/calculator.png } + +configure() { + type update-desktop-database &> /dev/null && update-desktop-database +} diff --git a/package/chessmarkable/package b/package/chessmarkable/package index f8a4b50bd..1657fc886 100644 --- 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. " @@ -28,3 +28,7 @@ package() { install -D -m 644 "$srcdir"/oxide "$pkgdir"/opt/etc/draft/chessmarkable install -D -m 644 "$srcdir"/icon.png "$pkgdir"/opt/etc/draft/icons/chessmarkable.png } + +configure() { + type update-desktop-database &> /dev/null && update-desktop-database +} diff --git a/package/doomarkable/package b/package/doomarkable/package index 14863079f..1b61e2559 100644 --- 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. " @@ -28,3 +28,7 @@ package() { install -D -m 644 -t "$pkgdir"/opt/etc/draft "$srcdir"/doomarkable.draft install -D -m 644 -t "$pkgdir"/opt/etc/draft/icons "$srcdir"/doomarkable.png } + +configure() { + type update-desktop-database &> /dev/null && update-desktop-database +} diff --git a/package/fingerterm/package b/package/fingerterm/package index 03dc4956e..e61c0b653 100644 --- 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 " @@ -42,3 +42,7 @@ package() { install -D -m 644 -t "$pkgdir"/opt/etc/draft "$srcdir"/fingerterm.draft install -D -m 644 -t "$pkgdir"/opt/etc/draft/icons "$srcdir"/fingerterm.png } + +configure() { + type update-desktop-database &> /dev/null && update-desktop-database +} diff --git a/package/folly/package b/package/folly/package index 2682d2c7d..3bcf22c51 100644 --- a/package/folly/package +++ b/package/folly/package @@ -5,7 +5,7 @@ pkgnames=(folly) pkgdesc="Z-machine interpreter for interactive fiction" url="https://github.com/bkirwi/folly" -pkgver=0.0.1-3 +pkgver=0.0.1-4 timestamp=2022-04-18T17:50:16Z section=games maintainer="Ben Kirwin " @@ -53,3 +53,7 @@ package() { install -D -m 755 "$srcdir"/target/*/release/folly "$pkgdir"/opt/bin/folly install -D -m 644 "$srcdir"/folly.draft "$pkgdir"/opt/etc/draft/folly.draft } + +configure() { + type update-desktop-database &> /dev/null && update-desktop-database +} diff --git a/package/keywriter/package b/package/keywriter/package index 542a6359d..47e98121d 100644 --- 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 " @@ -48,4 +48,5 @@ package() { configure() { mkdir -p /home/root/edit echo "Created /home/root/edit for storing your Markdown files" + type update-desktop-database &> /dev/null && update-desktop-database } diff --git a/package/koreader/package b/package/koreader/package index 904c48d4d..6a00ad8b2 100644 --- 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.04-1 +pkgver=2023.04-2 timestamp=2023-04-27T20:53:54Z section="readers" maintainer="raisjn " @@ -59,6 +59,7 @@ $(how-to-enable "$pkgname.service") MSG fi + type update-desktop-database &> /dev/null && update-desktop-database } preremove() { diff --git a/package/netsurf/package b/package/netsurf/package index 8213b73fb..645f81464 100644 --- 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 " archs=(rmall) @@ -77,3 +77,7 @@ package() { # Default Choices file install -D -m 644 "$srcdir"/example/Choices "$pkgdir"/opt/usr/share/netsurf/Choices } + +configure() { + type update-desktop-database &> /dev/null && update-desktop-database +} diff --git a/package/plato/package b/package/plato/package index 9e26440b3..3be45bc92 100644 --- 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.25-2 +pkgver=0.9.25-3 timestamp=2022-02-08T23:54Z section="readers" maintainer="Linus K. " @@ -109,4 +109,5 @@ configure() { echo "" fi fi + type update-desktop-database &> /dev/null && update-desktop-database } diff --git a/package/puzzles/package b/package/puzzles/package index c8be2ea79..8e800c121 100644 --- 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 " -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" @@ -38,3 +38,7 @@ package() { install -D -m 644 "$srcdir"/help/* -t "$pkgdir"/opt/etc/puzzles/help/ install -D -m 644 "$srcdir"/icons/* -t "$pkgdir"/opt/etc/puzzles/icons/ } + +configure() { + type update-desktop-database &> /dev/null && update-desktop-database +} diff --git a/package/recrossable/package b/package/recrossable/package index 7b191353b..ba1096bf8 100644 --- 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 " @@ -47,3 +47,7 @@ package() { install -D -m 644 -t "$pkgdir"/opt/etc/draft "$srcdir"/recrossable.draft install -D -m 644 -t "$pkgdir"/opt/etc/draft/icons "$srcdir"/recrossable.png } + +configure() { + type update-desktop-database &> /dev/null && update-desktop-database +} diff --git a/package/retris/package b/package/retris/package index 173b5d8ba..6bbbabb87 100644 --- a/package/retris/package +++ b/package/retris/package @@ -5,7 +5,7 @@ pkgnames=(retris) pkgdesc="Tetris game" url=https://github.com/LinusCDE/retris -pkgver=0.6.3-3 +pkgver=0.6.3-4 timestamp=2021-01-30T02:41Z section="games" maintainer="Linus K. " @@ -28,3 +28,7 @@ package() { install -D -m 644 "$srcdir"/oxide "$pkgdir"/opt/etc/draft/retris install -D -m 644 "$srcdir"/icon.png "$pkgdir"/opt/etc/draft/icons/retris.png } + +configure() { + type update-desktop-database &> /dev/null && update-desktop-database +} diff --git a/package/rmfm/package b/package/rmfm/package index 01bdfca9d..2434c6b15 100644 --- a/package/rmfm/package +++ b/package/rmfm/package @@ -5,7 +5,7 @@ pkgnames=(rmfm) pkgdesc="Bare-bones file manager using Node.js and sas" url="https://forgejo.sny.sh/sun/rmFM" -pkgver=1.4.0-3 +pkgver=1.4.0-4 timestamp=2022-08-19T11:20:10+02:00 section=utils maintainer="Sunny " @@ -33,3 +33,7 @@ package() { install -D -m 644 "$srcdir"/rmfm.draft "$pkgdir"/opt/etc/draft/rmfm.draft install -D -m 644 "$srcdir"/rmfm.png "$pkgdir"/opt/etc/draft/icons/rmfm.png } + +configure() { + type update-desktop-database &> /dev/null && update-desktop-database +} diff --git a/package/rmkit/package b/package/rmkit/package index 9c5cda508..369aeb8b2 100644 --- a/package/rmkit/package +++ b/package/rmkit/package @@ -40,7 +40,7 @@ bufshot() { dumbskull() { pkgdesc="Dungeon Crawl themed Solitaire" url="https://rmkit.dev/apps/dumbskull" - pkgver=0.0.1-2 + pkgver=0.0.1-3 section="games" package() { @@ -48,6 +48,9 @@ dumbskull() { install -D -m 644 "$srcdir"/src/dumbskull/dumbskull.draft "$pkgdir"/opt/etc/draft/dumbskull.draft } + configure() { + type update-desktop-database &> /dev/null && update-desktop-database + } } genie() { @@ -80,7 +83,7 @@ genie() { harmony() { pkgdesc="Procedural sketching app" url="https://rmkit.dev/apps/harmony" - pkgver=0.2.2-1 + pkgver=0.2.2-2 section="drawing" package() { @@ -91,6 +94,7 @@ harmony() { configure() { mkdir -p /home/root/harmony/saved_images + type update-desktop-database &> /dev/null && update-desktop-database } } @@ -120,7 +124,7 @@ lamp() { mines() { pkgdesc="Mine detection game" url="https://rmkit.dev/apps/minesweeper" - pkgver=0.1.4-2 + pkgver=0.1.4-3 section="games" package() { @@ -128,12 +132,16 @@ mines() { install -D -m 644 "$srcdir"/src/minesweeper/mines.draft "$pkgdir"/opt/etc/draft/mines.draft install -D -m 644 "$srcdir"/src/minesweeper/mines1.png "$pkgdir"/opt/etc/draft/icons/mines.png } + + configure() { + type update-desktop-database &> /dev/null && update-desktop-database + } } nao() { pkgdesc="Nao Package Manager: opkg UI built with SAS" url="https://rmkit.dev/apps/nao" - pkgver=0.1.2-3 + pkgver=0.1.2-4 section="admin" installdepends+=(simple) @@ -142,6 +150,10 @@ nao() { install -D -m 644 "$srcdir"/src/nao/nao.draft "$pkgdir"/opt/etc/draft/nao.draft install -D -m 644 "$srcdir"/src/nao/nao.png "$pkgdir"/opt/etc/draft/icons/nao.png } + + configure() { + type update-desktop-database &> /dev/null && update-desktop-database + } } remux() { @@ -179,7 +191,7 @@ remux() { rpncalc() { pkgdesc="RPN Calculator" url="https://rmkit.dev/apps/rpncalc" - pkgver=0.0.3-2 + pkgver=0.0.3-3 section="math" package() { @@ -188,6 +200,9 @@ rpncalc() { install -D -m 644 "$srcdir"/src/rpncalc/rpncalc.png "$pkgdir"/opt/etc/draft/icons/rpncalc.png } + configure() { + type update-desktop-database &> /dev/null && update-desktop-database + } } simple() { @@ -204,7 +219,7 @@ simple() { wordlet() { pkgdesc="Wordle clone" url="https://rmkit.dev/apps/wordlet" - pkgver=0.0.2-2 + pkgver=0.0.2-3 section="games" package() { @@ -212,4 +227,7 @@ wordlet() { install -D -m 644 "$srcdir"/src/wordlet/wordlet.draft "$pkgdir"/opt/etc/draft/wordlet.draft } + configure() { + type update-desktop-database &> /dev/null && update-desktop-database + } } diff --git a/package/tilem/package b/package/tilem/package index 436678c87..13a1171a7 100644 --- a/package/tilem/package +++ b/package/tilem/package @@ -5,7 +5,7 @@ pkgnames=(tilem) pkgdesc="TI-84+ calculator emulator" url=https://github.com/timower/rM2-stuff/tree/master/apps/tilem -pkgver=0.0.7-2 +pkgver=0.0.7-3 timestamp=2021-04-30T10:42Z maintainer="Mattéo Delabre " license=GPL-3.0 @@ -30,3 +30,7 @@ build() { package() { cp -r "$srcdir/install/." "$pkgdir" } + +configure() { + type update-desktop-database &> /dev/null && update-desktop-database +} diff --git a/package/whiteboard-hypercard/package b/package/whiteboard-hypercard/package index 36dc05edc..0b76af704 100644 --- a/package/whiteboard-hypercard/package +++ b/package/whiteboard-hypercard/package @@ -5,7 +5,7 @@ pkgnames=(whiteboard-hypercard) pkgdesc="Real-time collaboration, drawing or whiteboarding" url=https://github.com/fenollp/reMarkable-tools -pkgver=0.3.4-1 +pkgver=0.3.4-2 timestamp=2021-10-25T15:45Z section="drawing" maintainer="Pierre Fenoll " @@ -33,3 +33,7 @@ package() { install -D -m 755 -t "$pkgdir"/opt/bin "$srcdir"/marauder/target/armv7-unknown-linux-gnueabihf/release/whiteboard install -D -m 644 -t "$pkgdir"/opt/etc/draft "$srcdir"/whiteboard-hypercard.draft } + +configure() { + type update-desktop-database &> /dev/null && update-desktop-database +} diff --git a/package/wikipedia/package b/package/wikipedia/package index a7c44adf6..05707c9cb 100644 --- a/package/wikipedia/package +++ b/package/wikipedia/package @@ -5,7 +5,7 @@ pkgnames=(wikipedia) pkgdesc="The free encyclopedia" url=https://github.com/dps/remarkable-wikipedia -pkgver=0.1.0-3 +pkgver=0.1.0-4 timestamp=2021-03-11T04:50Z section="readers" maintainer="David Singleton " @@ -36,3 +36,7 @@ package() { install -D -m 644 -t "$pkgdir"/opt/etc/draft "$srcdir"/wikipedia.draft install -D -m 644 -t "$pkgdir"/opt/etc/draft/icons "$srcdir"/wikipedia.png } + +configure() { + type update-desktop-database &> /dev/null && update-desktop-database +} diff --git a/package/xochitl/package b/package/xochitl/package index 1ebefec09..6a99fe18a 100644 --- a/package/xochitl/package +++ b/package/xochitl/package @@ -5,7 +5,7 @@ pkgnames=(xochitl) pkgdesc="Read documents and take notes" url=https://remarkable.com -pkgver=0.0.0-14 +pkgver=0.0.0-15 timestamp=2022-11-07T20:19:57Z section="readers" maintainer="Mattéo Delabre " @@ -80,6 +80,9 @@ configure() { # of this alias by re-enabling the service systemctl enable xochitl.service 2> /dev/null fi + + # Reload the oxide application registration if it is already installed + type update-desktop-database &> /dev/null && update-desktop-database } preremove() { diff --git a/package/yaft/package b/package/yaft/package index fc26750fb..6b7d3ba6c 100644 --- a/package/yaft/package +++ b/package/yaft/package @@ -5,7 +5,7 @@ pkgnames=(yaft) pkgdesc="Yet another framebuffer terminal" url=https://github.com/timower/rM2-stuff/tree/master/apps/yaft -pkgver=0.0.7-1 +pkgver=0.0.7-2 timestamp=2021-05-02T09:23Z maintainer="Mattéo Delabre " license=GPL-3.0 @@ -38,3 +38,7 @@ build() { package() { cp -r "$srcdir/install/." "$pkgdir" } + +configure() { + type update-desktop-database &> /dev/null && update-desktop-database +} diff --git a/package/zshelf/package b/package/zshelf/package index bd1491464..e92fafb85 100644 --- a/package/zshelf/package +++ b/package/zshelf/package @@ -5,7 +5,7 @@ pkgnames=(zshelf) pkgdesc="Z-Library browser and downloader" url=https://github.com/khanhas/zshelf -pkgver=0.3.1-3 +pkgver=0.3.1-4 section=utils timestamp=2021-02-20T01:45Z maintainer="khanhas " @@ -62,3 +62,7 @@ configure() { echo "Config file locates at:" /opt/etc/zshelf/config.json echo "" } + +configure() { + type update-desktop-database &> /dev/null && update-desktop-database +} From d28a78f357028bd3dd4e77e3703a86ac584f535c Mon Sep 17 00:00:00 2001 From: Nathaniel van Diepen Date: Wed, 7 Jun 2023 20:43:32 -0600 Subject: [PATCH 08/24] Update build image for plato --- package/plato/package | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/plato/package b/package/plato/package index 3be45bc92..fccd72449 100644 --- a/package/plato/package +++ b/package/plato/package @@ -14,7 +14,7 @@ installdepends=(display jq) makedepends=(build:jq build:unzip build:wget) flags=(patch_rm2fb) -image=rust:v2.2.2 +image=rust:v2.3 source=("https://github.com/LinusCDE/plato/archive/${pkgver%-*}-rm-release-12.zip") sha256sums=(42e18e882e7e6853e299234a44eea9b9e3c4170076eec0577a0644dcf7005cf9) From 64cd72bf24a04afdc2083a0db5d92d9c1072903f Mon Sep 17 00:00:00 2001 From: Linus Date: Thu, 8 Jun 2023 14:26:19 +0200 Subject: [PATCH 09/24] Re-trigger CI Most likely a one-off error: Timeout when connecting to github From 91e857010450426c0d76225eccd8199a3e59f9f2 Mon Sep 17 00:00:00 2001 From: Nathaniel van Diepen Date: Thu, 8 Jun 2023 15:14:21 -0600 Subject: [PATCH 10/24] Update to latest image for zoneinfo-utils --- package/zoneinfo-utils/package | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/zoneinfo-utils/package b/package/zoneinfo-utils/package index f31bd7eb8..b4c0e74a8 100644 --- a/package/zoneinfo-utils/package +++ b/package/zoneinfo-utils/package @@ -16,7 +16,7 @@ license="custom: public domain" installdepends=(zoneinfo-core) makedepends=(build:gawk) -image=base:v2.1 +image=base:v2.3 source=( "https://www.iana.org/time-zones/repository/releases/tzcode${_tzver}.tar.gz" "https://www.iana.org/time-zones/repository/releases/tzdata${_tzver}.tar.gz" From 416f7ac3173a40affaf15364b052eab45ac57df0 Mon Sep 17 00:00:00 2001 From: Nathaniel van Diepen Date: Thu, 8 Jun 2023 22:35:51 -0600 Subject: [PATCH 11/24] Add libc6 build dependency to zoneinfo-utils --- package/zoneinfo-utils/package | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/zoneinfo-utils/package b/package/zoneinfo-utils/package index b4c0e74a8..d7dd26c58 100644 --- a/package/zoneinfo-utils/package +++ b/package/zoneinfo-utils/package @@ -14,7 +14,7 @@ section=utils maintainer="Eeems " license="custom: public domain" installdepends=(zoneinfo-core) -makedepends=(build:gawk) +makedepends=(build:gawk build:libc6) image=base:v2.3 source=( From d03d26d988a76c96c1ed781bb1d3f2661623ef7c Mon Sep 17 00:00:00 2001 From: Nathaniel van Diepen Date: Thu, 8 Jun 2023 22:36:57 -0600 Subject: [PATCH 12/24] Revert all changes to zoneinfo-utils --- package/zoneinfo-utils/package | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package/zoneinfo-utils/package b/package/zoneinfo-utils/package index d7dd26c58..f31bd7eb8 100644 --- a/package/zoneinfo-utils/package +++ b/package/zoneinfo-utils/package @@ -14,9 +14,9 @@ section=utils maintainer="Eeems " license="custom: public domain" installdepends=(zoneinfo-core) -makedepends=(build:gawk build:libc6) +makedepends=(build:gawk) -image=base:v2.3 +image=base:v2.1 source=( "https://www.iana.org/time-zones/repository/releases/tzcode${_tzver}.tar.gz" "https://www.iana.org/time-zones/repository/releases/tzdata${_tzver}.tar.gz" From dd56852969ca8d02a7ae054ce5110d9d1b3af23d Mon Sep 17 00:00:00 2001 From: Nathaniel van Diepen Date: Mon, 14 Aug 2023 11:02:24 -0600 Subject: [PATCH 13/24] Update all packages to use install-lib method --- package/calculator/package | 2 +- package/chessmarkable/package | 2 +- package/doomarkable/package | 2 +- package/fingerterm/package | 2 +- package/folly/package | 2 +- package/keywriter/package | 2 +- package/koreader/package | 2 +- package/netsurf/package | 2 +- package/plato/package | 2 +- package/puzzles/package | 2 +- package/recrossable/package | 2 +- package/reterm/package | 4 +--- package/retris/package | 2 +- package/rmfm/package | 2 +- package/rmkit/package | 12 ++++++------ package/tilem/package | 2 +- package/whiteboard-hypercard/package | 2 +- package/wikipedia/package | 2 +- package/xochitl/package | 4 +--- package/yaft/package | 2 +- package/zshelf/package | 2 +- scripts/install-lib | 12 ++++++++++-- 22 files changed, 36 insertions(+), 32 deletions(-) diff --git a/package/calculator/package b/package/calculator/package index ae225c63e..1eb4c556a 100644 --- a/package/calculator/package +++ b/package/calculator/package @@ -39,5 +39,5 @@ package() { } configure() { - type update-desktop-database &> /dev/null && update-desktop-database + reload-oxide-apps } diff --git a/package/chessmarkable/package b/package/chessmarkable/package index 1657fc886..2d909d230 100644 --- a/package/chessmarkable/package +++ b/package/chessmarkable/package @@ -30,5 +30,5 @@ package() { } configure() { - type update-desktop-database &> /dev/null && update-desktop-database + reload-oxide-apps } diff --git a/package/doomarkable/package b/package/doomarkable/package index 1b61e2559..9dac30cf2 100644 --- a/package/doomarkable/package +++ b/package/doomarkable/package @@ -30,5 +30,5 @@ package() { } configure() { - type update-desktop-database &> /dev/null && update-desktop-database + reload-oxide-apps } diff --git a/package/fingerterm/package b/package/fingerterm/package index e61c0b653..f20d2fcbd 100644 --- a/package/fingerterm/package +++ b/package/fingerterm/package @@ -44,5 +44,5 @@ package() { } configure() { - type update-desktop-database &> /dev/null && update-desktop-database + reload-oxide-apps } diff --git a/package/folly/package b/package/folly/package index 3bcf22c51..e34ef9c42 100644 --- a/package/folly/package +++ b/package/folly/package @@ -55,5 +55,5 @@ package() { } configure() { - type update-desktop-database &> /dev/null && update-desktop-database + reload-oxide-apps } diff --git a/package/keywriter/package b/package/keywriter/package index 47e98121d..c9ebed797 100644 --- a/package/keywriter/package +++ b/package/keywriter/package @@ -48,5 +48,5 @@ package() { configure() { mkdir -p /home/root/edit echo "Created /home/root/edit for storing your Markdown files" - type update-desktop-database &> /dev/null && update-desktop-database + reload-oxide-apps } diff --git a/package/koreader/package b/package/koreader/package index a7142e71d..ed39474c6 100644 --- a/package/koreader/package +++ b/package/koreader/package @@ -59,7 +59,7 @@ $(how-to-enable "$pkgname.service") MSG fi - type update-desktop-database &> /dev/null && update-desktop-database + reload-oxide-apps } preremove() { diff --git a/package/netsurf/package b/package/netsurf/package index 645f81464..e7aa3fce9 100644 --- a/package/netsurf/package +++ b/package/netsurf/package @@ -79,5 +79,5 @@ package() { } configure() { - type update-desktop-database &> /dev/null && update-desktop-database + reload-oxide-apps } diff --git a/package/plato/package b/package/plato/package index 9c8c2c228..4b4e68faf 100644 --- a/package/plato/package +++ b/package/plato/package @@ -108,5 +108,5 @@ configure() { echo "" fi fi - type update-desktop-database &> /dev/null && update-desktop-database + reload-oxide-apps } diff --git a/package/puzzles/package b/package/puzzles/package index 8e800c121..72a937b63 100644 --- a/package/puzzles/package +++ b/package/puzzles/package @@ -40,5 +40,5 @@ package() { } configure() { - type update-desktop-database &> /dev/null && update-desktop-database + reload-oxide-apps } diff --git a/package/recrossable/package b/package/recrossable/package index ba1096bf8..5bf3fca74 100644 --- a/package/recrossable/package +++ b/package/recrossable/package @@ -49,5 +49,5 @@ package() { } configure() { - type update-desktop-database &> /dev/null && update-desktop-database + reload-oxide-apps } diff --git a/package/reterm/package b/package/reterm/package index a0a37a6d2..a33f3b209 100644 --- a/package/reterm/package +++ b/package/reterm/package @@ -51,7 +51,5 @@ package() { } configure() { - if is-active "tarnish.service"; then - type update-desktop-database &> /dev/null && update-desktop-database - fi + reload-oxide-apps } diff --git a/package/retris/package b/package/retris/package index 6bbbabb87..e5f4c7bce 100644 --- a/package/retris/package +++ b/package/retris/package @@ -30,5 +30,5 @@ package() { } configure() { - type update-desktop-database &> /dev/null && update-desktop-database + reload-oxide-apps } diff --git a/package/rmfm/package b/package/rmfm/package index 2434c6b15..9b0a814b1 100644 --- a/package/rmfm/package +++ b/package/rmfm/package @@ -35,5 +35,5 @@ package() { } configure() { - type update-desktop-database &> /dev/null && update-desktop-database + reload-oxide-apps } diff --git a/package/rmkit/package b/package/rmkit/package index 369aeb8b2..b72014368 100644 --- a/package/rmkit/package +++ b/package/rmkit/package @@ -49,7 +49,7 @@ dumbskull() { } configure() { - type update-desktop-database &> /dev/null && update-desktop-database + reload-oxide-apps } } @@ -94,7 +94,7 @@ harmony() { configure() { mkdir -p /home/root/harmony/saved_images - type update-desktop-database &> /dev/null && update-desktop-database + reload-oxide-apps } } @@ -134,7 +134,7 @@ mines() { } configure() { - type update-desktop-database &> /dev/null && update-desktop-database + reload-oxide-apps } } @@ -152,7 +152,7 @@ nao() { } configure() { - type update-desktop-database &> /dev/null && update-desktop-database + reload-oxide-apps } } @@ -201,7 +201,7 @@ rpncalc() { } configure() { - type update-desktop-database &> /dev/null && update-desktop-database + reload-oxide-apps } } @@ -228,6 +228,6 @@ wordlet() { } configure() { - type update-desktop-database &> /dev/null && update-desktop-database + reload-oxide-apps } } diff --git a/package/tilem/package b/package/tilem/package index 13a1171a7..bf0676073 100644 --- a/package/tilem/package +++ b/package/tilem/package @@ -32,5 +32,5 @@ package() { } configure() { - type update-desktop-database &> /dev/null && update-desktop-database + reload-oxide-apps } diff --git a/package/whiteboard-hypercard/package b/package/whiteboard-hypercard/package index 0b76af704..71de5aafb 100644 --- a/package/whiteboard-hypercard/package +++ b/package/whiteboard-hypercard/package @@ -35,5 +35,5 @@ package() { } configure() { - type update-desktop-database &> /dev/null && update-desktop-database + reload-oxide-apps } diff --git a/package/wikipedia/package b/package/wikipedia/package index 05707c9cb..7d9285cdf 100644 --- a/package/wikipedia/package +++ b/package/wikipedia/package @@ -38,5 +38,5 @@ package() { } configure() { - type update-desktop-database &> /dev/null && update-desktop-database + reload-oxide-apps } diff --git a/package/xochitl/package b/package/xochitl/package index 6a99fe18a..9ded4356c 100644 --- a/package/xochitl/package +++ b/package/xochitl/package @@ -80,9 +80,7 @@ configure() { # of this alias by re-enabling the service systemctl enable xochitl.service 2> /dev/null fi - - # Reload the oxide application registration if it is already installed - type update-desktop-database &> /dev/null && update-desktop-database + reload-oxide-apps } preremove() { diff --git a/package/yaft/package b/package/yaft/package index a5b493b70..9d772f666 100644 --- a/package/yaft/package +++ b/package/yaft/package @@ -41,5 +41,5 @@ package() { } configure() { - type update-desktop-database &> /dev/null && update-desktop-database + reload-oxide-apps } diff --git a/package/zshelf/package b/package/zshelf/package index e92fafb85..6001d4506 100644 --- a/package/zshelf/package +++ b/package/zshelf/package @@ -64,5 +64,5 @@ configure() { } configure() { - type update-desktop-database &> /dev/null && update-desktop-database + reload-oxide-apps } diff --git a/scripts/install-lib b/scripts/install-lib index cb98421bf..c28225900 100644 --- a/scripts/install-lib +++ b/scripts/install-lib @@ -105,10 +105,18 @@ reload-oxide-apps() { return fi echo -n "Reloading Oxide applications: " - if ! /opt/bin/rot apps call reload 2> /dev/null; then - echo "Failed!" + local ret + if type update-desktop-database &> /dev/null;then + update-desktop-database --quiet + ret=$? else + /opt/bin/rot apps call reload 2> /dev/null + ret=$? + fi + if [ $ret -eq 0 ]; then echo "Done!" + else + echo "Failed!" fi } From b4c29bae4c24c28d5898998a1931a2d93f3601fb Mon Sep 17 00:00:00 2001 From: Nathaniel van Diepen Date: Mon, 14 Aug 2023 11:05:15 -0600 Subject: [PATCH 14/24] Fix formatting --- scripts/install-lib | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/install-lib b/scripts/install-lib index c28225900..59c35e2bb 100644 --- a/scripts/install-lib +++ b/scripts/install-lib @@ -106,7 +106,7 @@ reload-oxide-apps() { fi echo -n "Reloading Oxide applications: " local ret - if type update-desktop-database &> /dev/null;then + if type update-desktop-database &> /dev/null; then update-desktop-database --quiet ret=$? else From cac6f6ecf9252ee7c9896fcc0da2720cbec33b78 Mon Sep 17 00:00:00 2001 From: Nathaniel van Diepen Date: Thu, 24 Aug 2023 12:43:03 -0600 Subject: [PATCH 15/24] Also run oxide hook for draft apps --- package/oxide/package | 19 ------------------- scripts/toltec/builder.py | 29 ++++++++++------------------- 2 files changed, 10 insertions(+), 38 deletions(-) diff --git a/package/oxide/package b/package/oxide/package index c4e25b486..08ff1faf3 100644 --- a/package/oxide/package +++ b/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() { diff --git a/scripts/toltec/builder.py b/scripts/toltec/builder.py index 27253eef2..3746926bf 100644 --- a/scripts/toltec/builder.py +++ b/scripts/toltec/builder.py @@ -169,9 +169,7 @@ def _make_arch( self._build(recipe, src_dir) self._postprocessing(recipe, src_dir) - for package in ( - packages if packages is not None else recipe.packages.values() - ): + for package in packages if packages is not None else recipe.packages.values(): self.context["package"] = package.name pkg_dir = os.path.join(base_pkg_dir, package.name) os.makedirs(pkg_dir, exist_ok=True) @@ -197,9 +195,7 @@ def _fetch_sources( if self.URL_REGEX.match(source.url) is None: # Get source file from the recipe’s directory - shutil.copy2( - os.path.join(recipe.parent.path, source.url), local_path - ) + shutil.copy2(os.path.join(recipe.parent.path, source.url), local_path) else: # Fetch source file from the network req = requests.get(source.url, timeout=5) @@ -393,8 +389,7 @@ def _postprocessing(self, recipe: Recipe, src_dir: str) -> None: script.append( "strip --strip-all -- " + " ".join( - docker_file_path(file_path) - for file_path in cand.strip_x86 + docker_file_path(file_path) for file_path in cand.strip_x86 ) ) @@ -410,8 +405,7 @@ def _postprocessing(self, recipe: Recipe, src_dir: str) -> None: script.append( '"${CROSS_COMPILE}strip" --strip-all -- ' + " ".join( - docker_file_path(file_path) - for file_path in cand.strip_arm + docker_file_path(file_path) for file_path in cand.strip_arm ) ) @@ -435,8 +429,7 @@ def _postprocessing(self, recipe: Recipe, src_dir: str) -> None: + [ "patchelf --add-needed librm2fb_client.so.1 " + " ".join( - docker_file_path(file_path) - for file_path in cand.patch_rm2fb + docker_file_path(file_path) for file_path in cand.patch_rm2fb ) ] ) @@ -499,9 +492,7 @@ def _postprocessing_candidates(src_dir: str) -> PostprocessingCandidates: and rodata.data().find(b"/dev/fb0") != -1 ): patch_rm2fb.append(file_path) - elif ( - info.get_machine_arch() in ("x86", "x64") and symtab - ): + elif info.get_machine_arch() in ("x86", "x64") and symtab: strip_x86.append(file_path) except ELFError: # Ignore non-ELF files @@ -535,9 +526,7 @@ def _package(self, package: Package, src_dir: str, pkg_dir: str) -> None: for filename in util.list_tree(pkg_dir): self.adapter.debug( " - %s", - os.path.normpath( - os.path.join("/", os.path.relpath(filename, pkg_dir)) - ), + os.path.normpath(os.path.join("/", os.path.relpath(filename, pkg_dir))), ) def _archive(self, package: Package, pkg_dir: str) -> None: @@ -548,7 +537,9 @@ def _archive(self, package: Package, pkg_dir: str) -> None: os.makedirs(ar_dir, exist_ok=True) # Inject Oxide-specific hook for reloading apps - if os.path.exists(os.path.join(pkg_dir, "opt/usr/share/applications")): + if os.path.exists( + os.path.join(pkg_dir, "opt/usr/share/applications") + ) or os.path.exists(os.path.join(pkg_dir, "opt/etc/draft")): oxide_hook = "\nreload-oxide-apps\n" package.functions["configure"] += oxide_hook package.functions["postupgrade"] += oxide_hook From 9d3ab83e67239892600a939e528991face62a87c Mon Sep 17 00:00:00 2001 From: Nathaniel van Diepen Date: Sat, 26 Aug 2023 14:30:28 -0600 Subject: [PATCH 16/24] Remove manual reload-oxide-apps calls --- package/calculator/package | 4 ---- package/chessmarkable/package | 4 ---- package/doomarkable/package | 4 ---- package/fingerterm/package | 4 ---- package/folly/package | 4 ---- package/keywriter/package | 1 - package/koreader/package | 1 - package/netsurf/package | 4 ---- package/plato/package | 1 - package/puzzles/package | 4 ---- package/recrossable/package | 4 ---- package/reterm/package | 4 ---- package/retris/package | 4 ---- package/rmfm/package | 4 ---- package/rmkit/package | 21 --------------------- package/tilem/package | 4 ---- package/whiteboard-hypercard/package | 4 ---- package/wikipedia/package | 4 ---- package/xochitl/package | 1 - package/yaft/package | 4 ---- package/zshelf/package | 4 ---- 21 files changed, 89 deletions(-) diff --git a/package/calculator/package b/package/calculator/package index 1eb4c556a..092ef00d6 100644 --- a/package/calculator/package +++ b/package/calculator/package @@ -37,7 +37,3 @@ package() { install -D -m 644 -t "$pkgdir"/opt/etc/draft "$srcdir"/calculator.draft install -D -m 644 -t "$pkgdir"/opt/etc/draft/icons "$srcdir"/calculator.png } - -configure() { - reload-oxide-apps -} diff --git a/package/chessmarkable/package b/package/chessmarkable/package index 2d909d230..6258ab355 100644 --- a/package/chessmarkable/package +++ b/package/chessmarkable/package @@ -28,7 +28,3 @@ package() { install -D -m 644 "$srcdir"/oxide "$pkgdir"/opt/etc/draft/chessmarkable install -D -m 644 "$srcdir"/icon.png "$pkgdir"/opt/etc/draft/icons/chessmarkable.png } - -configure() { - reload-oxide-apps -} diff --git a/package/doomarkable/package b/package/doomarkable/package index 9dac30cf2..3e5ae8735 100644 --- a/package/doomarkable/package +++ b/package/doomarkable/package @@ -28,7 +28,3 @@ package() { install -D -m 644 -t "$pkgdir"/opt/etc/draft "$srcdir"/doomarkable.draft install -D -m 644 -t "$pkgdir"/opt/etc/draft/icons "$srcdir"/doomarkable.png } - -configure() { - reload-oxide-apps -} diff --git a/package/fingerterm/package b/package/fingerterm/package index f20d2fcbd..80a8ea8e7 100644 --- a/package/fingerterm/package +++ b/package/fingerterm/package @@ -42,7 +42,3 @@ package() { install -D -m 644 -t "$pkgdir"/opt/etc/draft "$srcdir"/fingerterm.draft install -D -m 644 -t "$pkgdir"/opt/etc/draft/icons "$srcdir"/fingerterm.png } - -configure() { - reload-oxide-apps -} diff --git a/package/folly/package b/package/folly/package index e34ef9c42..455e47bf7 100644 --- a/package/folly/package +++ b/package/folly/package @@ -53,7 +53,3 @@ package() { install -D -m 755 "$srcdir"/target/*/release/folly "$pkgdir"/opt/bin/folly install -D -m 644 "$srcdir"/folly.draft "$pkgdir"/opt/etc/draft/folly.draft } - -configure() { - reload-oxide-apps -} diff --git a/package/keywriter/package b/package/keywriter/package index c9ebed797..32ab6d891 100644 --- a/package/keywriter/package +++ b/package/keywriter/package @@ -48,5 +48,4 @@ package() { configure() { mkdir -p /home/root/edit echo "Created /home/root/edit for storing your Markdown files" - reload-oxide-apps } diff --git a/package/koreader/package b/package/koreader/package index ed39474c6..d98e24233 100644 --- a/package/koreader/package +++ b/package/koreader/package @@ -59,7 +59,6 @@ $(how-to-enable "$pkgname.service") MSG fi - reload-oxide-apps } preremove() { diff --git a/package/netsurf/package b/package/netsurf/package index e7aa3fce9..74d427851 100644 --- a/package/netsurf/package +++ b/package/netsurf/package @@ -77,7 +77,3 @@ package() { # Default Choices file install -D -m 644 "$srcdir"/example/Choices "$pkgdir"/opt/usr/share/netsurf/Choices } - -configure() { - reload-oxide-apps -} diff --git a/package/plato/package b/package/plato/package index 4b4e68faf..c58215fcd 100644 --- a/package/plato/package +++ b/package/plato/package @@ -108,5 +108,4 @@ configure() { echo "" fi fi - reload-oxide-apps } diff --git a/package/puzzles/package b/package/puzzles/package index 72a937b63..3af1b64d3 100644 --- a/package/puzzles/package +++ b/package/puzzles/package @@ -38,7 +38,3 @@ package() { install -D -m 644 "$srcdir"/help/* -t "$pkgdir"/opt/etc/puzzles/help/ install -D -m 644 "$srcdir"/icons/* -t "$pkgdir"/opt/etc/puzzles/icons/ } - -configure() { - reload-oxide-apps -} diff --git a/package/recrossable/package b/package/recrossable/package index 5bf3fca74..476b87bef 100644 --- a/package/recrossable/package +++ b/package/recrossable/package @@ -47,7 +47,3 @@ package() { install -D -m 644 -t "$pkgdir"/opt/etc/draft "$srcdir"/recrossable.draft install -D -m 644 -t "$pkgdir"/opt/etc/draft/icons "$srcdir"/recrossable.png } - -configure() { - reload-oxide-apps -} diff --git a/package/reterm/package b/package/reterm/package index a33f3b209..78d67378d 100644 --- a/package/reterm/package +++ b/package/reterm/package @@ -49,7 +49,3 @@ package() { install -D -m 644 -t "$pkgdir"/opt/etc/draft/icons "$srcdir"/draft/reterm.png install -D -m 644 -t "$pkgdir"/opt/usr/share/applications "$srcdir"/oxide/reterm.oxide } - -configure() { - reload-oxide-apps -} diff --git a/package/retris/package b/package/retris/package index e5f4c7bce..db8a00839 100644 --- a/package/retris/package +++ b/package/retris/package @@ -28,7 +28,3 @@ package() { install -D -m 644 "$srcdir"/oxide "$pkgdir"/opt/etc/draft/retris install -D -m 644 "$srcdir"/icon.png "$pkgdir"/opt/etc/draft/icons/retris.png } - -configure() { - reload-oxide-apps -} diff --git a/package/rmfm/package b/package/rmfm/package index 9b0a814b1..836a16072 100644 --- a/package/rmfm/package +++ b/package/rmfm/package @@ -33,7 +33,3 @@ package() { install -D -m 644 "$srcdir"/rmfm.draft "$pkgdir"/opt/etc/draft/rmfm.draft install -D -m 644 "$srcdir"/rmfm.png "$pkgdir"/opt/etc/draft/icons/rmfm.png } - -configure() { - reload-oxide-apps -} diff --git a/package/rmkit/package b/package/rmkit/package index b72014368..be1585793 100644 --- a/package/rmkit/package +++ b/package/rmkit/package @@ -47,10 +47,6 @@ dumbskull() { install -D -m 755 "$srcdir"/src/build/dumbskull "$pkgdir"/opt/bin/dumbskull install -D -m 644 "$srcdir"/src/dumbskull/dumbskull.draft "$pkgdir"/opt/etc/draft/dumbskull.draft } - - configure() { - reload-oxide-apps - } } genie() { @@ -94,7 +90,6 @@ harmony() { configure() { mkdir -p /home/root/harmony/saved_images - reload-oxide-apps } } @@ -132,10 +127,6 @@ mines() { install -D -m 644 "$srcdir"/src/minesweeper/mines.draft "$pkgdir"/opt/etc/draft/mines.draft install -D -m 644 "$srcdir"/src/minesweeper/mines1.png "$pkgdir"/opt/etc/draft/icons/mines.png } - - configure() { - reload-oxide-apps - } } nao() { @@ -150,10 +141,6 @@ nao() { install -D -m 644 "$srcdir"/src/nao/nao.draft "$pkgdir"/opt/etc/draft/nao.draft install -D -m 644 "$srcdir"/src/nao/nao.png "$pkgdir"/opt/etc/draft/icons/nao.png } - - configure() { - reload-oxide-apps - } } remux() { @@ -199,10 +186,6 @@ rpncalc() { install -D -m 644 "$srcdir"/src/rpncalc/rpncalc.draft "$pkgdir"/opt/etc/draft/rpncalc.draft install -D -m 644 "$srcdir"/src/rpncalc/rpncalc.png "$pkgdir"/opt/etc/draft/icons/rpncalc.png } - - configure() { - reload-oxide-apps - } } simple() { @@ -226,8 +209,4 @@ wordlet() { install -D -m 755 "$srcdir"/src/build/wordlet "$pkgdir"/opt/bin/wordlet install -D -m 644 "$srcdir"/src/wordlet/wordlet.draft "$pkgdir"/opt/etc/draft/wordlet.draft } - - configure() { - reload-oxide-apps - } } diff --git a/package/tilem/package b/package/tilem/package index bf0676073..0c5b954f3 100644 --- a/package/tilem/package +++ b/package/tilem/package @@ -30,7 +30,3 @@ build() { package() { cp -r "$srcdir/install/." "$pkgdir" } - -configure() { - reload-oxide-apps -} diff --git a/package/whiteboard-hypercard/package b/package/whiteboard-hypercard/package index 71de5aafb..0778804ea 100644 --- a/package/whiteboard-hypercard/package +++ b/package/whiteboard-hypercard/package @@ -33,7 +33,3 @@ package() { install -D -m 755 -t "$pkgdir"/opt/bin "$srcdir"/marauder/target/armv7-unknown-linux-gnueabihf/release/whiteboard install -D -m 644 -t "$pkgdir"/opt/etc/draft "$srcdir"/whiteboard-hypercard.draft } - -configure() { - reload-oxide-apps -} diff --git a/package/wikipedia/package b/package/wikipedia/package index 7d9285cdf..a03eb4d22 100644 --- a/package/wikipedia/package +++ b/package/wikipedia/package @@ -36,7 +36,3 @@ package() { install -D -m 644 -t "$pkgdir"/opt/etc/draft "$srcdir"/wikipedia.draft install -D -m 644 -t "$pkgdir"/opt/etc/draft/icons "$srcdir"/wikipedia.png } - -configure() { - reload-oxide-apps -} diff --git a/package/xochitl/package b/package/xochitl/package index 9ded4356c..1aa004a27 100644 --- a/package/xochitl/package +++ b/package/xochitl/package @@ -80,7 +80,6 @@ configure() { # of this alias by re-enabling the service systemctl enable xochitl.service 2> /dev/null fi - reload-oxide-apps } preremove() { diff --git a/package/yaft/package b/package/yaft/package index 4298ad5a8..8bc4e5154 100644 --- a/package/yaft/package +++ b/package/yaft/package @@ -42,7 +42,3 @@ build() { package() { cp -r "$srcdir/install/." "$pkgdir" } - -configure() { - reload-oxide-apps -} diff --git a/package/zshelf/package b/package/zshelf/package index 6001d4506..0562ac3e3 100644 --- a/package/zshelf/package +++ b/package/zshelf/package @@ -62,7 +62,3 @@ configure() { echo "Config file locates at:" /opt/etc/zshelf/config.json echo "" } - -configure() { - reload-oxide-apps -} From ee22aa4fc8a8b2a488f6d5209ff1985f52b31048 Mon Sep 17 00:00:00 2001 From: Nathaniel van Diepen Date: Sat, 26 Aug 2023 14:38:32 -0600 Subject: [PATCH 17/24] Bump all other packages that have draft/oxide files --- package/koreader/package | 2 +- package/oxide/package | 2 +- package/regenda/package | 2 +- package/reterm/package | 2 +- package/sill/package | 2 +- package/vnsee/package | 2 +- package/yaft/package | 2 +- 7 files changed, 7 insertions(+), 7 deletions(-) diff --git a/package/koreader/package b/package/koreader/package index d98e24233..9e432d8ec 100644 --- 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.06.1-1 +pkgver=2023.06.1-2 timestamp=2023-07-09T08:17:26Z section="readers" maintainer="raisjn " diff --git a/package/oxide/package b/package/oxide/package index 08ff1faf3..7682d7ebb 100644 --- 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 " diff --git a/package/regenda/package b/package/regenda/package index 131f03abe..7dc259fc9 100644 --- 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.1-2 +pkgver=0.0.1-3 timestamp=2023-08-23T19:40Z section="utils" maintainer="tenJirka " diff --git a/package/reterm/package b/package/reterm/package index 78d67378d..f8dee0995 100644 --- a/package/reterm/package +++ b/package/reterm/package @@ -4,7 +4,7 @@ pkgnames=(reterm) pkgdesc="Landscape terminal support for the Remarkable 2 + type cover" section="admin" -pkgver="20230628.1927-1" +pkgver="20230628.1927-2" timestamp="2023-06-28T19:28:06Z" maintainer="Eeems " url="https://github.com/i-am-shodan/ReTerm" diff --git a/package/sill/package b/package/sill/package index 773f1e33a..f34ee5fe2 100644 --- a/package/sill/package +++ b/package/sill/package @@ -5,7 +5,7 @@ pkgnames=(sill) pkgdesc="Gesture-based text editor (and shell) for the reMarkable tablet" url=https://github.com/bkirwi/sill -pkgver=0.1.1-alpha +pkgver=0.1.1-1 section="writing" timestamp=2023-08-12T00:00Z maintainer="Kai " diff --git a/package/vnsee/package b/package/vnsee/package index 4ed1a8b1c..057220d0c 100644 --- a/package/vnsee/package +++ b/package/vnsee/package @@ -5,7 +5,7 @@ pkgnames=(vnsee) pkgdesc="VNC client allowing you to use the device as a second screen" url=https://github.com/matteodelabre/vnsee -pkgver=0.4.1-1 +pkgver=0.4.1-2 timestamp=2021-08-29T13:45:26Z section="screensharing" maintainer="Mattéo Delabre " diff --git a/package/yaft/package b/package/yaft/package index 8bc4e5154..06c11ac1b 100644 --- a/package/yaft/package +++ b/package/yaft/package @@ -6,7 +6,7 @@ pkgnames=(yaft) pkgdesc="Yet another framebuffer terminal" url=https://github.com/timower/rM2-stuff/tree/master/apps/yaft _tag=0.0.8 -pkgver=${_tag}-2 +pkgver=${_tag}-3 timestamp=2021-05-02T09:23Z maintainer="Mattéo Delabre " license=GPL-3.0 From a5181f1c118003937a9512069138a2ab0fbbadba Mon Sep 17 00:00:00 2001 From: Nathaniel van Diepen Date: Sat, 26 Aug 2023 14:40:14 -0600 Subject: [PATCH 18/24] Format fixes --- scripts/toltec/builder.py | 25 ++++++++++++++++++------- 1 file changed, 18 insertions(+), 7 deletions(-) diff --git a/scripts/toltec/builder.py b/scripts/toltec/builder.py index 3746926bf..ee14b0e29 100644 --- a/scripts/toltec/builder.py +++ b/scripts/toltec/builder.py @@ -169,7 +169,9 @@ def _make_arch( self._build(recipe, src_dir) self._postprocessing(recipe, src_dir) - for package in packages if packages is not None else recipe.packages.values(): + for package in ( + packages if packages is not None else recipe.packages.values() + ): self.context["package"] = package.name pkg_dir = os.path.join(base_pkg_dir, package.name) os.makedirs(pkg_dir, exist_ok=True) @@ -195,7 +197,9 @@ def _fetch_sources( if self.URL_REGEX.match(source.url) is None: # Get source file from the recipe’s directory - shutil.copy2(os.path.join(recipe.parent.path, source.url), local_path) + shutil.copy2( + os.path.join(recipe.parent.path, source.url), local_path + ) else: # Fetch source file from the network req = requests.get(source.url, timeout=5) @@ -389,7 +393,8 @@ def _postprocessing(self, recipe: Recipe, src_dir: str) -> None: script.append( "strip --strip-all -- " + " ".join( - docker_file_path(file_path) for file_path in cand.strip_x86 + docker_file_path(file_path) + for file_path in cand.strip_x86 ) ) @@ -405,7 +410,8 @@ def _postprocessing(self, recipe: Recipe, src_dir: str) -> None: script.append( '"${CROSS_COMPILE}strip" --strip-all -- ' + " ".join( - docker_file_path(file_path) for file_path in cand.strip_arm + docker_file_path(file_path) + for file_path in cand.strip_arm ) ) @@ -429,7 +435,8 @@ def _postprocessing(self, recipe: Recipe, src_dir: str) -> None: + [ "patchelf --add-needed librm2fb_client.so.1 " + " ".join( - docker_file_path(file_path) for file_path in cand.patch_rm2fb + docker_file_path(file_path) + for file_path in cand.patch_rm2fb ) ] ) @@ -492,7 +499,9 @@ def _postprocessing_candidates(src_dir: str) -> PostprocessingCandidates: and rodata.data().find(b"/dev/fb0") != -1 ): patch_rm2fb.append(file_path) - elif info.get_machine_arch() in ("x86", "x64") and symtab: + elif ( + info.get_machine_arch() in ("x86", "x64") and symtab + ): strip_x86.append(file_path) except ELFError: # Ignore non-ELF files @@ -526,7 +535,9 @@ def _package(self, package: Package, src_dir: str, pkg_dir: str) -> None: for filename in util.list_tree(pkg_dir): self.adapter.debug( " - %s", - os.path.normpath(os.path.join("/", os.path.relpath(filename, pkg_dir))), + os.path.normpath( + os.path.join("/", os.path.relpath(filename, pkg_dir)) + ), ) def _archive(self, package: Package, pkg_dir: str) -> None: From 2287edc34351b1dd1d192d5ed32cc5745e8a8665 Mon Sep 17 00:00:00 2001 From: Nathaniel van Diepen Date: Sat, 26 Aug 2023 14:42:57 -0600 Subject: [PATCH 19/24] Add back missing documentation change --- docs/package.md | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/docs/package.md b/docs/package.md index fcd9690a4..039f8d8e8 100644 --- a/docs/package.md +++ b/docs/package.md @@ -439,3 +439,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` From 27135d35c4728aaba3a9fb9ed9b9ea5b2b246d01 Mon Sep 17 00:00:00 2001 From: Nathaniel van Diepen Date: Sat, 26 Aug 2023 17:12:27 -0600 Subject: [PATCH 20/24] Don't update whiteboard-hypercard This package is failing to build --- package/whiteboard-hypercard/package | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/whiteboard-hypercard/package b/package/whiteboard-hypercard/package index 0778804ea..36dc05edc 100644 --- a/package/whiteboard-hypercard/package +++ b/package/whiteboard-hypercard/package @@ -5,7 +5,7 @@ pkgnames=(whiteboard-hypercard) pkgdesc="Real-time collaboration, drawing or whiteboarding" url=https://github.com/fenollp/reMarkable-tools -pkgver=0.3.4-2 +pkgver=0.3.4-1 timestamp=2021-10-25T15:45Z section="drawing" maintainer="Pierre Fenoll " From 5b6a8a662d1523512ea173941f9c33724c875699 Mon Sep 17 00:00:00 2001 From: Nathaniel van Diepen Date: Sun, 29 Oct 2023 17:46:50 -0600 Subject: [PATCH 21/24] Revert folly version --- package/folly/package | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/folly/package b/package/folly/package index 455e47bf7..2682d2c7d 100644 --- a/package/folly/package +++ b/package/folly/package @@ -5,7 +5,7 @@ pkgnames=(folly) pkgdesc="Z-machine interpreter for interactive fiction" url="https://github.com/bkirwi/folly" -pkgver=0.0.1-4 +pkgver=0.0.1-3 timestamp=2022-04-18T17:50:16Z section=games maintainer="Ben Kirwin " From 333a7f0bfda03da3430f9f971ea300930eeafc2c Mon Sep 17 00:00:00 2001 From: Nathaniel van Diepen Date: Sun, 29 Oct 2023 17:47:21 -0600 Subject: [PATCH 22/24] Bump whiteboard-hypercard now that the build is fixed --- package/whiteboard-hypercard/package | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/whiteboard-hypercard/package b/package/whiteboard-hypercard/package index 2ae9a746d..581882d83 100644 --- a/package/whiteboard-hypercard/package +++ b/package/whiteboard-hypercard/package @@ -5,7 +5,7 @@ pkgnames=(whiteboard-hypercard) pkgdesc="Real-time collaboration, drawing or whiteboarding" url=https://github.com/fenollp/reMarkable-tools -pkgver=0.3.7-1 +pkgver=0.3.7-2 timestamp=2023-10-11T12:57Z section="drawing" maintainer="Pierre Fenoll " From 8914942bea8541855e369a7765a095b4a401d965 Mon Sep 17 00:00:00 2001 From: Nathaniel van Diepen Date: Wed, 22 Nov 2023 13:02:42 -0700 Subject: [PATCH 23/24] Bump xochitl version number --- package/xochitl/package | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/xochitl/package b/package/xochitl/package index 1aa004a27..1841988bf 100644 --- a/package/xochitl/package +++ b/package/xochitl/package @@ -5,7 +5,7 @@ pkgnames=(xochitl) pkgdesc="Read documents and take notes" url=https://remarkable.com -pkgver=0.0.0-15 +pkgver=0.0.0-16 timestamp=2022-11-07T20:19:57Z section="readers" maintainer="Mattéo Delabre " From 3b64b1705c59650a5e38c4686c7c0d22c09783cc Mon Sep 17 00:00:00 2001 From: Nathaniel van Diepen Date: Thu, 23 Nov 2023 12:32:02 -0700 Subject: [PATCH 24/24] Use github for KOReader release --- package/koreader/package | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/koreader/package b/package/koreader/package index f3807c1d4..79e03cdc7 100644 --- a/package/koreader/package +++ b/package/koreader/package @@ -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