From 05977356562ca5aaf8180f1e6c12f44754965306 Mon Sep 17 00:00:00 2001 From: EnumDev Date: Sat, 2 May 2026 18:24:42 +0300 Subject: [PATCH] Update package version to 0.9.0 --- pkg.info | 22 +++++----------------- source-files/enit-support.patch | 18 +++++++++--------- source.sh | 25 +++---------------------- 3 files changed, 17 insertions(+), 48 deletions(-) diff --git a/pkg.info b/pkg.info index d2e9a80..cdbb4c2 100644 --- a/pkg.info +++ b/pkg.info @@ -1,6 +1,6 @@ name: lact description: Linux GPU configuration and monitoring tool -version: 0.8.4 +version: 0.9.0 revision: 1 url: https://github.com/ilya-zlobintsev/LACT license: MIT @@ -14,6 +14,7 @@ depends: - gtk4 - hwdata - ocl-icd + - libadwaita optional_depends: - vulkan-tools - clinfo @@ -22,23 +23,10 @@ make_depends: - clang - libadwaita - fuse3 +provides: + - lact-libadwaita downloads: - url: https://github.com/ilya-zlobintsev/LACT/archive/refs/tags/v${BPM_PKG_VERSION}.tar.gz extract_to: ${BPM_SOURCE} extract_strip_components: 1 - checksum: 9dd7e6bf700a9b0c22f320bf062956e84a78a7854c0a6fbc152c644e311e3c12 -split_packages: - - name: lact - conflicts: - - lact-libadwaita - - name: lact-libadwaita - description: Linux GPU configuration and monitoring tool (Libadwaita) - depends: - - gcc-libs - - glibc - - gtk4 - - hwdata - - ocl-icd - - libadwaita - conflicts: - - lact + checksum: 4a422ef394351704b6506d97e1a8ff262b8cd9af4b81ef1e096bc60c22797bf8 diff --git a/source-files/enit-support.patch b/source-files/enit-support.patch index ff0c5a2..8334f42 100644 --- a/source-files/enit-support.patch +++ b/source-files/enit-support.patch @@ -12,19 +12,19 @@ index 2b1a803..29a86fd 100644 Full config file with all possible options: ```yaml diff --git a/lact-gui/src/app.rs b/lact-gui/src/app.rs -index 82b26ec..6294978 100644 +index 46ba0d4..8def77c 100644 --- a/lact-gui/src/app.rs +++ b/lact-gui/src/app.rs -@@ -212,7 +212,7 @@ impl AsyncComponent for AppModel { - .expect("Could not list devices"); +@@ -423,7 +423,7 @@ impl AsyncComponent for AppModel { if system_info.version != GUI_VERSION || system_info.commit.as_deref() != Some(GIT_COMMIT) { -- let err = anyhow!("Version mismatch between GUI and daemon ({GUI_VERSION}-{GIT_COMMIT} vs {}-{})! If you have updated LACT, you need to restart the service with `sudo systemctl restart lactd`.", system_info.version, system_info.commit.as_deref().unwrap_or_default()); -+ let err = anyhow!("Version mismatch between GUI and daemon ({GUI_VERSION}-{GIT_COMMIT} vs {}-{})! If you have updated LACT, you need to restart the service with `sudo ectl sv reload && sudo ectl sv restart lactd`.", system_info.version, system_info.commit.as_deref().unwrap_or_default()); - sender.input(AppMsg::Error(err.into())); - } - -@@ -1045,7 +1045,7 @@ fn show_embedded_info(parent: &ApplicationWindow, err: anyhow::Error) { + let err = anyhow!( +- "Version mismatch between GUI and daemon ({GUI_VERSION}-{GIT_COMMIT} vs {}-{})! If you have updated LACT, you need to restart the service with `sudo systemctl restart lactd`.", ++ "Version mismatch between GUI and daemon ({GUI_VERSION}-{GIT_COMMIT} vs {}-{})! If you have updated LACT, you need to restart the service with `sudo ectl sv reload && sudo ectl sv restart lactd`.", + system_info.version, + system_info.commit.as_deref().unwrap_or_default() + ); +@@ -1290,7 +1290,7 @@ fn show_embedded_info(parent: &ApplicationWindow, err: anyhow::Error) { let text_label = gtk::Label::new(Some(&text)); let enable_label = gtk::Entry::builder() diff --git a/source.sh b/source.sh index d7e7683..712f9df 100644 --- a/source.sh +++ b/source.sh @@ -9,45 +9,26 @@ prepare() { # Add enit support patch -Np1 -i "$BPM_WORKDIR"/enit-support.patch - cargo fetch --locked --target "$(rustc -vV | sed -n 's/host: //p')" + cargo fetch --locked --target "$(rustc --print host-tuple)" } # The build function is executed in the source directory # This function is used to compile the source code build() { # Libadwaita - cargo build --release --locked --frozen --features=adw - mv target/release/lact target/release/lact-libadwaita - - # GTK4 cargo build --release --locked --frozen } # The check function is executed in the source directory # This function is used to run tests to verify the package has been compiled correctly check() { - cargo test --release --frozen --all --all-features --verbose + cargo test --frozen --workspace --verbose } # The package function is executed in the source directory # This function is used to move the compiled files into the output directory -package_lact() { +package() { make PREFIX=/usr DESTDIR="$BPM_OUTPUT" install - install -Dm755 target/release/lact "$BPM_OUTPUT"/usr/bin/lact - - # Remove systemd service - rm -r "$BPM_OUTPUT"/usr/lib - - # Install esvm service - install -Dm644 "$BPM_WORKDIR"/lactd.esv "$BPM_OUTPUT"/etc/esvm/services/lactd.esv - - # Install package license - install -Dm644 "$BPM_SOURCE"/LICENSE "$BPM_OUTPUT"/usr/share/licenses/lact/LICENSE -} - -package_lact-libadwaita() { - make PREFIX=/usr DESTDIR="$BPM_OUTPUT" install - install -Dm755 target/release/lact-libadwaita "$BPM_OUTPUT"/usr/bin/lact # Remove systemd service rm -r "$BPM_OUTPUT"/usr/lib