From e4be8b6f96d004fbca0c4c1208a78ff7eb32bd7e Mon Sep 17 00:00:00 2001 From: Zhao Hang Date: Tue, 20 Jun 2023 13:32:49 +0800 Subject: [PATCH 1/2] update to gnome-shell-40.10-5.el9_1 Signed-off-by: Zhao Hang --- 0001-introspect-Allowlist-GNOME-portal.patch | 33 +++++++++++++++++ ...ll-anolis-international-modification.patch | 35 ------------------- dist | 1 - gnome-shell.spec | 14 +++++--- 4 files changed, 43 insertions(+), 40 deletions(-) create mode 100644 0001-introspect-Allowlist-GNOME-portal.patch delete mode 100644 0007-gnome-shell-anolis-international-modification.patch delete mode 100644 dist diff --git a/0001-introspect-Allowlist-GNOME-portal.patch b/0001-introspect-Allowlist-GNOME-portal.patch new file mode 100644 index 0000000..a2eafa8 --- /dev/null +++ b/0001-introspect-Allowlist-GNOME-portal.patch @@ -0,0 +1,33 @@ +From b73a07c20a522b3be0e096625c21d5606bcb7d82 Mon Sep 17 00:00:00 2001 +From: Georges Basile Stavracas Neto +Date: Mon, 21 Jun 2021 16:32:50 -0300 +Subject: [PATCH] introspect: Allowlist GNOME portal + +It too implements app listing and introspection, so list it in the +allowlist. + +Part-of: + +--- + js/misc/introspect.js | 5 ++++- + 1 file changed, 4 insertions(+), 1 deletion(-) + +diff --git a/js/misc/introspect.js b/js/misc/introspect.js +index f3c938af9..45eee81ce 100644 +--- a/js/misc/introspect.js ++++ b/js/misc/introspect.js +@@ -1,7 +1,10 @@ + /* exported IntrospectService */ + const { Gio, GLib, Meta, Shell, St } = imports.gi; + +-const APP_ALLOWLIST = ['org.freedesktop.impl.portal.desktop.gtk']; ++const APP_ALLOWLIST = [ ++ 'org.freedesktop.impl.portal.desktop.gtk', ++ 'org.freedesktop.impl.portal.desktop.gnome', ++]; + + const INTROSPECT_DBUS_API_VERSION = 3; + +-- +2.38.1 + diff --git a/0007-gnome-shell-anolis-international-modification.patch b/0007-gnome-shell-anolis-international-modification.patch deleted file mode 100644 index 91f2cc9..0000000 --- a/0007-gnome-shell-anolis-international-modification.patch +++ /dev/null @@ -1,35 +0,0 @@ -From c113000beae22d02e6c319b26b4ac103b332793e Mon Sep 17 00:00:00 2001 -From: pangqing -Date: Tue, 26 Apr 2022 17:29:16 +0800 -Subject: [PATCH] international modification - ---- - po/zh_CN.po | 12 ++++++++++++ - 1 file changed, 12 insertions(+) - -diff --git a/po/zh_CN.po b/po/zh_CN.po -index 4dc1a9c..c9b9717 100644 ---- a/po/zh_CN.po -+++ b/po/zh_CN.po -@@ -63,6 +63,18 @@ msgstr "打开应用程序菜单" - msgid "Shell Extensions" - msgstr "Shell 扩展" - -+#: js/ui/main.js:249 -+msgid "Logged in as a privileged user" -+msgstr "作为特权用户登录" -+ -+#: js/ui/main.js:250 -+msgid "" -+"Running a session as a privileged user should be avoided for " -+"security reasons. If possible, you should log in as a normal user." -+msgstr "" -+"出于安全原因，应该避免以特权用户的身份运行会话。如果可能，" -+"您应该以普通用户的身份登录。" -+ - #: data/gnome-shell-extension-prefs.desktop.in.in:5 - msgid "Configure GNOME Shell Extensions" - msgstr "配置 GNOME Shell 扩展" --- -2.18.4 - diff --git a/dist b/dist deleted file mode 100644 index 89c1faf..0000000 --- a/dist +++ /dev/null @@ -1 +0,0 @@ -an9 diff --git a/gnome-shell.spec b/gnome-shell.spec index d77e201..d9d83a3 100644 --- a/gnome-shell.spec +++ b/gnome-shell.spec @@ -1,9 +1,8 @@ -%define anolis_release .0.1 %global tarball_version %%(echo %{version} | tr '~' '.') Name: gnome-shell Version: 40.10 -Release: 3%{anolis_release}%{?dist} +Release: 5%{?dist} Summary: Window management and application launching for GNOME License: GPLv2+ @@ -46,6 +45,7 @@ Patch43: restrict-dbus-callers.patch Patch44: 0001-Revert-dash-Subtract-vertical-margins-from-availHeig.patch Patch45: 0001-status-volume-Hide-sliders-initially.patch Patch46: 0001-kbdA11yDialog-Use-MetaKeyboardA11yFlags.patch +Patch47: 0001-introspect-Allowlist-GNOME-portal.patch %define eds_version 3.33.1 %define gnome_desktop_version 3.35.91 @@ -157,6 +157,7 @@ Requires: bolt%{?_isa} # Needed for launching flatpak apps etc # 1.8.0 is needed for source type support in the screencast portal. Requires: xdg-desktop-portal-gtk >= 1.8.0 +Requires: xdg-desktop-portal-gnome # needed by the welcome dialog Recommends: gnome-tour @@ -264,8 +265,13 @@ desktop-file-validate %{buildroot}%{_datadir}/applications/evolution-calendar.de %{_mandir}/man1/gnome-shell.1* %changelog -* Wed May 17 2023 pangqing - 40.10-3.0.1 -- International modification +* Wed Feb 22 2023 Florian Müllner - 40.10-5 +- Require xdg-desktop-portal-gnome + Resolves: #2172524 + +* Sat Dec 17 2022 Florian Müllner - 40.10-4 +- Allow gnome portal to access introspection API + Resolves: #2144743 * Mon Jun 20 2022 Florian Müllner - 40.10-3 - Fix keyboard a11y confirmation dialog -- Gitee From c127768886f06c15771db04e87199bdf4a3804d8 Mon Sep 17 00:00:00 2001 From: pangqing Date: Tue, 26 Apr 2022 17:37:00 +0800 Subject: [PATCH 2/2] International modification Signed-off-by: pangqing --- ...ll-anolis-international-modification.patch | 35 +++++++++++++++++++ gnome-shell.spec | 6 +++- 2 files changed, 40 insertions(+), 1 deletion(-) create mode 100644 0007-gnome-shell-anolis-international-modification.patch diff --git a/0007-gnome-shell-anolis-international-modification.patch b/0007-gnome-shell-anolis-international-modification.patch new file mode 100644 index 0000000..91f2cc9 --- /dev/null +++ b/0007-gnome-shell-anolis-international-modification.patch @@ -0,0 +1,35 @@ +From c113000beae22d02e6c319b26b4ac103b332793e Mon Sep 17 00:00:00 2001 +From: pangqing +Date: Tue, 26 Apr 2022 17:29:16 +0800 +Subject: [PATCH] international modification + +--- + po/zh_CN.po | 12 ++++++++++++ + 1 file changed, 12 insertions(+) + +diff --git a/po/zh_CN.po b/po/zh_CN.po +index 4dc1a9c..c9b9717 100644 +--- a/po/zh_CN.po ++++ b/po/zh_CN.po +@@ -63,6 +63,18 @@ msgstr "打开应用程序菜单" + msgid "Shell Extensions" + msgstr "Shell 扩展" + ++#: js/ui/main.js:249 ++msgid "Logged in as a privileged user" ++msgstr "作为特权用户登录" ++ ++#: js/ui/main.js:250 ++msgid "" ++"Running a session as a privileged user should be avoided for " ++"security reasons. If possible, you should log in as a normal user." ++msgstr "" ++"出于安全原因，应该避免以特权用户的身份运行会话。如果可能，" ++"您应该以普通用户的身份登录。" ++ + #: data/gnome-shell-extension-prefs.desktop.in.in:5 + msgid "Configure GNOME Shell Extensions" + msgstr "配置 GNOME Shell 扩展" +-- +2.18.4 + diff --git a/gnome-shell.spec b/gnome-shell.spec index d9d83a3..e003759 100644 --- a/gnome-shell.spec +++ b/gnome-shell.spec @@ -1,8 +1,9 @@ +%define anolis_release .0.1 %global tarball_version %%(echo %{version} | tr '~' '.') Name: gnome-shell Version: 40.10 -Release: 5%{?dist} +Release: 5%{anolis_release}%{?dist} Summary: Window management and application launching for GNOME License: GPLv2+ @@ -265,6 +266,9 @@ desktop-file-validate %{buildroot}%{_datadir}/applications/evolution-calendar.de %{_mandir}/man1/gnome-shell.1* %changelog +* Tue Jun 20 2023 pangqing - 40.10-5.0.1 +- International modification + * Wed Feb 22 2023 Florian Müllner - 40.10-5 - Require xdg-desktop-portal-gnome Resolves: #2172524 -- Gitee