From 453c1146b3f685c6aedcad82400e7c73b1bc1c72 Mon Sep 17 00:00:00 2001 From: Nathaniel van Diepen Date: Mon, 5 Jun 2023 17:41:35 -0600 Subject: [PATCH 1/6] 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 2/6] 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 3/6] 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 4/6] 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 5/6] 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 6/6] 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 } }