Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Update oxide to v2.6 #698

Merged
merged 16 commits into from
Aug 26, 2023
Merged

Update oxide to v2.6 #698

Changes from all commits
Commits
Show all changes
16 commits
Select commit Hold shift + click to select a range
453c114
Update oxide to v2.6
Eeems Jun 5, 2023
fb0880f
Style fixes
Eeems Jun 5, 2023
57299ec
Add missing pkgnames
Eeems Jun 5, 2023
1bb631d
Update image paths
Eeems Jun 6, 2023
9732329
Fix liboxide path
Eeems Jun 6, 2023
96efba8
Don't check to see if tarnish is active
Eeems Jun 7, 2023
6162db9
Merge branch 'testing' into oxide
Eeems Jun 8, 2023
e1a01dc
Merge branch 'testing' into oxide
Eeems Jun 27, 2023
63fc1f7
Merge branch 'testing' into oxide
Eeems Jul 22, 2023
0f6559a
Merge branch 'testing' into oxide
Eeems Aug 2, 2023
22f3905
Merge branch 'testing' into oxide
Eeems Aug 2, 2023
510ee94
Merge branch 'testing' into oxide
Eeems Aug 8, 2023
1050560
Merge branch 'testing' into oxide
Eeems Aug 15, 2023
9054e28
Merge branch 'testing' into oxide
Eeems Aug 24, 2023
52008d7
Merge branch 'testing' into oxide
Eeems Aug 24, 2023
d4467ad
Merge branch 'testing' into oxide
Eeems Aug 26, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
104 changes: 70 additions & 34 deletions package/oxide/package
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,21 +2,22 @@
# Copyright (c) 2021 The Toltec Contributors
# SPDX-License-Identifier: MIT

pkgnames=(erode fret oxide rot tarnish decay corrupt anxiety liboxide libsentry notify-send)
pkgver=2.5-2
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
timestamp=2023-01-26T22:52:14Z
timestamp=2023-06-05T23:27:53Z
maintainer="Eeems <[email protected]>"
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
)

Expand All @@ -33,41 +34,40 @@ 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
}
}

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() {
update-desktop-database
}
}

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
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-enabled "tarnish.service"; then
echo ""
echo "Run the following command(s) to use $pkgname as your launcher"
how-to-enable "tarnish.service"
echo ""
fi
update-desktop-database
}
}

Expand Down Expand Up @@ -97,6 +97,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
Expand All @@ -116,49 +122,89 @@ 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() {
update-desktop-database
}
}
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() {
update-desktop-database
}
}

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
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() {
update-desktop-database
}
}

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() {
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*
install -D -m 755 -t "$pkgdir"/opt/lib "$srcdir"/release/opt/lib/libliboxide.so*
}
}

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"
Expand All @@ -167,13 +213,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
}
}