Update to 43.2
This commit is contained in:
dwl301
parent
5f1461adec
commit
e3653325b7
@ -1,8 +1,7 @@
|
||||
diff --git a/panels/user-accounts/run-passwd.c b/panels/user-accounts/run-passwd.c
|
||||
index 86f53d4..14230c8 100644
|
||||
--- a/panels/user-accounts/run-passwd.c
|
||||
+++ b/panels/user-accounts/run-passwd.c
|
||||
@@ -458,7 +458,7 @@ io_watch_stdout (GIOChannel *source, GIOCondition condition, PasswdHandler *pass
|
||||
diff -up gnome-control-center-43.2/panels/user-accounts/run-passwd.c.BAK gnome-control-center-43.2/panels/user-accounts/run-passwd.c
|
||||
--- gnome-control-center-43.2/panels/user-accounts/run-passwd.c.BAK 2023-01-10 16:43:06.694171795 +0800
|
||||
+++ gnome-control-center-43.2/panels/user-accounts/run-passwd.c 2023-01-10 16:45:52.034162096 +0800
|
||||
@@ -446,7 +446,7 @@ io_watch_stdout (GIOChannel *source, GIO
|
||||
"different",
|
||||
"wrapped",
|
||||
"recovered",
|
||||
@ -11,7 +10,7 @@ index 86f53d4..14230c8 100644
|
||||
"unchanged",
|
||||
"match",
|
||||
"1 numeric or special",
|
||||
@@ -502,9 +502,9 @@ io_watch_stdout (GIOChannel *source, GIOCondition condition, PasswdHandler *pass
|
||||
@@ -490,9 +490,9 @@ io_watch_stdout (GIOChannel *source, GIO
|
||||
strstr (str->str, "wrapped") != NULL) {
|
||||
error = g_error_new (PASSWD_ERROR, PASSWD_ERROR_REJECTED,
|
||||
_("The old and new passwords are too similar"));
|
||||
@ -23,18 +22,17 @@ index 86f53d4..14230c8 100644
|
||||
} else if (strstr (str->str, "1 numeric or special") != NULL) {
|
||||
error = g_error_new (PASSWD_ERROR, PASSWD_ERROR_REJECTED,
|
||||
_("The new password must contain numeric or special characters"));
|
||||
diff --git a/po/zh_CN.po b/po/zh_CN.po
|
||||
index f811497..1e1984e 100644
|
||||
--- a/po/zh_CN.po
|
||||
+++ b/po/zh_CN.po
|
||||
@@ -7738,8 +7738,8 @@ msgstr "新密码和旧密码太相似"
|
||||
diff -up gnome-control-center-43.2/po/zh_CN.po.BAK gnome-control-center-43.2/po/zh_CN.po
|
||||
--- gnome-control-center-43.2/po/zh_CN.po.BAK 2023-01-10 16:46:29.198159916 +0800
|
||||
+++ gnome-control-center-43.2/po/zh_CN.po 2023-01-10 16:47:38.446155853 +0800
|
||||
@@ -8505,8 +8505,8 @@ msgstr "新密码和旧密码太相似"
|
||||
|
||||
#: panels/user-accounts/run-passwd.c:507
|
||||
#: panels/user-accounts/run-passwd.c:495
|
||||
#, c-format
|
||||
-msgid "The new password has already been used recently."
|
||||
-msgstr "新的密码最近已使用过。"
|
||||
+msgid "Password has been already used. Choose another."
|
||||
+msgstr "新密码在最近已经使用过。请选用其他密码"
|
||||
|
||||
#: panels/user-accounts/run-passwd.c:510
|
||||
#: panels/user-accounts/run-passwd.c:498
|
||||
#, c-format
|
||||
|
||||
@ -1,94 +0,0 @@
|
||||
From c8d7a25d5c8d216e78f4148ad041532ead5ec458 Mon Sep 17 00:00:00 2001
|
||||
From: Michael Catanzaro <mcatanzaro@gnome.org>
|
||||
Date: Tue, 9 Mar 2021 14:51:54 -0600
|
||||
Subject: [PATCH] info-overview: add build option to control distributor logo
|
||||
|
||||
Currently, we display a 256x256 version of the OS icon from
|
||||
/etc/os-release. This is too big for my taste, and it's also not
|
||||
sufficient for distros that want to display a logo that is not an icon.
|
||||
For instance, because we no longer display the operating system name
|
||||
immediately beneath the logo, it may be desirable to use a logo variant
|
||||
that includes text. This patch adds a meson build option that
|
||||
distributions can use to override the logo, and a second build option to
|
||||
specify a different logo for use in dark mode.
|
||||
---
|
||||
meson.build | 11 +++++++++++
|
||||
meson_options.txt | 2 ++
|
||||
panels/info-overview/cc-info-overview-panel.c | 14 ++++++++++++++
|
||||
3 files changed, 27 insertions(+)
|
||||
|
||||
diff --git a/meson.build b/meson.build
|
||||
index d56f0cb..e74ce49 100644
|
||||
--- a/meson.build
|
||||
+++ b/meson.build
|
||||
@@ -50,6 +50,17 @@ foreach define: set_defines
|
||||
config_h.set_quoted(define[0], define[1])
|
||||
endforeach
|
||||
|
||||
+distributor_logo = get_option('distributor_logo')
|
||||
+if (distributor_logo != '')
|
||||
+ config_h.set_quoted('DISTRIBUTOR_LOGO', distributor_logo,
|
||||
+ description: 'Define to absolute path of distributor logo')
|
||||
+ dark_mode_distributor_logo = get_option('dark_mode_distributor_logo')
|
||||
+ if (dark_mode_distributor_logo != '')
|
||||
+ config_h.set_quoted('DARK_MODE_DISTRIBUTOR_LOGO', dark_mode_distributor_logo,
|
||||
+ description: 'Define to absolute path of distributor logo for use in dark mode')
|
||||
+ endif
|
||||
+endif
|
||||
+
|
||||
# meson does not support octal values, so it must be handled as a
|
||||
# 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 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
|
||||
option('wayland', type: 'boolean', value: true, description: 'build with Wayland support')
|
||||
option('profile', type: 'combo', choices: ['default','development'], value: 'default')
|
||||
option('malcontent', type: 'boolean', value: false, description: 'build with malcontent support')
|
||||
+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 b348c0f..5ff649d 100644
|
||||
--- a/panels/info-overview/cc-info-overview-panel.c
|
||||
+++ b/panels/info-overview/cc-info-overview-panel.c
|
||||
@@ -937,6 +937,7 @@ cc_info_panel_row_activated_cb (CcInfoOverviewPanel *self,
|
||||
open_software_update (self);
|
||||
}
|
||||
|
||||
+#if !defined(DISTRIBUTOR_LOGO) || defined(DARK_MODE_DISTRIBUTOR_LOGO)
|
||||
static gboolean
|
||||
use_dark_theme (CcInfoOverviewPanel *panel)
|
||||
{
|
||||
@@ -944,10 +945,22 @@ use_dark_theme (CcInfoOverviewPanel *panel)
|
||||
|
||||
return adw_style_manager_get_dark (style_manager);
|
||||
}
|
||||
+#endif
|
||||
|
||||
static void
|
||||
setup_os_logo (CcInfoOverviewPanel *panel)
|
||||
{
|
||||
+#ifdef DISTRIBUTOR_LOGO
|
||||
+#ifdef DARK_MODE_DISTRIBUTOR_LOGO
|
||||
+ if (use_dark_theme (panel))
|
||||
+ {
|
||||
+ gtk_picture_set_filename (panel->os_logo, DARK_MODE_DISTRIBUTOR_LOGO);
|
||||
+ return;
|
||||
+ }
|
||||
+#endif
|
||||
+ gtk_picture_set_filename (panel->os_logo, DISTRIBUTOR_LOGO);
|
||||
+ return;
|
||||
+#else
|
||||
GtkIconTheme *icon_theme;
|
||||
g_autofree char *logo_name = g_get_os_info ("LOGO");
|
||||
g_autoptr(GtkIconPaintable) icon_paintable = NULL;
|
||||
@@ -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));
|
||||
+#endif
|
||||
}
|
||||
|
||||
static void
|
||||
Binary file not shown.
BIN
gnome-control-center-43.2.tar.xz
Normal file
BIN
gnome-control-center-43.2.tar.xz
Normal file
Binary file not shown.
@ -1,22 +1,21 @@
|
||||
%define gnome_online_accounts_version 3.25.3
|
||||
%define glib2_version 2.68.0
|
||||
%define glib2_version 2.70.0
|
||||
%define gnome_desktop_version 42.0
|
||||
%define gsd_version 41.0
|
||||
%define gsettings_desktop_schemas_version 42.0
|
||||
%define upower_version 0.99.8
|
||||
%define gtk4_version 4.4
|
||||
%define gnome_bluetooth_version 42.0
|
||||
%define libadwaita_version 1.1.0
|
||||
%define libadwaita_version 1.2.0
|
||||
%define nm_version 1.24
|
||||
|
||||
Name: gnome-control-center
|
||||
Version: 42.2
|
||||
Version: 43.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
|
||||
|
||||
Patch9001: bugfix-fix_used_passwd_error_capture.patch
|
||||
Patch9002: bugfix-gnome-control-center-fix-repetitivewallpapers.patch
|
||||
@ -137,7 +136,10 @@ 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
|
||||
* Tue Jan 10 2023 wenlong ding <wenlong.ding@turbolinux.com.cn> - 43.2-1
|
||||
- Update to 43.2
|
||||
|
||||
* Tue Jun 21 2022 weijin deng <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
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user