From 472f547f86bb29edca50e6716eda3328d54c452b Mon Sep 17 00:00:00 2001 From: Nathaniel van Diepen Date: Thu, 27 Jun 2024 07:55:47 -0600 Subject: [PATCH] Update oxide to v2.8.4 (#833) * Add sysfs_preload * Remove chroot for xochitl * Increment xochitl version * Make tarnish depend on sysfs_preload * Format fix * Update package * Update package * Update oxide to v2.8 * Update package * Update oxide to v2.8.1 * Resolve duplicate and missing conflicts from how-to-enable * Format fix * Properly ignore shutdown.target * Update to v2.8.2 * Add non-versioned symlink to librm2fb_client.so.1 * Update package * Update package * Update oxide to 2.8.4 --- package/display/package | 14 ++++++++------ package/oxide/package | 26 +++++++++++++++++--------- package/sysfs_preload/package | 28 ++++++++++++++++++++++++++++ package/xochitl/package | 2 +- package/xochitl/xochitl.oxide | 29 +---------------------------- 5 files changed, 55 insertions(+), 44 deletions(-) create mode 100644 package/sysfs_preload/package diff --git a/package/display/package b/package/display/package index d14efd480..633b4e9f5 100644 --- a/package/display/package +++ b/package/display/package @@ -8,7 +8,7 @@ timestamp=2023-08-27T02:39:10Z maintainer="raisjn " license=MIT url="https://github.com/ddvk/remarkable2-framebuffer" -pkgver=1:0.0.33-2 +pkgver=1:0.0.33-3 _release="${pkgver%-*}" _release="v${_release#*:}" _libver=1.0.1 @@ -102,14 +102,16 @@ rm2fb-client() { replaces=(rm2fb) package() { - libname="librm2fb_client.so.$_libver" - install -D -m 644 -t "$pkgdir"/opt/lib "$srcdir"/src/client/"$libname" + libname="librm2fb_client.so" + libnamever="$libname.$_libver" + install -D -m 644 -t "$pkgdir"/opt/lib "$srcdir"/src/client/"$libnamever" install -d "$pkgdir"/usr/lib - ln -s /opt/lib/"$libname" "$pkgdir"/usr/lib/"$libname" + ln -s /opt/lib/"$libnamever" "$pkgdir"/usr/lib/"$libnamever" + ln -s /opt/lib/"$libnamever" "$pkgdir"/opt/lib/"$libname" for dest in opt/lib usr/lib; do - ln -s "$libname" "$pkgdir/$dest/${libname%.*.*}" - ln -s "$libname" "$pkgdir/$dest/${libname%.*}" + ln -s "$libnamever" "$pkgdir/$dest/${libnamever%.*.*}" + ln -s "$libnamever" "$pkgdir/$dest/${libnamever%.*}" done install -D -m 755 -t "$pkgdir"/opt/bin "$srcdir"/rm2fb-client diff --git a/package/oxide/package b/package/oxide/package index 83e0c27ab..2dee131c3 100644 --- a/package/oxide/package +++ b/package/oxide/package @@ -1,12 +1,13 @@ #!/usr/bin/env bash -# Copyright (c) 2021 The Toltec Contributors +# Copyright (c) 2024 The Toltec Contributors # SPDX-License-Identifier: MIT +archs=(rm1 rm2) pkgnames=(oxide oxide-extra oxide-utils inject_evdev liboxide liboxide-dev libsentry) -_oxidever=2.7 -pkgver=$_oxidever-7 -_sentryver=0.5.0 -timestamp=2023-12-05T04:43:04Z +_oxidever=2.8.4 +pkgver=$_oxidever-1 +_sentryver=0.7.6 +timestamp=2024-06-26T22:31:46Z maintainer="Eeems " url=https://oxide.eeems.codes license=MIT @@ -18,7 +19,7 @@ source=( launcherctl-oxide ) sha256sums=( - e1f20fc60ae8edccb941e09c0e61cbfb58f1f8a5f64be98870eb2d079f83316f + bfcb26c0493544fabc472bebc1eb372e49e58774163533ae937b6e814222f03e SKIP SKIP ) @@ -26,13 +27,15 @@ sha256sums=( build() { find . -name "*.pro" -type f -print0 \ | xargs -r -0 sed -i 's/linux-oe-g++/linux-arm-remarkable-g++/g' + find . -name "*.pri" -type f -print0 \ + | xargs -r -0 sed -i 's/linux-oe-g++/linux-arm-remarkable-g++/g' CMAKE_TOOLCHAIN_FILE="/usr/share/cmake/$CHOST.cmake" make FEATURES=sentry release } oxide() { pkgdesc="Launcher application" section="launchers" - installdepends=("oxide-utils=$pkgver" "liboxide=$pkgver" "libsentry=$_sentryver" "reboot-guard" "jq") + installdepends=("oxide-utils=$pkgver" "liboxide=$pkgver" "libsentry=$_sentryver" reboot-guard jq display) replaces=(erode tarnish decay corrupt) conflicts=(erode tarnish decay corrupt) @@ -59,6 +62,10 @@ oxide() { install -D -m 644 -t "$pkgdir"/opt/usr/share/applications "$srcdir"/release/opt/usr/share/applications/codes.eeems.corrupt.oxide # launcherctl registration install -D -T -m 755 "$srcdir"/launcherctl-oxide "$pkgdir"/opt/share/launcherctl/oxide + if [[ $arch = rm2 ]]; then + install -D -m 644 -t "$pkgdir"/etc/systemd/system/tarnish.service.d \ + "$srcdir"/toltec-rm2-override.conf + fi } configure() { @@ -138,7 +145,8 @@ liboxide() { section="devel" package() { - install -D -m 755 -t "$pkgdir"/opt/lib "$srcdir"/release/opt/lib/libliboxide.so* + install -D -m 755 -t "$pkgdir"/opt/lib "$srcdir"/release/opt/lib/liboxide.so* + install -D -m 755 -t "$pkgdir"/opt/lib "$srcdir"/release/opt/lib/libqsgepaper.so* } } @@ -148,7 +156,7 @@ liboxide-dev() { installdepends=("liboxide=$pkgver") package() { - install -D -m 755 -t "$pkgdir"/opt/lib/pkgconfig "$srcdir"/release/opt/lib/pkgconfig/liboxide.pc + install -D -m 755 -t "$pkgdir"/opt/lib/pkgconfig "$srcdir"/release/opt/lib/pkgconfig/oxide.pc install -D -m 755 -t "$pkgdir"/opt/include "$srcdir"/release/opt/include/epframebuffer.h install -D -m 755 -t "$pkgdir"/opt/include "$srcdir"/release/opt/include/liboxide.h cp -ar "$srcdir"/release/opt/include/liboxide/ "$pkgdir"/opt/include/ diff --git a/package/sysfs_preload/package b/package/sysfs_preload/package new file mode 100644 index 000000000..0fcd903d6 --- /dev/null +++ b/package/sysfs_preload/package @@ -0,0 +1,28 @@ +#!/usr/bin/env bash +# Copyright (c) 2023 The Toltec Contributors +# SPDX-License-Identifier: MIT + +pkgnames=(sysfs_preload) +pkgdesc="A simple preload that forces any calls to /sys/power/state to use systemd instead." +url="https://github.com/Eeems-Org/sysfs_preload" +pkgver=1.0.1-1 +timestamp=2024-06-22T05:19Z +section=util +maintainer="Eeems " +license=MIT + +image=qt:v3.1 +source=(https://github.com/Eeems-Org/sysfs_preload/archive/refs/tags/1.0.1.tar.gz) +sha256sums=(73627b68e3b2454efcc2d83e6ebdc2eb473f9cc2616ed1b9dd2acae159c54b3d) + +build() { + find . -name "*.pro" -type f -print0 \ + | xargs -r -0 sed -i 's/linux-oe-g++/linux-arm-remarkable-g++/g' + qmake + make -j"$(nproc)" + INSTALL_ROOT="dist" make install +} + +package() { + cp -ar "${srcdir}/dist/." "${pkgdir}" +} diff --git a/package/xochitl/package b/package/xochitl/package index c8fb1d132..ba890d642 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-20 +pkgver=0.0.0-21 timestamp=2022-11-07T20:19:57Z section="readers" maintainer="Mattéo Delabre " diff --git a/package/xochitl/xochitl.oxide b/package/xochitl/xochitl.oxide index c4673ad2f..1ebe793b9 100644 --- a/package/xochitl/xochitl.oxide +++ b/package/xochitl/xochitl.oxide @@ -3,32 +3,5 @@ "description": "Read documents and take notes", "bin": "/opt/bin/xochitl", "icon": "/opt/etc/draft/icons/xochitl.png", - "flags": ["nosplash", "chroot"], - "permissions": ["power"], - "directories": [ - "/dev/shm", - "/etc", - "/home/root", - "/opt/etc", - "/run/dbus", - "/run/lock", - "/run/systemd", - "/run/systemd/resolve", - "/run/udev", - "/tmp/runtime-root", - "/usr/share", - "/usr/share/remarkable/templates", - "/usr/local/share/ca-certificates", - "/var/cache/fontconfig", - "/var/lib/dbus", - "/var/volatile/tmp" - ], - "environment": { - "HOME": "/home/root", - "QMLSCENE_DEVICE": "epaper", - "QT_QPA_EVDEV_TOUCHSCREEN_PARAMETERS": "rotate=180", - "QT_QPA_PLATFORM": "epaper", - "SYSTEMD_IGNORE_CHROOT": "true", - "XDG_RUNTIME_DIR": "/tmp/runtime-root" - } + "flags": ["nosplash"] }