From b0cba5bf8b53f0c6c3387ce6054451131d280ac9 Mon Sep 17 00:00:00 2001 From: Ryan Hughes Date: Tue, 1 Sep 2026 23:30:10 -0400 Subject: [PATCH] Drop obsolete asusctl 6.4.0 GitHub-source patch (#269) The AUR caught up: asusctl 6.4.0-1 (b0ec6ca) repoints source at the GitHub repo upstream, which is what our patch existed to do. The new PKGBUILD uses a release tarball instead of git+, so the patch context no longer matches and every scheduled Sync AUR Packages run failed applying it. Remove the patch and resync from the AUR. With no .omarchy/patches left, the package is no longer customized, so it tracks 6.4.0-1 without the .1 pkgrel suffix. --- pkgbuilds/asusctl/.nvchecker.toml | 3 +- pkgbuilds/asusctl/.omarchy/package.json | 2 +- .../patches/6.4.0-github-source.patch | 18 --- pkgbuilds/asusctl/PKGBUILD | 125 ++++++------------ pkgbuilds/asusctl/asusctl.install | 27 ++-- 5 files changed, 53 insertions(+), 122 deletions(-) delete mode 100644 pkgbuilds/asusctl/.omarchy/patches/6.4.0-github-source.patch diff --git a/pkgbuilds/asusctl/.nvchecker.toml b/pkgbuilds/asusctl/.nvchecker.toml index d1a0c7f1..e98ca307 100644 --- a/pkgbuilds/asusctl/.nvchecker.toml +++ b/pkgbuilds/asusctl/.nvchecker.toml @@ -1,4 +1,3 @@ [asusctl] source = "git" -git = "https://gitlab.com/asus-linux/asusctl.git" - +git = "https://github.com/OpenGamingCollective/asusctl.git" diff --git a/pkgbuilds/asusctl/.omarchy/package.json b/pkgbuilds/asusctl/.omarchy/package.json index f2bc93fa..1b2f22af 100644 --- a/pkgbuilds/asusctl/.omarchy/package.json +++ b/pkgbuilds/asusctl/.omarchy/package.json @@ -1,4 +1,4 @@ { "source": "aur", - "upstream_commit": "ed336f7dbd5e8bee333aeaa6246da89241f1c8e6" + "upstream_commit": "b0ec6ca495eb331a684db91b0fe12085a868b632" } diff --git a/pkgbuilds/asusctl/.omarchy/patches/6.4.0-github-source.patch b/pkgbuilds/asusctl/.omarchy/patches/6.4.0-github-source.patch deleted file mode 100644 index af9cfcf3..00000000 --- a/pkgbuilds/asusctl/.omarchy/patches/6.4.0-github-source.patch +++ /dev/null @@ -1,18 +0,0 @@ -diff --git a/PKGBUILD b/PKGBUILD -index 55d0c22..8897aec 100644 ---- a/PKGBUILD -+++ b/PKGBUILD -@@ -6,7 +6,7 @@ pkgname=( - asusctl - rog-control-center - ) --pkgver=6.3.8 -+pkgver=6.4.0 - pkgrel=1 - pkgdesc="A control daemon, tools, and a collection of crates for interacting with ASUS ROG laptops" - arch=('x86_64') -@@ -28,2 +28,2 @@ --source=("git+https://gitlab.com/asus-linux/asusctl.git#tag=$pkgver") --b2sums=('01269bc9fe63c1ce37568f9085c25dbcaaaa5cd9f51339d4c6904600d179ec826dace289d6e4e3501988fce5800da98e9cfa18b21c40da152d91c4f7fe821ffe') -+source=("git+https://github.com/opengamingcollective/asusctl.git#tag=$pkgver") -+b2sums=('0cfdc7f792fc6499cde9e4c9c6d82e484605e1b2878bb9f3a0e0696f5910b9ba7898f124fecd5fb3f39a0787f81e5163721606290099d757365dc3d6715a1bcf') diff --git a/pkgbuilds/asusctl/PKGBUILD b/pkgbuilds/asusctl/PKGBUILD index 3d39c41b..470e7e60 100644 --- a/pkgbuilds/asusctl/PKGBUILD +++ b/pkgbuilds/asusctl/PKGBUILD @@ -1,108 +1,59 @@ -# Maintainer: Fabian Bornschein +# Maintainer: Mahdi Sarikhani +# Contributor: Fabian Bornschein # Contributor: Static_Rocket pkgbase=asusctl -pkgname=( - asusctl - rog-control-center -) +pkgname=(asusctl rog-control-center) pkgver=6.4.0 -pkgrel=1.1 -pkgdesc="A control daemon, tools, and a collection of crates for interacting with ASUS ROG laptops" +pkgrel=1 +pkgdesc="Daemon and tools to control your ASUS ROG laptop" arch=('x86_64') url="https://asus-linux.org" license=('MPL-2.0') -makedepends=( - clang - cmake - fontconfig - git - hicolor-icon-theme - libayatana-appindicator - libinput - libusb - rust - seatd - systemd -) -source=("git+https://github.com/opengamingcollective/asusctl.git#tag=$pkgver") -b2sums=('0cfdc7f792fc6499cde9e4c9c6d82e484605e1b2878bb9f3a0e0696f5910b9ba7898f124fecd5fb3f39a0787f81e5163721606290099d757365dc3d6715a1bcf') +makedepends=('cargo' 'fontconfig') +source=("${pkgbase}-${pkgver}.tar.gz::https://github.com/OpenGamingCollective/asusctl/archive/${pkgver}.tar.gz") +b2sums=('e90074e904f364386ad661784bd9fc2e929e83ea06ac62fd1d34eb03490cefe8aae3bed2722162f1e8ea5d69248138cb5fd9f90c3a18443d1d8c04cf732b928a') prepare() { - cd "${pkgbase}" - - # Keep rust/cargo build-dependency management inside the build directory - export CARGO_HOME="${srcdir}/cargo" - - # Follow Rust package guidelines - ## https://wiki.archlinux.org/title/Rust_package_guidelines - export RUSTUP_TOOLCHAIN=stable - cargo fetch --locked --target "$(rustc -vV | sed -n 's/host: //p')" + cd "${pkgbase}-${pkgver}" + export RUSTUP_TOOLCHAIN=stable + cargo fetch --locked --target host-tuple } build() { - cd "${pkgbase}" - - # Keep rust/cargo build-dependency management inside the build directory - export CARGO_HOME="${srcdir}/cargo" - - # Follow Rust package guidelines - ## https://wiki.archlinux.org/title/Rust_package_guidelines - export RUSTUP_TOOLCHAIN=stable - export CARGO_TARGET_DIR=target - - make build + cd "${pkgbase}-${pkgver}" + export RUSTUP_TOOLCHAIN=stable + export CARGO_TARGET_DIR=target + make build } package_asusctl() { - pkgdesc="${pkgdesc/tools/CLI tools}" - depends=( - glibc - libgcc - libusb - systemd - systemd-libs - ) - conflicts=(gnome-shell-extension-asusctl-gnome) - install=asusctl.install - optdepends=( - 'acpi_call: fan control' - 'asusctltray: tray profile switcher' - 'rog-control-center: app to control asusctl' - 'supergfxctl: hybrid GPU control' - ) + pkgdesc="An utility for Linux to control many aspects of various ASUS laptops" + depends=('glibc' 'libgcc' 'libusb' 'systemd-libs') + optdepends=( + 'acpi_call: fan control' + 'asusctltray: tray profile switcher' + 'rog-control-center: graphical user interface for asusctl' + 'supergfxctl: hybrid GPU control' + ) + install=asusctl.install - cd "${pkgbase}" - export CARGO_HOME="${srcdir}/cargo" - make DESTDIR="${pkgdir}" \ - install-asusctl \ - install-asusd \ - install-asusd_user \ - install-asus-shutdown \ - install-data-asusd \ - install-data-asusd_user + cd "${pkgbase}-${pkgver}" + make DESTDIR="${pkgdir}" \ + install-asusctl \ + install-asusd \ + install-asusd_user \ + install-asus-shutdown \ + install-data-asusd \ + install-data-asusd_user } package_rog-control-center() { - depends=( - asusctl - fontconfig - freetype2 - glibc - hicolor-icon-theme - libayatana-appindicator - libgcc - libinput - libxkbcommon - mesa - seatd - systemd-libs - ) - pkgdesc="App to control asusctl" + pkgdesc="Graphical user interface for asusctl" + depends=('asusctl' 'fontconfig' 'glibc' 'hicolor-icon-theme' 'libgcc' 'systemd-libs') - cd "${pkgbase}" - export CARGO_HOME="${srcdir}/cargo" - make DESTDIR="${pkgdir}" \ - install-data-rog_gui \ - install-rog_gui + cd "${pkgbase}-${pkgver}" + make DESTDIR="${pkgdir}" \ + install-rog_gui \ + install-data-rog_gui } diff --git a/pkgbuilds/asusctl/asusctl.install b/pkgbuilds/asusctl/asusctl.install index 2f5a1c36..c6ccfe76 100644 --- a/pkgbuilds/asusctl/asusctl.install +++ b/pkgbuilds/asusctl/asusctl.install @@ -1,19 +1,18 @@ post_install() { - printf ":: asusd provides a service that is activated by an udev rule on\n" - printf ":: startup. Please reboot the system or run\n" - printf ":: # systemctl start asusd.service\n" - printf ":: to make it work.\n" - printf ":: See https://gitlab.com/asus-linux/asusctl#kernel-support.\n" - printf ":: for latest required kernel patches/versions\n" + printf ":: asusd provides a service that is activated by an udev rule on\n" + printf ":: startup. Please reboot the system or run\n" + printf ":: # systemctl start asusd.service\n" + printf ":: to make it work.\n" + printf ":: See https://github.com/OpenGamingCollective/asusctl#kernel-requirements\n" + printf ":: for latest required kernel patches/versions\n" } post_upgrade() { - if systemctl is-active asusd.service --quiet - then - printf ":: asusd service will be restarted…\n" - systemctl daemon-reload - systemctl restart asusd.service - fi - printf ":: See https://gitlab.com/asus-linux/asusctl#kernel-support.\n" - printf ":: for latest required kernel patches/versions\n" + if systemctl is-active asusd.service --quiet; then + printf ":: asusd service will be restarted…\n" + systemctl daemon-reload + systemctl restart asusd.service + fi + printf ":: See https://github.com/OpenGamingCollective/asusctl#kernel-requirements\n" + printf ":: for latest required kernel patches/versions\n" }