!18 Udpate to 42.2
From: @weijin-deng Reviewed-by: @zhang__3125 Signed-off-by: @zhang__3125
This commit is contained in:
openeuler-ci-bot
Gitee
commit
5f1461adec
@ -1,32 +0,0 @@
|
||||
From 7fe322b9cedae313cd9af6f403eab9bfc6027674 Mon Sep 17 00:00:00 2001
|
||||
From: Jan Tojnar <jtojnar@gmail.com>
|
||||
Date: Mon, 28 Mar 2022 21:02:23 +0200
|
||||
Subject: [PATCH] online-accounts: Fix goa-helper on X11
|
||||
MIME-Version: 1.0
|
||||
Content-Type: text/plain; charset=UTF-8
|
||||
Content-Transfer-Encoding: 8bit
|
||||
|
||||
The handle_str contains the “x11:” prefix so strtol would return 0.
|
||||
We need to pass it the numeric substring.
|
||||
|
||||
Fixes: https://gitlab.gnome.org/GNOME/gnome-control-center/-/issues/1651
|
||||
---
|
||||
panels/online-accounts/gnome-control-center-goa-helper.c | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/panels/online-accounts/gnome-control-center-goa-helper.c b/panels/online-accounts/gnome-control-center-goa-helper.c
|
||||
index 56513147e..533609cbc 100644
|
||||
--- a/panels/online-accounts/gnome-control-center-goa-helper.c
|
||||
+++ b/panels/online-accounts/gnome-control-center-goa-helper.c
|
||||
@@ -129,7 +129,7 @@ set_external_parent_from_handle (GtkApplication *application,
|
||||
int xid;
|
||||
|
||||
errno = 0;
|
||||
- xid = strtol (handle_str, NULL, 16);
|
||||
+ xid = strtol (handle_str + strlen (x11_prefix), NULL, 16);
|
||||
if (errno != 0)
|
||||
{
|
||||
g_warning ("Failed to reference external X11 window, invalid XID %s", handle_str);
|
||||
--
|
||||
2.35.1
|
||||
|
||||
@ -18,7 +18,7 @@ specify a different logo for use in dark mode.
|
||||
3 files changed, 27 insertions(+)
|
||||
|
||||
diff --git a/meson.build b/meson.build
|
||||
index b8b450046..b234810cb 100644
|
||||
index d56f0cb..e74ce49 100644
|
||||
--- a/meson.build
|
||||
+++ b/meson.build
|
||||
@@ -50,6 +50,17 @@ foreach define: set_defines
|
||||
@ -40,7 +40,7 @@ index b8b450046..b234810cb 100644
|
||||
# string. See: https://github.com/mesonbuild/meson/issues/2047
|
||||
config_h.set('USER_DIR_MODE', '0700',
|
||||
diff --git a/meson_options.txt b/meson_options.txt
|
||||
index dbca72387..461ae34e7 100644
|
||||
index dbca723..461ae34 100644
|
||||
--- a/meson_options.txt
|
||||
+++ b/meson_options.txt
|
||||
@@ -7,3 +7,5 @@ option('tracing', type: 'boolean', value: false, description: 'add extra debuggi
|
||||
@ -50,10 +50,10 @@ index dbca72387..461ae34e7 100644
|
||||
+option('distributor_logo', type: 'string', description: 'absolute path to distributor logo for the About panel')
|
||||
+option('dark_mode_distributor_logo', type: 'string', description: 'absolute path to distributor logo dark mode variant')
|
||||
diff --git a/panels/info-overview/cc-info-overview-panel.c b/panels/info-overview/cc-info-overview-panel.c
|
||||
index 274a3c644..f0d0f4636 100644
|
||||
index b348c0f..5ff649d 100644
|
||||
--- a/panels/info-overview/cc-info-overview-panel.c
|
||||
+++ b/panels/info-overview/cc-info-overview-panel.c
|
||||
@@ -924,6 +924,7 @@ cc_info_panel_row_activated_cb (CcInfoOverviewPanel *self,
|
||||
@@ -937,6 +937,7 @@ cc_info_panel_row_activated_cb (CcInfoOverviewPanel *self,
|
||||
open_software_update (self);
|
||||
}
|
||||
|
||||
@ -61,7 +61,7 @@ index 274a3c644..f0d0f4636 100644
|
||||
static gboolean
|
||||
use_dark_theme (CcInfoOverviewPanel *panel)
|
||||
{
|
||||
@@ -931,10 +932,22 @@ use_dark_theme (CcInfoOverviewPanel *panel)
|
||||
@@ -944,10 +945,22 @@ use_dark_theme (CcInfoOverviewPanel *panel)
|
||||
|
||||
return adw_style_manager_get_dark (style_manager);
|
||||
}
|
||||
@ -84,7 +84,7 @@ index 274a3c644..f0d0f4636 100644
|
||||
GtkIconTheme *icon_theme;
|
||||
g_autofree char *logo_name = g_get_os_info ("LOGO");
|
||||
g_autoptr(GtkIconPaintable) icon_paintable = NULL;
|
||||
@@ -962,6 +975,7 @@ setup_os_logo (CcInfoOverviewPanel *panel)
|
||||
@@ -975,6 +988,7 @@ setup_os_logo (CcInfoOverviewPanel *panel)
|
||||
gtk_widget_get_direction (GTK_WIDGET (panel)),
|
||||
0);
|
||||
gtk_picture_set_paintable (panel->os_logo, GDK_PAINTABLE (icon_paintable));
|
||||
@ -92,5 +92,3 @@ index 274a3c644..f0d0f4636 100644
|
||||
}
|
||||
|
||||
static void
|
||||
--
|
||||
GitLab
|
||||
|
||||
Binary file not shown.
BIN
gnome-control-center-42.2.tar.xz
Normal file
BIN
gnome-control-center-42.2.tar.xz
Normal file
Binary file not shown.
@ -10,15 +10,13 @@
|
||||
%define nm_version 1.24
|
||||
|
||||
Name: gnome-control-center
|
||||
Version: 42.0
|
||||
Version: 42.2
|
||||
Release: 1
|
||||
Summary: GNOME Settings is GNOME's main interface for configuration of various aspects of your desktop.
|
||||
License: GPLv2+
|
||||
URL: http://www.gnome.org
|
||||
Source0: https://download.gnome.org/sources/gnome-control-center/42/%{name}-%{version}.tar.xz
|
||||
Patch0: distro-logo.patch
|
||||
Patch1: prettify-info.patch
|
||||
Patch2: 0001-online-accounts-Fix-goa-helper-on-X11.patch
|
||||
|
||||
Patch9001: bugfix-fix_used_passwd_error_capture.patch
|
||||
Patch9002: bugfix-gnome-control-center-fix-repetitivewallpapers.patch
|
||||
@ -139,6 +137,9 @@ chrpath --delete $RPM_BUILD_ROOT%{_bindir}/gnome-control-center
|
||||
%{_datadir}/man/man1/gnome-control-center.1*
|
||||
|
||||
%changelog
|
||||
* Tue Jun 21 2022 weijin.deng@turbolinux.com.cn> - 42.2-1
|
||||
- Udpate to 42.2
|
||||
|
||||
* Mon Mar 28 2022 lin zhang <lin.zhang@turbolinux.com.cn> - 42.0-1
|
||||
- Udpate to 42.0
|
||||
|
||||
|
||||
@ -1,447 +0,0 @@
|
||||
From f64df4e31d0ff714516552fcf647e773fa00ffd2 Mon Sep 17 00:00:00 2001
|
||||
From: Norbert Pfeiler <norbert.pfeiler+git@gmail.com>
|
||||
Date: Sat, 29 Jan 2022 08:01:08 +0100
|
||||
Subject: [PATCH 01/10] =?UTF-8?q?info-overview:=20There=20is=20no=20?=
|
||||
=?UTF-8?q?=E2=80=9CAMD=C2=AE=E2=80=9D?=
|
||||
MIME-Version: 1.0
|
||||
Content-Type: text/plain; charset=UTF-8
|
||||
Content-Transfer-Encoding: 8bit
|
||||
|
||||
AMD doesn’t have a registered trademark for the string only.
|
||||
---
|
||||
panels/info-overview/info-cleanup.c | 1 -
|
||||
tests/info/info-cleanup-test.txt | 10 +++++-----
|
||||
2 files changed, 5 insertions(+), 6 deletions(-)
|
||||
|
||||
diff --git a/panels/info-overview/info-cleanup.c b/panels/info-overview/info-cleanup.c
|
||||
index 5a7392722..b30bf4acc 100644
|
||||
--- a/panels/info-overview/info-cleanup.c
|
||||
+++ b/panels/info-overview/info-cleanup.c
|
||||
@@ -43,7 +43,6 @@ prettify_info (const char *info)
|
||||
{ "Gallium .* on (AMD .*)", "\\1"},
|
||||
{ "(AMD .*) [(].*", "\\1"},
|
||||
{ "(AMD [A-Z])(.*)", "\\1\\L\\2\\E"},
|
||||
- { "AMD", "AMD\302\256"},
|
||||
{ "Graphics Controller", "Graphics"},
|
||||
};
|
||||
|
||||
diff --git a/tests/info/info-cleanup-test.txt b/tests/info/info-cleanup-test.txt
|
||||
index 6dc72a56e..dd0ea8954 100644
|
||||
--- a/tests/info/info-cleanup-test.txt
|
||||
+++ b/tests/info/info-cleanup-test.txt
|
||||
@@ -1,8 +1,8 @@
|
||||
Intel(R) Core(TM) i5-4590T CPU @ 2.00GHz Intel® Core™ i5-4590T CPU @ 2.00GHz
|
||||
Intel(R) Ivybridge Mobile Intel® Ivybridge Mobile
|
||||
Intel(R) Ivybridge Mobile Intel® Ivybridge Mobile
|
||||
-Gallium 0.4 on AMD KAVERI AMD® Kaveri
|
||||
-AMD KAVERI (DRM 2.48.0 / 4.9.0-0.rc4.git2.2.fc26.x86_64, LLVM3) AMD® Kaveri
|
||||
-AMD KAVERI (DRM 2.48.0 / 4.9.0-0.rc4.git2.2.fc26.x86_64, LLVM3 AMD® Kaveri
|
||||
-Gallium 0.4 on AMD KAVERI (DRM 2.48.0 / 4.9.0-0.rc4.git2.2.fc26.x86_64, LLVM3) AMD® Kaveri
|
||||
-Gallium 0.4 on AMD KAVERI (DRM 2.48.0 / 4.9.0-0.rc4.git2.2.fc26.x86_64, LLVM3 AMD® Kaveri
|
||||
+Gallium 0.4 on AMD KAVERI AMD Kaveri
|
||||
+AMD KAVERI (DRM 2.48.0 / 4.9.0-0.rc4.git2.2.fc26.x86_64, LLVM3) AMD Kaveri
|
||||
+AMD KAVERI (DRM 2.48.0 / 4.9.0-0.rc4.git2.2.fc26.x86_64, LLVM3 AMD Kaveri
|
||||
+Gallium 0.4 on AMD KAVERI (DRM 2.48.0 / 4.9.0-0.rc4.git2.2.fc26.x86_64, LLVM3) AMD Kaveri
|
||||
+Gallium 0.4 on AMD KAVERI (DRM 2.48.0 / 4.9.0-0.rc4.git2.2.fc26.x86_64, LLVM3 AMD Kaveri
|
||||
--
|
||||
2.35.1
|
||||
|
||||
|
||||
From 3851a5ca92633d8bf790116bf57143ba9eb85b2b Mon Sep 17 00:00:00 2001
|
||||
From: Norbert Pfeiler <norbert.pfeiler+git@gmail.com>
|
||||
Date: Sat, 29 Jan 2022 08:03:51 +0100
|
||||
Subject: [PATCH 02/10] info-overview: If names are all caps, leave them be
|
||||
MIME-Version: 1.0
|
||||
Content-Type: text/plain; charset=UTF-8
|
||||
Content-Transfer-Encoding: 8bit
|
||||
|
||||
This made everything AMD lower case after the second word
|
||||
and is likely unintentional for something like EPYC™.
|
||||
|
||||
e.g. was
|
||||
AMD Ryzen threadripper 1950x 16-core processor
|
||||
AMD Radeon rx 580 series
|
||||
---
|
||||
panels/info-overview/info-cleanup.c | 1 -
|
||||
tests/info/info-cleanup-test.txt | 13 ++++++++-----
|
||||
2 files changed, 8 insertions(+), 6 deletions(-)
|
||||
|
||||
diff --git a/panels/info-overview/info-cleanup.c b/panels/info-overview/info-cleanup.c
|
||||
index b30bf4acc..f723de6f4 100644
|
||||
--- a/panels/info-overview/info-cleanup.c
|
||||
+++ b/panels/info-overview/info-cleanup.c
|
||||
@@ -42,7 +42,6 @@ prettify_info (const char *info)
|
||||
{ "Atom[(]TM[)]", "Atom\342\204\242"},
|
||||
{ "Gallium .* on (AMD .*)", "\\1"},
|
||||
{ "(AMD .*) [(].*", "\\1"},
|
||||
- { "(AMD [A-Z])(.*)", "\\1\\L\\2\\E"},
|
||||
{ "Graphics Controller", "Graphics"},
|
||||
};
|
||||
|
||||
diff --git a/tests/info/info-cleanup-test.txt b/tests/info/info-cleanup-test.txt
|
||||
index dd0ea8954..c074fb6f5 100644
|
||||
--- a/tests/info/info-cleanup-test.txt
|
||||
+++ b/tests/info/info-cleanup-test.txt
|
||||
@@ -1,8 +1,11 @@
|
||||
Intel(R) Core(TM) i5-4590T CPU @ 2.00GHz Intel® Core™ i5-4590T CPU @ 2.00GHz
|
||||
Intel(R) Ivybridge Mobile Intel® Ivybridge Mobile
|
||||
Intel(R) Ivybridge Mobile Intel® Ivybridge Mobile
|
||||
-Gallium 0.4 on AMD KAVERI AMD Kaveri
|
||||
-AMD KAVERI (DRM 2.48.0 / 4.9.0-0.rc4.git2.2.fc26.x86_64, LLVM3) AMD Kaveri
|
||||
-AMD KAVERI (DRM 2.48.0 / 4.9.0-0.rc4.git2.2.fc26.x86_64, LLVM3 AMD Kaveri
|
||||
-Gallium 0.4 on AMD KAVERI (DRM 2.48.0 / 4.9.0-0.rc4.git2.2.fc26.x86_64, LLVM3) AMD Kaveri
|
||||
-Gallium 0.4 on AMD KAVERI (DRM 2.48.0 / 4.9.0-0.rc4.git2.2.fc26.x86_64, LLVM3 AMD Kaveri
|
||||
+Gallium 0.4 on AMD KAVERI AMD KAVERI
|
||||
+AMD KAVERI (DRM 2.48.0 / 4.9.0-0.rc4.git2.2.fc26.x86_64, LLVM3) AMD KAVERI
|
||||
+AMD KAVERI (DRM 2.48.0 / 4.9.0-0.rc4.git2.2.fc26.x86_64, LLVM3 AMD KAVERI
|
||||
+Gallium 0.4 on AMD KAVERI (DRM 2.48.0 / 4.9.0-0.rc4.git2.2.fc26.x86_64, LLVM3) AMD KAVERI
|
||||
+Gallium 0.4 on AMD KAVERI (DRM 2.48.0 / 4.9.0-0.rc4.git2.2.fc26.x86_64, LLVM3 AMD KAVERI
|
||||
+AMD Ryzen Threadripper 1950X 16-Core Processor AMD Ryzen Threadripper 1950X 16-Core Processor
|
||||
+AMD Radeon RX 580 Series (POLARIS10, DRM 3.42.0, 5.15.13-1-ck-generic-v3, LLVM 13.0.0) AMD Radeon RX 580 Series
|
||||
+AMD EPYC 7251 8-Core Processor AMD EPYC 7251 8-Core Processor
|
||||
--
|
||||
2.35.1
|
||||
|
||||
|
||||
From 8d44e51983e002c1cac3a9b84e8ba8b6158c1dde Mon Sep 17 00:00:00 2001
|
||||
From: Norbert Pfeiler <norbert.pfeiler+git@gmail.com>
|
||||
Date: Sat, 29 Jan 2022 08:06:49 +0100
|
||||
Subject: [PATCH 03/10] info-overview: Always omit Gallium, not just for AMD
|
||||
|
||||
---
|
||||
panels/info-overview/info-cleanup.c | 2 +-
|
||||
tests/info/info-cleanup-test.txt | 2 ++
|
||||
2 files changed, 3 insertions(+), 1 deletion(-)
|
||||
|
||||
diff --git a/panels/info-overview/info-cleanup.c b/panels/info-overview/info-cleanup.c
|
||||
index f723de6f4..a444389c7 100644
|
||||
--- a/panels/info-overview/info-cleanup.c
|
||||
+++ b/panels/info-overview/info-cleanup.c
|
||||
@@ -40,7 +40,7 @@ prettify_info (const char *info)
|
||||
{ "Intel[(]R[)]", "Intel\302\256"},
|
||||
{ "Core[(]TM[)]", "Core\342\204\242"},
|
||||
{ "Atom[(]TM[)]", "Atom\342\204\242"},
|
||||
- { "Gallium .* on (AMD .*)", "\\1"},
|
||||
+ { "Gallium \\d+\\.\\d+ on (.*)", "\\1"},
|
||||
{ "(AMD .*) [(].*", "\\1"},
|
||||
{ "Graphics Controller", "Graphics"},
|
||||
};
|
||||
diff --git a/tests/info/info-cleanup-test.txt b/tests/info/info-cleanup-test.txt
|
||||
index c074fb6f5..637da42ab 100644
|
||||
--- a/tests/info/info-cleanup-test.txt
|
||||
+++ b/tests/info/info-cleanup-test.txt
|
||||
@@ -9,3 +9,5 @@ Gallium 0.4 on AMD KAVERI (DRM 2.48.0 / 4.9.0-0.rc4.git2.2.fc26.x86_64, LLVM3 AM
|
||||
AMD Ryzen Threadripper 1950X 16-Core Processor AMD Ryzen Threadripper 1950X 16-Core Processor
|
||||
AMD Radeon RX 580 Series (POLARIS10, DRM 3.42.0, 5.15.13-1-ck-generic-v3, LLVM 13.0.0) AMD Radeon RX 580 Series
|
||||
AMD EPYC 7251 8-Core Processor AMD EPYC 7251 8-Core Processor
|
||||
+Gallium 0.4 on SVGA3D SVGA3D
|
||||
+Gallium 0.4 on llvmpipe (LLVM 3.4, 128 bits) llvmpipe (LLVM 3.4, 128 bits)
|
||||
--
|
||||
2.35.1
|
||||
|
||||
|
||||
From 3cf413e65a3c30f514e5dd4f9d09e9b1aab7f4cb Mon Sep 17 00:00:00 2001
|
||||
From: Norbert Pfeiler <norbert.pfeiler+git@gmail.com>
|
||||
Date: Sat, 29 Jan 2022 08:25:21 +0100
|
||||
Subject: [PATCH 04/10] info-overview: Use a more generic regex to match the
|
||||
Mesa infos
|
||||
|
||||
---
|
||||
panels/info-overview/info-cleanup.c | 2 +-
|
||||
tests/info/info-cleanup-test.txt | 2 +-
|
||||
2 files changed, 2 insertions(+), 2 deletions(-)
|
||||
|
||||
diff --git a/panels/info-overview/info-cleanup.c b/panels/info-overview/info-cleanup.c
|
||||
index a444389c7..10418a5ec 100644
|
||||
--- a/panels/info-overview/info-cleanup.c
|
||||
+++ b/panels/info-overview/info-cleanup.c
|
||||
@@ -41,7 +41,7 @@ prettify_info (const char *info)
|
||||
{ "Core[(]TM[)]", "Core\342\204\242"},
|
||||
{ "Atom[(]TM[)]", "Atom\342\204\242"},
|
||||
{ "Gallium \\d+\\.\\d+ on (.*)", "\\1"},
|
||||
- { "(AMD .*) [(].*", "\\1"},
|
||||
+ { " [(][^)]*(DRM|MESA|LLVM)[^)]*[)]?", ""},
|
||||
{ "Graphics Controller", "Graphics"},
|
||||
};
|
||||
|
||||
diff --git a/tests/info/info-cleanup-test.txt b/tests/info/info-cleanup-test.txt
|
||||
index 637da42ab..2f4327977 100644
|
||||
--- a/tests/info/info-cleanup-test.txt
|
||||
+++ b/tests/info/info-cleanup-test.txt
|
||||
@@ -10,4 +10,4 @@ AMD Ryzen Threadripper 1950X 16-Core Processor AMD Ryzen Threadripper 1950X 16-C
|
||||
AMD Radeon RX 580 Series (POLARIS10, DRM 3.42.0, 5.15.13-1-ck-generic-v3, LLVM 13.0.0) AMD Radeon RX 580 Series
|
||||
AMD EPYC 7251 8-Core Processor AMD EPYC 7251 8-Core Processor
|
||||
Gallium 0.4 on SVGA3D SVGA3D
|
||||
-Gallium 0.4 on llvmpipe (LLVM 3.4, 128 bits) llvmpipe (LLVM 3.4, 128 bits)
|
||||
+Gallium 0.4 on llvmpipe (LLVM 3.4, 128 bits) llvmpipe
|
||||
--
|
||||
2.35.1
|
||||
|
||||
|
||||
From 71ecb8b1293e868ac1fb19eb6655436d71f445d3 Mon Sep 17 00:00:00 2001
|
||||
From: Norbert Pfeiler <norbert.pfeiler+git@gmail.com>
|
||||
Date: Sat, 29 Jan 2022 08:09:46 +0100
|
||||
Subject: [PATCH 05/10] info-overview: Replace the trademark symbols in a more
|
||||
generic way
|
||||
|
||||
---
|
||||
panels/info-overview/info-cleanup.c | 5 ++---
|
||||
tests/info/info-cleanup-test.txt | 2 ++
|
||||
2 files changed, 4 insertions(+), 3 deletions(-)
|
||||
|
||||
diff --git a/panels/info-overview/info-cleanup.c b/panels/info-overview/info-cleanup.c
|
||||
index 10418a5ec..25d957a1d 100644
|
||||
--- a/panels/info-overview/info-cleanup.c
|
||||
+++ b/panels/info-overview/info-cleanup.c
|
||||
@@ -37,9 +37,8 @@ prettify_info (const char *info)
|
||||
int i;
|
||||
static const ReplaceStrings rs[] = {
|
||||
{ "Mesa DRI ", ""},
|
||||
- { "Intel[(]R[)]", "Intel\302\256"},
|
||||
- { "Core[(]TM[)]", "Core\342\204\242"},
|
||||
- { "Atom[(]TM[)]", "Atom\342\204\242"},
|
||||
+ { "[(]R[)]", "\302\256"},
|
||||
+ { "[(](tm|TM)[)]", "\342\204\242"},
|
||||
{ "Gallium \\d+\\.\\d+ on (.*)", "\\1"},
|
||||
{ " [(][^)]*(DRM|MESA|LLVM)[^)]*[)]?", ""},
|
||||
{ "Graphics Controller", "Graphics"},
|
||||
diff --git a/tests/info/info-cleanup-test.txt b/tests/info/info-cleanup-test.txt
|
||||
index 2f4327977..e8ca5da0f 100644
|
||||
--- a/tests/info/info-cleanup-test.txt
|
||||
+++ b/tests/info/info-cleanup-test.txt
|
||||
@@ -11,3 +11,5 @@ AMD Radeon RX 580 Series (POLARIS10, DRM 3.42.0, 5.15.13-1-ck-generic-v3, LLVM 1
|
||||
AMD EPYC 7251 8-Core Processor AMD EPYC 7251 8-Core Processor
|
||||
Gallium 0.4 on SVGA3D SVGA3D
|
||||
Gallium 0.4 on llvmpipe (LLVM 3.4, 128 bits) llvmpipe
|
||||
+AMD FX(tm)-8350 Eight-Core Processor AMD FX™-8350 Eight-Core Processor
|
||||
+AMD Athlon(tm) II X3 435 Processor AMD Athlon™ II X3 435 Processor
|
||||
--
|
||||
2.35.1
|
||||
|
||||
|
||||
From 307b420c90763d03e8a32d74dc5cf23d39d1b689 Mon Sep 17 00:00:00 2001
|
||||
From: Norbert Pfeiler <norbert.pfeiler+git@gmail.com>
|
||||
Date: Sat, 29 Jan 2022 10:58:55 +0100
|
||||
Subject: [PATCH 06/10] info-overview: Remove some junk info, like PCIe and SSE
|
||||
|
||||
---
|
||||
panels/info-overview/info-cleanup.c | 1 +
|
||||
tests/info/info-cleanup-test.txt | 2 ++
|
||||
2 files changed, 3 insertions(+)
|
||||
|
||||
diff --git a/panels/info-overview/info-cleanup.c b/panels/info-overview/info-cleanup.c
|
||||
index 25d957a1d..f0e8cc772 100644
|
||||
--- a/panels/info-overview/info-cleanup.c
|
||||
+++ b/panels/info-overview/info-cleanup.c
|
||||
@@ -40,6 +40,7 @@ prettify_info (const char *info)
|
||||
{ "[(]R[)]", "\302\256"},
|
||||
{ "[(](tm|TM)[)]", "\342\204\242"},
|
||||
{ "Gallium \\d+\\.\\d+ on (.*)", "\\1"},
|
||||
+ { " x86|/MMX|/SSE2|/PCIe", ""},
|
||||
{ " [(][^)]*(DRM|MESA|LLVM)[^)]*[)]?", ""},
|
||||
{ "Graphics Controller", "Graphics"},
|
||||
};
|
||||
diff --git a/tests/info/info-cleanup-test.txt b/tests/info/info-cleanup-test.txt
|
||||
index e8ca5da0f..ce8084305 100644
|
||||
--- a/tests/info/info-cleanup-test.txt
|
||||
+++ b/tests/info/info-cleanup-test.txt
|
||||
@@ -13,3 +13,5 @@ Gallium 0.4 on SVGA3D SVGA3D
|
||||
Gallium 0.4 on llvmpipe (LLVM 3.4, 128 bits) llvmpipe
|
||||
AMD FX(tm)-8350 Eight-Core Processor AMD FX™-8350 Eight-Core Processor
|
||||
AMD Athlon(tm) II X3 435 Processor AMD Athlon™ II X3 435 Processor
|
||||
+NVIDIA GeForce GT 710/PCIe/SSE2 NVIDIA GeForce GT 710
|
||||
+Mesa DRI Intel(R) 965GM x86/MMX/SSE2 Intel® 965GM
|
||||
--
|
||||
2.35.1
|
||||
|
||||
|
||||
From da98faf10360d8a278e672a44858c1c249101d53 Mon Sep 17 00:00:00 2001
|
||||
From: Norbert Pfeiler <norbert.pfeiler+git@gmail.com>
|
||||
Date: Sat, 29 Jan 2022 10:31:17 +0100
|
||||
Subject: [PATCH 07/10] info-overview: Remove redundant/elaborate info
|
||||
|
||||
Remove redundant/elaborate in strings like CPU, Core and Processor.
|
||||
---
|
||||
panels/info-overview/info-cleanup.c | 1 +
|
||||
tests/info/info-cleanup-test.txt | 10 +++++-----
|
||||
2 files changed, 6 insertions(+), 5 deletions(-)
|
||||
|
||||
diff --git a/panels/info-overview/info-cleanup.c b/panels/info-overview/info-cleanup.c
|
||||
index f0e8cc772..21ea83dd3 100644
|
||||
--- a/panels/info-overview/info-cleanup.c
|
||||
+++ b/panels/info-overview/info-cleanup.c
|
||||
@@ -40,6 +40,7 @@ prettify_info (const char *info)
|
||||
{ "[(]R[)]", "\302\256"},
|
||||
{ "[(](tm|TM)[)]", "\342\204\242"},
|
||||
{ "Gallium \\d+\\.\\d+ on (.*)", "\\1"},
|
||||
+ { " CPU| Processor| \\S+-Core", ""},
|
||||
{ " x86|/MMX|/SSE2|/PCIe", ""},
|
||||
{ " [(][^)]*(DRM|MESA|LLVM)[^)]*[)]?", ""},
|
||||
{ "Graphics Controller", "Graphics"},
|
||||
diff --git a/tests/info/info-cleanup-test.txt b/tests/info/info-cleanup-test.txt
|
||||
index ce8084305..6de8e0bc5 100644
|
||||
--- a/tests/info/info-cleanup-test.txt
|
||||
+++ b/tests/info/info-cleanup-test.txt
|
||||
@@ -1,4 +1,4 @@
|
||||
-Intel(R) Core(TM) i5-4590T CPU @ 2.00GHz Intel® Core™ i5-4590T CPU @ 2.00GHz
|
||||
+Intel(R) Core(TM) i5-4590T CPU @ 2.00GHz Intel® Core™ i5-4590T @ 2.00GHz
|
||||
Intel(R) Ivybridge Mobile Intel® Ivybridge Mobile
|
||||
Intel(R) Ivybridge Mobile Intel® Ivybridge Mobile
|
||||
Gallium 0.4 on AMD KAVERI AMD KAVERI
|
||||
@@ -6,12 +6,12 @@ AMD KAVERI (DRM 2.48.0 / 4.9.0-0.rc4.git2.2.fc26.x86_64, LLVM3) AMD KAVERI
|
||||
AMD KAVERI (DRM 2.48.0 / 4.9.0-0.rc4.git2.2.fc26.x86_64, LLVM3 AMD KAVERI
|
||||
Gallium 0.4 on AMD KAVERI (DRM 2.48.0 / 4.9.0-0.rc4.git2.2.fc26.x86_64, LLVM3) AMD KAVERI
|
||||
Gallium 0.4 on AMD KAVERI (DRM 2.48.0 / 4.9.0-0.rc4.git2.2.fc26.x86_64, LLVM3 AMD KAVERI
|
||||
-AMD Ryzen Threadripper 1950X 16-Core Processor AMD Ryzen Threadripper 1950X 16-Core Processor
|
||||
+AMD Ryzen Threadripper 1950X 16-Core Processor AMD Ryzen Threadripper 1950X
|
||||
AMD Radeon RX 580 Series (POLARIS10, DRM 3.42.0, 5.15.13-1-ck-generic-v3, LLVM 13.0.0) AMD Radeon RX 580 Series
|
||||
-AMD EPYC 7251 8-Core Processor AMD EPYC 7251 8-Core Processor
|
||||
+AMD EPYC 7251 8-Core Processor AMD EPYC 7251
|
||||
Gallium 0.4 on SVGA3D SVGA3D
|
||||
Gallium 0.4 on llvmpipe (LLVM 3.4, 128 bits) llvmpipe
|
||||
-AMD FX(tm)-8350 Eight-Core Processor AMD FX™-8350 Eight-Core Processor
|
||||
-AMD Athlon(tm) II X3 435 Processor AMD Athlon™ II X3 435 Processor
|
||||
+AMD FX(tm)-8350 Eight-Core Processor AMD FX™-8350
|
||||
+AMD Athlon(tm) II X3 435 Processor AMD Athlon™ II X3 435
|
||||
NVIDIA GeForce GT 710/PCIe/SSE2 NVIDIA GeForce GT 710
|
||||
Mesa DRI Intel(R) 965GM x86/MMX/SSE2 Intel® 965GM
|
||||
--
|
||||
2.35.1
|
||||
|
||||
|
||||
From 4132e8856c8c1b6dfc64745e17d64078b4aa05cc Mon Sep 17 00:00:00 2001
|
||||
From: Norbert Pfeiler <norbert.pfeiler+git@gmail.com>
|
||||
Date: Sat, 29 Jan 2022 10:29:15 +0100
|
||||
Subject: [PATCH 08/10] info-overview: Remove some rare @ x.yz GHz
|
||||
specification
|
||||
|
||||
---
|
||||
panels/info-overview/info-cleanup.c | 2 +-
|
||||
tests/info/info-cleanup-test.txt | 2 +-
|
||||
2 files changed, 2 insertions(+), 2 deletions(-)
|
||||
|
||||
diff --git a/panels/info-overview/info-cleanup.c b/panels/info-overview/info-cleanup.c
|
||||
index 21ea83dd3..7d640bb64 100644
|
||||
--- a/panels/info-overview/info-cleanup.c
|
||||
+++ b/panels/info-overview/info-cleanup.c
|
||||
@@ -40,7 +40,7 @@ prettify_info (const char *info)
|
||||
{ "[(]R[)]", "\302\256"},
|
||||
{ "[(](tm|TM)[)]", "\342\204\242"},
|
||||
{ "Gallium \\d+\\.\\d+ on (.*)", "\\1"},
|
||||
- { " CPU| Processor| \\S+-Core", ""},
|
||||
+ { " CPU| Processor| \\S+-Core| @ \\d+\\.\\d+GHz", ""},
|
||||
{ " x86|/MMX|/SSE2|/PCIe", ""},
|
||||
{ " [(][^)]*(DRM|MESA|LLVM)[^)]*[)]?", ""},
|
||||
{ "Graphics Controller", "Graphics"},
|
||||
diff --git a/tests/info/info-cleanup-test.txt b/tests/info/info-cleanup-test.txt
|
||||
index 6de8e0bc5..72b92071a 100644
|
||||
--- a/tests/info/info-cleanup-test.txt
|
||||
+++ b/tests/info/info-cleanup-test.txt
|
||||
@@ -1,4 +1,4 @@
|
||||
-Intel(R) Core(TM) i5-4590T CPU @ 2.00GHz Intel® Core™ i5-4590T @ 2.00GHz
|
||||
+Intel(R) Core(TM) i5-4590T CPU @ 2.00GHz Intel® Core™ i5-4590T
|
||||
Intel(R) Ivybridge Mobile Intel® Ivybridge Mobile
|
||||
Intel(R) Ivybridge Mobile Intel® Ivybridge Mobile
|
||||
Gallium 0.4 on AMD KAVERI AMD KAVERI
|
||||
--
|
||||
2.35.1
|
||||
|
||||
|
||||
From ad01dc194e5e1e9876da611e70ac451af9bd1442 Mon Sep 17 00:00:00 2001
|
||||
From: Norbert Pfeiler <norbert.pfeiler+git@gmail.com>
|
||||
Date: Sat, 29 Jan 2022 11:10:04 +0100
|
||||
Subject: [PATCH 09/10] info-overview: Add some commonly used trademarks
|
||||
MIME-Version: 1.0
|
||||
Content-Type: text/plain; charset=UTF-8
|
||||
Content-Transfer-Encoding: 8bit
|
||||
|
||||
Those are not always present in the device string.
|
||||
Guidance was taken from the usage on vendor websites.
|
||||
|
||||
NVIDIA actually has the rights to GTX™ but doesn’t seem to use it,
|
||||
in contrast to RTX™.
|
||||
---
|
||||
panels/info-overview/info-cleanup.c | 1 +
|
||||
tests/info/info-cleanup-test.txt | 7 ++++---
|
||||
2 files changed, 5 insertions(+), 3 deletions(-)
|
||||
|
||||
diff --git a/panels/info-overview/info-cleanup.c b/panels/info-overview/info-cleanup.c
|
||||
index 7d640bb64..ceeb61025 100644
|
||||
--- a/panels/info-overview/info-cleanup.c
|
||||
+++ b/panels/info-overview/info-cleanup.c
|
||||
@@ -39,6 +39,7 @@ prettify_info (const char *info)
|
||||
{ "Mesa DRI ", ""},
|
||||
{ "[(]R[)]", "\302\256"},
|
||||
{ "[(](tm|TM)[)]", "\342\204\242"},
|
||||
+ { "(ATI|EPYC|AMD FX|Radeon|Ryzen|Threadripper|GeForce RTX) ", "\\1\342\204\242 "},
|
||||
{ "Gallium \\d+\\.\\d+ on (.*)", "\\1"},
|
||||
{ " CPU| Processor| \\S+-Core| @ \\d+\\.\\d+GHz", ""},
|
||||
{ " x86|/MMX|/SSE2|/PCIe", ""},
|
||||
diff --git a/tests/info/info-cleanup-test.txt b/tests/info/info-cleanup-test.txt
|
||||
index 72b92071a..80be85135 100644
|
||||
--- a/tests/info/info-cleanup-test.txt
|
||||
+++ b/tests/info/info-cleanup-test.txt
|
||||
@@ -6,12 +6,13 @@ AMD KAVERI (DRM 2.48.0 / 4.9.0-0.rc4.git2.2.fc26.x86_64, LLVM3) AMD KAVERI
|
||||
AMD KAVERI (DRM 2.48.0 / 4.9.0-0.rc4.git2.2.fc26.x86_64, LLVM3 AMD KAVERI
|
||||
Gallium 0.4 on AMD KAVERI (DRM 2.48.0 / 4.9.0-0.rc4.git2.2.fc26.x86_64, LLVM3) AMD KAVERI
|
||||
Gallium 0.4 on AMD KAVERI (DRM 2.48.0 / 4.9.0-0.rc4.git2.2.fc26.x86_64, LLVM3 AMD KAVERI
|
||||
-AMD Ryzen Threadripper 1950X 16-Core Processor AMD Ryzen Threadripper 1950X
|
||||
-AMD Radeon RX 580 Series (POLARIS10, DRM 3.42.0, 5.15.13-1-ck-generic-v3, LLVM 13.0.0) AMD Radeon RX 580 Series
|
||||
-AMD EPYC 7251 8-Core Processor AMD EPYC 7251
|
||||
+AMD Ryzen Threadripper 1950X 16-Core Processor AMD Ryzen™ Threadripper™ 1950X
|
||||
+AMD Radeon RX 580 Series (POLARIS10, DRM 3.42.0, 5.15.13-1-ck-generic-v3, LLVM 13.0.0) AMD Radeon™ RX 580 Series
|
||||
+AMD EPYC 7251 8-Core Processor AMD EPYC™ 7251
|
||||
Gallium 0.4 on SVGA3D SVGA3D
|
||||
Gallium 0.4 on llvmpipe (LLVM 3.4, 128 bits) llvmpipe
|
||||
AMD FX(tm)-8350 Eight-Core Processor AMD FX™-8350
|
||||
AMD Athlon(tm) II X3 435 Processor AMD Athlon™ II X3 435
|
||||
NVIDIA GeForce GT 710/PCIe/SSE2 NVIDIA GeForce GT 710
|
||||
Mesa DRI Intel(R) 965GM x86/MMX/SSE2 Intel® 965GM
|
||||
+NVIDIA GeForce RTX 3090/PCIe/SSE2 NVIDIA GeForce RTX™ 3090
|
||||
--
|
||||
2.35.1
|
||||
|
||||
|
||||
From 160fbfe8aa0cb396c1a0c31e1199f32da0c4c79e Mon Sep 17 00:00:00 2001
|
||||
From: Norbert Pfeiler <norbert.pfeiler+git@gmail.com>
|
||||
Date: Sat, 29 Jan 2022 10:56:33 +0100
|
||||
Subject: [PATCH 10/10] =?UTF-8?q?info-overview:=20Replace=20llvmpipe=20wit?=
|
||||
=?UTF-8?q?h=20=E2=80=9CSoftware=20Rendering=E2=80=9D?=
|
||||
MIME-Version: 1.0
|
||||
Content-Type: text/plain; charset=UTF-8
|
||||
Content-Transfer-Encoding: 8bit
|
||||
|
||||
---
|
||||
panels/info-overview/info-cleanup.c | 1 +
|
||||
tests/info/info-cleanup-test.txt | 3 ++-
|
||||
2 files changed, 3 insertions(+), 1 deletion(-)
|
||||
|
||||
diff --git a/panels/info-overview/info-cleanup.c b/panels/info-overview/info-cleanup.c
|
||||
index ceeb61025..5c3480ca7 100644
|
||||
--- a/panels/info-overview/info-cleanup.c
|
||||
+++ b/panels/info-overview/info-cleanup.c
|
||||
@@ -45,6 +45,7 @@ prettify_info (const char *info)
|
||||
{ " x86|/MMX|/SSE2|/PCIe", ""},
|
||||
{ " [(][^)]*(DRM|MESA|LLVM)[^)]*[)]?", ""},
|
||||
{ "Graphics Controller", "Graphics"},
|
||||
+ { ".*llvmpipe.*", "Software Rendering"},
|
||||
};
|
||||
|
||||
if (*info == '\0')
|
||||
diff --git a/tests/info/info-cleanup-test.txt b/tests/info/info-cleanup-test.txt
|
||||
index 80be85135..a0e25fbd0 100644
|
||||
--- a/tests/info/info-cleanup-test.txt
|
||||
+++ b/tests/info/info-cleanup-test.txt
|
||||
@@ -10,7 +10,8 @@ AMD Ryzen Threadripper 1950X 16-Core Processor AMD Ryzen™ Threadripper™ 1950
|
||||
AMD Radeon RX 580 Series (POLARIS10, DRM 3.42.0, 5.15.13-1-ck-generic-v3, LLVM 13.0.0) AMD Radeon™ RX 580 Series
|
||||
AMD EPYC 7251 8-Core Processor AMD EPYC™ 7251
|
||||
Gallium 0.4 on SVGA3D SVGA3D
|
||||
-Gallium 0.4 on llvmpipe (LLVM 3.4, 128 bits) llvmpipe
|
||||
+Gallium 0.4 on llvmpipe (LLVM 3.4, 128 bits) Software Rendering
|
||||
+llvmpipe (LLVM 12.0.1, 256 bits) Software Rendering
|
||||
AMD FX(tm)-8350 Eight-Core Processor AMD FX™-8350
|
||||
AMD Athlon(tm) II X3 435 Processor AMD Athlon™ II X3 435
|
||||
NVIDIA GeForce GT 710/PCIe/SSE2 NVIDIA GeForce GT 710
|
||||
--
|
||||
2.35.1
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user