Compare commits

...

4 Commits
i9e ... i9

@ -1,25 +1,23 @@
From c317034913491acc71ff0ed478baefc927320c3d Mon Sep 17 00:00:00 2001 From f742715cea0644fd6251af9a276c33c3720bf098 Mon Sep 17 00:00:00 2001
From: Alexey Lyubimov <a.lyubimov@msvsphere-os.ru> From: Alexey Lyubimov <a.lyubimov@msvsphere-os.ru>
Date: Fri, 15 Sep 2023 18:19:29 +0300 Date: Fri, 15 Sep 2023 18:19:29 +0300
Subject: [PATCH] vendor.ids: Added MSVSphere OS Subject: [PATCH 2/2] vendor.ids: Added MSVSphere OS
--- ---
data/vendor.ids | 9 +++++++++ data/vendor.ids | 7 +++++++
1 file changed, 9 insertions(+) 1 file changed, 7 insertions(+)
diff --git a/data/vendor.ids b/data/vendor.ids diff --git a/data/vendor.ids b/data/vendor.ids
index cd3dc9e..6d33cad 100644 index cd3dc9e..b475768 100644
--- a/data/vendor.ids --- a/data/vendor.ids
+++ b/data/vendor.ids +++ b/data/vendor.ids
@@ -163,6 +163,15 @@ name Arm Holdings @@ -163,6 +163,13 @@ name Arm Holdings
ansi_color 0;36;107 ansi_color 0;36;107
match_string ARM match_string ARM
+name MSVSphere OS +name MSVSphere OS
+ name МСВСфера ОС + name МСВСфера ОС
+ name_short МСВСфера + name_short МСВСфера
+ url https://www.msvsphere-os.ru/
+ url_support https://support.msvsphere-os.ru/
+ note МСВСфераОС + note МСВСфераОС
+ ansi_color 0;35;47 + ansi_color 0;35;47
+ match_string_case MSVSphere + match_string_case MSVSphere
@ -28,5 +26,5 @@ index cd3dc9e..6d33cad 100644
name_short ASMedia name_short ASMedia
url www.asmedia.com.tw url www.asmedia.com.tw
-- --
2.39.3 2.43.0

@ -0,0 +1,25 @@
From 935cfd7b5ab1d2ca3914a3a86f88736b37f5d93c Mon Sep 17 00:00:00 2001
From: tigro <arkadiy.sheyn@softline.com>
Date: Fri, 27 Oct 2023 22:25:36 +0300
Subject: [PATCH 4/4] Drop Vendor
---
shell/shell.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/shell/shell.c b/shell/shell.c
index 0993f8f..c58307b 100644
--- a/shell/shell.c
+++ b/shell/shell.c
@@ -1550,7 +1550,7 @@ static gchar *vendor_info_markup(const Vendor *v) {
tag_vendor(&ven_tag, 0, ven_tag, v->ansi_color, FMT_OPT_PANGO);
//if (v->name_short)
// ven_mt = appf(ven_mt, "\n", "%s", v->name);
- ven_mt = appf(ven_mt, "\n", "%s", ven_tag);
+ //ven_mt = appf(ven_mt, "\n", "%s", ven_tag);
if (v->url) {
if (!g_str_has_prefix(v->url, "http") )
full_link = g_strdup_printf("http://%s", v->url);
--
2.41.0

@ -0,0 +1,41 @@
From c8695c01336b370c2a3eda5c7c87c395291c7ef6 Mon Sep 17 00:00:00 2001
From: tigro <tigro@msvsphere-os.ru>
Date: Mon, 5 Feb 2024 15:01:31 +0300
Subject: [PATCH] Drop Synchronize
---
shell/menu.c | 5 -----
shell/syncmanager.c | 1 -
2 files changed, 6 deletions(-)
diff --git a/shell/menu.c b/shell/menu.c
index dee3aa4..9a0c2a4 100644
--- a/shell/menu.c
+++ b/shell/menu.c
@@ -52,11 +52,6 @@ static GtkActionEntry entries[] = {
N_("Generates a report with detailed system information"), /* tooltip */
G_CALLBACK(cb_generate_report)},
- {"SyncManagerAction", HI_STOCK_SYNC_MENU,
- N_("Synchronize"), NULL,
- N_("Send benchmark results and receive updated data from the network"),
- G_CALLBACK(cb_sync_manager)},
-
{"OpenAction", "_Open",
N_("_Open..."), NULL,
NULL,
diff --git a/shell/syncmanager.c b/shell/syncmanager.c
index c5f0b98..dfde212 100644
--- a/shell/syncmanager.c
+++ b/shell/syncmanager.c
@@ -513,7 +513,6 @@ static SyncDialog *sync_dialog_new(GtkWidget *parent)
dialog = gtk_dialog_new();
gtk_window_set_transient_for(GTK_WINDOW(dialog), GTK_WINDOW(parent));
- gtk_window_set_title(GTK_WINDOW(dialog), _("Synchronize"));
gtk_window_set_resizable(GTK_WINDOW(dialog), FALSE);
gtk_window_set_icon(GTK_WINDOW(dialog),
icon_cache_get_pixbuf("syncmanager.png"));
--
2.43.0

@ -5,7 +5,9 @@
<policyconfig> <policyconfig>
<action id="org.freedesktop.pkexec.hardinfo"> <action id="org.freedesktop.pkexec.hardinfo">
<description>Run Hardinfo program</description> <description>Run Hardinfo program</description>
<description xml:lang="ru">Запуск Hardinfo</description>
<message>Authentication is required to run the Hardinfo</message> <message>Authentication is required to run the Hardinfo</message>
<message xml:lang="ru">Для запуска Hardinfo требуется авторизация</message>
<icon_name>accessories-text-editor</icon_name> <icon_name>accessories-text-editor</icon_name>
<defaults> <defaults>
<allow_any>auth_admin</allow_any> <allow_any>auth_admin</allow_any>

@ -3,7 +3,7 @@
Name: hardinfo Name: hardinfo
Version: 0.6 Version: 0.6
Release: 1.20230524git%{shorthash}%{?dist}.inferit.7 Release: 1.20230524git%{shorthash}%{?dist}.inferit.11
Summary: System Profiler and Benchmark Summary: System Profiler and Benchmark
License: GPLv2 License: GPLv2
@ -15,6 +15,8 @@ Source3: org.freedesktop.pkexec.hardinfo.policy
Patch1: 0001-Remove-annoyng-window-about-loading-of-needed-librar.patch Patch1: 0001-Remove-annoyng-window-about-loading-of-needed-librar.patch
Patch2: 0002-vendor.ids-Added-MSVSphere-OS.patch Patch2: 0002-vendor.ids-Added-MSVSphere-OS.patch
Patch3: 0003-Fix-segfault-when-info-about-block-storage-is-absent.patch Patch3: 0003-Fix-segfault-when-info-about-block-storage-is-absent.patch
Patch4: 0004-Drop-Vendor.patch
Patch5: 0005-Drop-Synchronize.patch
BuildRequires: cmake BuildRequires: cmake
BuildRequires: desktop-file-utils BuildRequires: desktop-file-utils
@ -78,6 +80,19 @@ install -m644 %{SOURCE3} \
%{_datadir}/polkit-1/actions/org.freedesktop.pkexec.hardinfo.policy %{_datadir}/polkit-1/actions/org.freedesktop.pkexec.hardinfo.policy
%changelog %changelog
* Thu Mar 28 2024 Sergey Cherevko <s.cherevko@msvsphere-os.ru> - 0.6-1.20230524git45fa969.inferit.11
- Added translation of system policy file
* Mon Feb 05 2024 Arkady L. Shane <tigro@msvsphere-os.ru> - 0.6-1.20230524git45fa969.inferit.10
- Drop Synchronize
* Tue Dec 26 2023 Arkady L. Shane <tigro@msvsphere-os.ru> - 0.6-2.20230524git45fa969.inferit.9
- Drop URLs for MSVSphere
* Fri Oct 27 2023 Arkady L. Shane <tigro@msvsphere-os.ru> - 0.6-2.20230524git45fa969.inferit.8
- Drop Vendor from OS info
- Fix site URL
* Fri Oct 13 2023 Alexey Berezhok <aberezhok@msvsphere-os.ru> - 0.6-2.20230524git45fa969.inferit.7 * Fri Oct 13 2023 Alexey Berezhok <aberezhok@msvsphere-os.ru> - 0.6-2.20230524git45fa969.inferit.7
- Fix segfault when info about block storage is absent - Fix segfault when info about block storage is absent

Loading…
Cancel
Save