dguglielmi/sunny-overlay
1
0
Fork 0
mirror of https://github.com/dguglielmi/sunny-overlay.git synced 2026-04-05 23:06:34 +02:00
Code Issues Releases Wiki Activity

sys-process/mission-center: add 0.3.1

Browse Source
This commit is contained in:
David GUGLIELMI
2023-08-23 16:00:11 +02:00
parent b183490fdc
commit d04d12a2eb
5 changed files with 749 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
sys-process/mission-center/files/mission-center-0.3.1-cargo_home.patch Normal file
View File

@@ -0,0 +1,31 @@
diff -dNur a/src/meson.build b/src/meson.build
--- a/src/meson.build 2023-08-22 19:43:58.000000000 +0200
+++ b/src/meson.build 2023-08-23 15:12:42.913477168 +0200
@@ -27,14 +27,8 @@
cargo_bin = find_program('cargo')
cargo_env = get_option('cargo_env')
-if get_option('flatpak') == false
- cargo_env += [ 'CARGO_HOME=' + meson.project_build_root() / 'cargo-home' ]
- cargo_opt = []
-else
- cargo_opt = []
-endif
-cargo_opt += [ '--manifest-path', meson.project_source_root() / 'Cargo.toml' ]
+cargo_opt = [ '--manifest-path', meson.project_source_root() / 'Cargo.toml' ]
cargo_opt += [ '--target-dir', meson.project_build_root() / 'src' ]
cargo_env += [ 'BUILD_ROOT=' + meson.project_build_root() ]
diff -dNur a/src/sys_info_v2/gatherer/meson.build b/src/sys_info_v2/gatherer/meson.build
--- a/src/sys_info_v2/gatherer/meson.build 2023-08-22 19:43:58.000000000 +0200
+++ b/src/sys_info_v2/gatherer/meson.build 2023-08-23 15:14:13.570236075 +0200
@@ -4,7 +4,7 @@
cargo_bin = find_program('cargo')
cargo_opt = [ '--manifest-path', meson.project_source_root() / project_path / 'Cargo.toml' ]
cargo_opt += [ '--target-dir', meson.project_build_root() / project_path / 'src' ]
-cargo_env = [ 'CARGO_HOME=' + meson.project_build_root() / project_path/ 'cargo-home' ]
+cargo_env = get_option('cargo_env')
if get_option('buildtype') == 'release'
cargo_opt += [ '--release' ]

12
sys-process/mission-center/files/mission-center-0.3.1-metainfo.patch Normal file
View File

@@ -0,0 +1,12 @@
diff -dNur a/data/meson.build b/data/meson.build
--- a/data/meson.build 2023-08-22 19:43:58.000000000 +0200
+++ b/data/meson.build 2023-08-23 15:38:27.306286696 +0200
@@ -17,7 +17,7 @@
output: 'io.missioncenter.MissionCenter.appdata.xml',
po_dir: '../po',
install: true,
- install_dir: join_paths(get_option('datadir'), 'appdata')
+ install_dir: join_paths(get_option('datadir'), 'metainfo')
)
appstream_util = find_program('appstream-util', required: false)

46
sys-process/mission-center/files/mission-center-0.3.1-no-browsers-in-applications.patch Normal file
View File

@@ -0,0 +1,46 @@
From 0033ec8f596fcbae01dc49c93ecb4750e4589845 Mon Sep 17 00:00:00 2001
From: Romeo Calota <2727510-kicsyromy@users.noreply.gitlab.com>
Date: Wed, 23 Aug 2023 08:35:54 +0000
Subject: [PATCH] Resolve "No browsers in Applications regression in 0.3"
---
src/sys_info_v2/gatherer/common/apps.rs | 8 +++++++-
src/sys_info_v2/gatherer/common/processes.rs | 3 ++-
2 files changed, 9 insertions(+), 2 deletions(-)
diff --git a/src/sys_info_v2/gatherer/common/apps.rs b/src/sys_info_v2/gatherer/common/apps.rs
index b0f837e..df0b123 100644
--- a/src/sys_info_v2/gatherer/common/apps.rs
+++ b/src/sys_info_v2/gatherer/common/apps.rs
@@ -344,7 +344,13 @@ impl Apps {
return None;
}
- let ini = match Ini::load_from_file(path) {
+ let ini = match Ini::load_from_file_opt(
+ path,
+ ParseOption {
+ enabled_quote: false,
+ enabled_escape: true,
+ },
+ ) {
Ok(ini) => ini,
Err(e) => {
eprintln!("Failed to load desktop file from {}: {}", path.display(), e);
diff --git a/src/sys_info_v2/gatherer/common/processes.rs b/src/sys_info_v2/gatherer/common/processes.rs
index 77a1210..743fab5 100644
--- a/src/sys_info_v2/gatherer/common/processes.rs
+++ b/src/sys_info_v2/gatherer/common/processes.rs
@@ -557,7 +557,8 @@ impl Processes {
.split(':')
.nth(2)
.unwrap_or("/")
- .trim_start_matches('/');
+ .trim_start_matches('/')
+ .trim_end_matches(&format!("/{}", pid));
let cgroup_path = std::path::Path::new("/sys/fs/cgroup").join(cfc);
if !cfc.is_empty() && cgroup_path.exists() && cgroup_path.is_dir() {
--
GitLab