!9 Modify invalid Source

From: @starlet-dx Reviewed-by: @small_leek Signed-off-by: @small_leek
Modify invalid Source
2022-11-21 10:56:14 +00:00 · 2022-11-21 17:01:29 +08:00 · 2022-10-19 09:33:22 +00:00 · 2022-10-19 17:01:00 +08:00 · 2021-06-01 14:14:15 +08:00 · 2021-06-01 13:11:26 +08:00
8 changed files with 69 additions and 205 deletions
--- a/0001-Add-support-for-new-ConfirmedRebootToBootOptions-sig.patch
+++ b/0001-Add-support-for-new-ConfirmedRebootToBootOptions-sig.patch
@ -1,173 +0,0 @@
-From cba2fdd2ee9fc3decd4179feeda0cb7d833f1022 Mon Sep 17 00:00:00 2001
-From: Hans de Goede <hdegoede@redhat.com>
-Date: Tue, 14 Aug 2018 14:41:43 +0200
-Subject: [PATCH 1/2] Add support for new ConfirmedRebootToBootOptions signal
- send by org.gnome.SessionManager.EndSessionDialog
-
-In order to allow the user to choose advanced boot-options on systems where
-the boot menu is not shown by default at boot, gnome-shell's endSessionDialog.js
-may emit a new ConfirmedRebootToBootOptions signal to indicate that
-gnome-session should reboot the system in such a way that the boot-menu will
-be shown next boot.
-
-This implements the backend for the "Boot Options" button from:
-https://wiki.gnome.org/Design/OS/BootOptions
-
-Note that at the moment ConfirmedRebootToBootOptions is just treated as an
-alias to ConfirmedReboot, since there is no bootloader agnostic way yet to
-indicate the menu should be shown.
-
-For now the FIXME may be patched with a distro specific patch to implement
-this for the distro's chosen bootloader. I will start a discussion on
-systemd-devel to come up with a distro / bootloader agnostic interface
-for this.
---
- gnome-session/gsm-manager.c | 28 ++++++++++++++++++++++++++++
- gnome-session/gsm-shell.c   | 10 ++++++++++
- gnome-session/gsm-shell.h   |  7 ++++---
- 3 files changed, 42 insertions(+), 3 deletions(-)
-
-diff --git a/gnome-session/gsm-manager.c b/gnome-session/gsm-manager.c
-index 6eeea4a6..e0f190a1 100644
--- a/gnome-session/gsm-manager.c
-+++ b/gnome-session/gsm-manager.c
-@@ -109,6 +109,7 @@ typedef enum
-         GSM_MANAGER_LOGOUT_NONE,
-         GSM_MANAGER_LOGOUT_LOGOUT,
-         GSM_MANAGER_LOGOUT_REBOOT,
-+        GSM_MANAGER_LOGOUT_REBOOT_TO_BOOT_OPTIONS,
-         GSM_MANAGER_LOGOUT_REBOOT_INTERACT,
-         GSM_MANAGER_LOGOUT_SHUTDOWN,
-         GSM_MANAGER_LOGOUT_SHUTDOWN_INTERACT,
-@@ -165,6 +166,7 @@ struct GsmManagerPrivate
-         guint                   shell_end_session_dialog_confirmed_logout_id;
-         guint                   shell_end_session_dialog_confirmed_shutdown_id;
-         guint                   shell_end_session_dialog_confirmed_reboot_id;
-+        guint                   shell_end_session_dialog_confirmed_reboot_to_boot_options_id;
- };
- 
- enum {
-@@ -478,6 +480,7 @@ gsm_manager_quit (GsmManager *manager)
-                 gsm_quit ();
-                 break;
-         case GSM_MANAGER_LOGOUT_REBOOT:
-+        case GSM_MANAGER_LOGOUT_REBOOT_TO_BOOT_OPTIONS:
-         case GSM_MANAGER_LOGOUT_REBOOT_INTERACT:
-                 gsm_system_complete_shutdown (manager->priv->system);
-                 break;
-@@ -1138,6 +1141,7 @@ end_session_or_show_shell_dialog (GsmManager *manager)
-                 type = GSM_SHELL_END_SESSION_DIALOG_TYPE_LOGOUT;
-                 break;
-         case GSM_MANAGER_LOGOUT_REBOOT:
-+        case GSM_MANAGER_LOGOUT_REBOOT_TO_BOOT_OPTIONS:
-         case GSM_MANAGER_LOGOUT_REBOOT_INTERACT:
-                 type = GSM_SHELL_END_SESSION_DIALOG_TYPE_RESTART;
-                 break;
-@@ -3324,6 +3328,12 @@ disconnect_shell_dialog_signals (GsmManager *manager)
-                 manager->priv->shell_end_session_dialog_confirmed_reboot_id = 0;
-         }
- 
-+        if (manager->priv->shell_end_session_dialog_confirmed_reboot_to_boot_options_id != 0) {
-+                g_signal_handler_disconnect (manager->priv->shell,
-+                                             manager->priv->shell_end_session_dialog_confirmed_reboot_to_boot_options_id);
-+                manager->priv->shell_end_session_dialog_confirmed_reboot_to_boot_options_id = 0;
-+        }
-+
-         if (manager->priv->shell_end_session_dialog_open_failed_id != 0) {
-                 g_signal_handler_disconnect (manager->priv->shell,
-                                              manager->priv->shell_end_session_dialog_open_failed_id);
-@@ -3386,6 +3396,14 @@ on_shell_end_session_dialog_confirmed_reboot (GsmShell   *shell,
-         disconnect_shell_dialog_signals (manager);
- }
- 
-+static void
-+on_shell_end_session_dialog_confirmed_reboot_to_boot_options (GsmShell   *shell,
-+                                                           GsmManager *manager)
-+{
-+        _handle_end_session_dialog_response (manager, GSM_MANAGER_LOGOUT_REBOOT_TO_BOOT_OPTIONS);
-+        disconnect_shell_dialog_signals (manager);
-+}
-+
- static void
- connect_shell_dialog_signals (GsmManager *manager)
- {
-@@ -3421,6 +3439,12 @@ connect_shell_dialog_signals (GsmManager *manager)
-                                   "end-session-dialog-confirmed-reboot",
-                                   G_CALLBACK (on_shell_end_session_dialog_confirmed_reboot),
-                                   manager);
-+
-+        manager->priv->shell_end_session_dialog_confirmed_reboot_to_boot_options_id =
-+                g_signal_connect (manager->priv->shell,
-+                                  "end-session-dialog-confirmed-reboot-to-boot-options",
-+                                  G_CALLBACK (on_shell_end_session_dialog_confirmed_reboot_to_boot_options),
-+                                  manager);
- }
- 
- static void
-@@ -3694,6 +3718,10 @@ do_query_end_session_exit (GsmManager *manager)
-         case GSM_MANAGER_LOGOUT_REBOOT_INTERACT:
-                 reboot = TRUE;
-                 break;
-+        case GSM_MANAGER_LOGOUT_REBOOT_TO_BOOT_OPTIONS:
-+                /* FIXME tell bootmanager to show menu on next boot */
-+                reboot = TRUE;
-+                break;
-         case GSM_MANAGER_LOGOUT_SHUTDOWN:
-         case GSM_MANAGER_LOGOUT_SHUTDOWN_INTERACT:
-                 shutdown = TRUE;
-diff --git a/gnome-session/gsm-shell.c b/gnome-session/gsm-shell.c
-index 04cfa2f5..d727232d 100644
--- a/gnome-session/gsm-shell.c
-+++ b/gnome-session/gsm-shell.c
-@@ -69,6 +69,7 @@ enum {
-         END_SESSION_DIALOG_CONFIRMED_LOGOUT,
-         END_SESSION_DIALOG_CONFIRMED_SHUTDOWN,
-         END_SESSION_DIALOG_CONFIRMED_REBOOT,
-+        END_SESSION_DIALOG_CONFIRMED_REBOOT_TO_BOOT_OPTIONS,
-         NUMBER_OF_SIGNALS
- };
- 
-@@ -179,6 +180,14 @@ gsm_shell_class_init (GsmShellClass *shell_class)
-                               NULL, NULL, NULL,
-                               G_TYPE_NONE, 0);
- 
-+        signals [END_SESSION_DIALOG_CONFIRMED_REBOOT_TO_BOOT_OPTIONS] =
-+                g_signal_new ("end-session-dialog-confirmed-reboot-to-boot-options",
-+                              G_OBJECT_CLASS_TYPE (object_class),
-+                              G_SIGNAL_RUN_LAST,
-+                              G_STRUCT_OFFSET (GsmShellClass, end_session_dialog_confirmed_reboot_to_boot_options),
-+                              NULL, NULL, NULL,
-+                              G_TYPE_NONE, 0);
-+
-         g_type_class_add_private (shell_class, sizeof (GsmShellPrivate));
- }
- 
-@@ -342,6 +351,7 @@ on_end_session_dialog_dbus_signal (GDBusProxy *proxy,
-                 { "Canceled", END_SESSION_DIALOG_CANCELED },
-                 { "ConfirmedLogout", END_SESSION_DIALOG_CONFIRMED_LOGOUT },
-                 { "ConfirmedReboot", END_SESSION_DIALOG_CONFIRMED_REBOOT },
-+                { "ConfirmedRebootToBootOptions", END_SESSION_DIALOG_CONFIRMED_REBOOT_TO_BOOT_OPTIONS },
-                 { "ConfirmedShutdown", END_SESSION_DIALOG_CONFIRMED_SHUTDOWN },
-                 { NULL, -1 }
-         };
-diff --git a/gnome-session/gsm-shell.h b/gnome-session/gsm-shell.h
-index e236493a..b1cdd457 100644
--- a/gnome-session/gsm-shell.h
-+++ b/gnome-session/gsm-shell.h
-@@ -64,9 +64,10 @@ struct _GsmShellClass
-         void (* end_session_dialog_closed)        (GsmShell *shell);
-         void (* end_session_dialog_canceled)      (GsmShell *shell);
- 
-        void (* end_session_dialog_confirmed_logout)   (GsmShell *shell);
-        void (* end_session_dialog_confirmed_shutdown) (GsmShell *shell);
-        void (* end_session_dialog_confirmed_reboot)   (GsmShell *shell);
-+        void (* end_session_dialog_confirmed_logout)                 (GsmShell *shell);
-+        void (* end_session_dialog_confirmed_shutdown)               (GsmShell *shell);
-+        void (* end_session_dialog_confirmed_reboot)                 (GsmShell *shell);
-+        void (* end_session_dialog_confirmed_reboot_to_boot_options) (GsmShell *shell);
- 
- };
- 
-- 
-2.19.0
-
--- a/0001-Fedora-Set-grub-boot-flags-on-shutdown-reboot.patch
+++ b/0001-Fedora-Set-grub-boot-flags-on-shutdown-reboot.patch
@ -1,7 +1,7 @@
-From 10d271c9819e3b9986e50e1eede7d3c126c45ff5 Mon Sep 17 00:00:00 2001
+From e3d6f1c1d342d0c74f2125ea0efa2a9669aaa8df Mon Sep 17 00:00:00 2001
 From: Hans de Goede <hdegoede@redhat.com>
 Date: Tue, 14 Aug 2018 14:49:59 +0200
-Subject: [PATCH 2/2] Fedora: Set grub boot-flags on shutdown / reboot
+Subject: [PATCH] Fedora: Set grub boot-flags on shutdown / reboot

 Fedora's grub will automatically hide the boot-menu if the previous
 boot has set the boot_success flag in grub's environment. This happens
@ -13,18 +13,15 @@ a reboot / shutdown is initiated through gnome-session then the user
 is successfully interacting with the system, so set the boot_success
 flag from gnome_session for this case to fix reboot from gdm leading to
 the boot-menu not being hidden.
-
-Likewise implement ConfirmedRebootMenu handling in a Fedora specific
-way (for now) by setting the menu_show_once grub bootflag in this case.
 ---
- gnome-session/gsm-manager.c | 15 ++++++++++++++-
- 1 file changed, 14 insertions(+), 1 deletion(-)
+ gnome-session/gsm-manager.c | 12 ++++++++++++
+ 1 file changed, 12 insertions(+)

 diff --git a/gnome-session/gsm-manager.c b/gnome-session/gsm-manager.c
-index e0f190a1..1444c553 100644
+index 6839a02d..589efb02 100644
 --- a/gnome-session/gsm-manager.c
 +++ b/gnome-session/gsm-manager.c
-@@ -3716,14 +3716,27 @@ do_query_end_session_exit (GsmManager *manager)
+@@ -3823,10 +3823,22 @@ do_query_end_session_exit (GsmManager *manager)
                 break;
         case GSM_MANAGER_LOGOUT_REBOOT:
         case GSM_MANAGER_LOGOUT_REBOOT_INTERACT:
@ -36,12 +33,6 @@ index e0f190a1..1444c553 100644
 +                system("/usr/sbin/grub2-set-bootflag boot_success");
                 reboot = TRUE;
                 break;
-         case GSM_MANAGER_LOGOUT_REBOOT_TO_BOOT_OPTIONS:
-                /* FIXME tell bootmanager to show menu on next boot */
-+                /* Fedora specific implementation to show the menu on next boot */
-+                system("/usr/sbin/grub2-set-bootflag menu_show_once");
-                 reboot = TRUE;
-                 break;
         case GSM_MANAGER_LOGOUT_SHUTDOWN:
         case GSM_MANAGER_LOGOUT_SHUTDOWN_INTERACT:
 +                /*
@ -54,5 +45,5 @@ index e0f190a1..1444c553 100644
                 break;
         default:
 -- 
-2.19.0
+2.28.0

--- a/gnome-session-3.3.92-nv30.patch
+++ b/gnome-session-3.3.92-nv30.patch
@ -0,0 +1,12 @@
+--- gnome-session/data/hardware-compatibility	2012-03-21 16:30:06.269104695 -0700
+++ gnome-session/data/hardware-compatibility.new	2012-03-22 23:26:37.201967075 -0700
+@@ -19,6 +19,9 @@
+ -Mesa DRI R[12]00[^[:digit:]]
+ -Mesa DRI R[12]00$
+ 
+# NV30 family on Nouveau: https://bugzilla.redhat.com/show_bug.cgi?id=745202
+-Gallium .* on NV3[0-9A-F]$
+
+ # Old Mesa software GL renderer
+ -software rasterizer
+ 
--- a/gnome-session-3.30.1.tar.xz
+++ b/gnome-session-3.30.1.tar.xz
--- a/gnome-session-3.6.2-swrast.patch
+++ b/gnome-session-3.6.2-swrast.patch
@ -0,0 +1,12 @@
+diff -up gnome-session-3.6.2/data/hardware-compatibility.jx gnome-session-3.6.2/data/hardware-compatibility
+--- gnome-session-3.6.2/data/hardware-compatibility.jx	2012-12-10 12:43:06.000000000 -0500
+++ gnome-session-3.6.2/data/hardware-compatibility	2012-12-10 12:43:50.424352484 -0500
+@@ -23,7 +23,7 @@
+ -Gallium .* on NV3[0-9A-F]$
+ 
+ # Old Mesa software GL renderer
+--software rasterizer
+#software rasterizer
+ 
+ # Gallium has softpipe; we explicitly enable llvmpipe
+ -softpipe
--- a/gnome-session-42.0.tar.xz
+++ b/gnome-session-42.0.tar.xz
--- a/gnome-session.spec
+++ b/gnome-session.spec
@ -1,15 +1,17 @@
 Name:      gnome-session
 Summary:   Session Management Tools for the GNOME Desktop
-Version:   3.30.1
-Release:   3
+Version:   42.0
+Release:   2
 License:   GPLv2+
-URL:       http://www.gnome.org
-Source0:   http://download.gnome.org/sources/%{name}/3.30/%{name}-%{version}.tar.xz
-Patch0001: 0001-check-accelerated-gles-Use-eglGetPlatformDisplay-EXT.patch
-Patch0002: 0001-Add-support-for-new-ConfirmedRebootToBootOptions-sig.patch
-Patch0003: 0002-Fedora-Set-grub-boot-flags-on-shutdown-reboot.patch
+URL:       https://gitlab.gnome.org/GNOME/gnome-session
+Source0:   https://download.gnome.org/sources/%{name}/42/%{name}-%{version}.tar.xz

-BuildRequires: meson gcc gettext intltool xmlto usermode /usr/bin/xsltproc
+Patch1: gnome-session-3.3.92-nv30.patch
+Patch3: gnome-session-3.6.2-swrast.patch
+Patch4: 0001-check-accelerated-gles-Use-eglGetPlatformDisplay-EXT.patch
+Patch5: 0001-Fedora-Set-grub-boot-flags-on-shutdown-reboot.patch
+
+BuildRequires: meson gcc gettext intltool xmlto usermode libxslt
 BuildRequires: pkgconfig(gl) pkgconfig(egl) pkgconfig(glesv2) pkgconfig(gnome-desktop-3.0)
 BuildRequires: pkgconfig(gtk+-3.0) pkgconfig(libsystemd) pkgconfig(ice) pkgconfig(json-glib-1.0)
 BuildRequires: pkgconfig(sm) pkgconfig(x11) pkgconfig(xau) pkgconfig(xcomposite) pkgconfig(xext)
@ -21,9 +23,9 @@ Requires: dconf dbus-x11 system-logos control-center-filesystem gnome-shell
 Requires: xorg-x11-server-Xorg%{?_isa}
 Requires: xorg-x11-server-Xwayland%{?_isa}

-Obsoletes: %{name}-xsession = %{version}-%{release}
+Obsoletes: %{name}-xsession < %{version}-%{release}
 Provides: %{name}-xsession = %{version}-%{release}
-Obsoletes: %{name}-wayland-session = %{version}-%{release}
+Obsoletes: %{name}-wayland-session < %{version}-%{release}
 Provides: %{name}-wayland-session = %{version}-%{release}

 %description
@ -44,27 +46,43 @@ sed -i 's/idm[0-9]\{5,32\}\"/idm123456789123456\"/g' $(find -name %{name}.html)
 %install
 %meson_install

-%find_lang %{name}-3.0
+%find_lang %{name}-42

-%files -f %{name}-3.0.lang
+%post -p /sbin/ldconfig
+%postun -p /sbin/ldconfig
+
+%files -f %{name}-42.lang
 %license COPYING
 %{_bindir}/*
 %{_libexecdir}/%{name}*
 %{_datadir}/%{name}/
 %{_datadir}/glib-2.0/schemas/org.gnome.SessionManager.gschema.xml
-%{_datadir}/GConf/gsettings/%{name}.convert
+%{_datadir}/GConf/gsettings/gnome-session.convert
 %{_datadir}/xsessions/*
 %{_datadir}/wayland-sessions/*
+%{_userunitdir}/gnome-session*
+%{_userunitdir}/gnome-launched-.scope.d/

 %files help
 %doc AUTHORS NEWS README
 %doc %{_mandir}/man*/*
 %{_datadir}/doc/%{name}/dbus/%{name}.html

-%post -p /sbin/ldconfig
-%postun -p /sbin/ldconfig
-
 %changelog
+* Mon Nov 21 2022 yaoxin <yaoxin30@h-partners.com> - 42.0-2
+- Modify invalid Source
+
+* Tue Mar 22 2022 David King <amigadave@amigadave.com> - 42.0-1
+- Update to 42.0
+
+* Mon May 31 2021 weijin deng <weijin.deng@turbolinux.com.cn> - 3.38.0-1
+- Upgrade to 3.38.0
+- Update Version, Release, Source0, Obsoletes
+- Modify patches, update stage 'files'
+
+* Fri Apr 3 2020 chenli <chenli147@huawei.com> - 3.30.1-4
+- modify spec
+
 * Wed Nov 20 2019 caomeng<caomeng5@huawei.com> - 3.30.1-3
 - Package init

--- a/gnome-session.yaml
+++ b/gnome-session.yaml
@ -0,0 +1,4 @@
+version_control: gitlab.gnome
+src_repo: gnome-session
+tag_prefix: GNOME_SESSION_
+seperator: _
Author	SHA1	Message	Date
openeuler-ci-bot	23593183a1	!9 Modify invalid Source From: @starlet-dx Reviewed-by: @small_leek Signed-off-by: @small_leek	2022-11-21 10:56:14 +00:00
starlet-dx	a4bde541da	Modify invalid Source	2022-11-21 17:01:29 +08:00
openeuler-ci-bot	b5aaf33c92	!8 [sync] PR-7: Update to 42.0 From: @openeuler-sync-bot Reviewed-by: @small_leek Signed-off-by: @small_leek	2022-10-19 09:33:22 +00:00
zhang__3125	0a0732d120	Update to 42.0 (cherry picked from commit 62ef86324960e8b055e293d234539bb8a79f5171)	2022-10-19 17:01:00 +08:00
openeuler-ci-bot	3db4e7ec25	!6 Upgrade to 3.38.0 From: @weijin-deng Reviewed-by: @dwl301 Signed-off-by: @dwl301	2021-06-01 14:14:15 +08:00
weijin-deng	bedf1968ac	Upgrade to 3.38.0 Update Version, Release, Source0, Obsoletes Modify patches, update stage 'files'	2021-06-01 13:11:26 +08:00
openeuler-ci-bot	a985b28df1	!5 Add gnome-session yaml file Merge pull request !5 from 雷炬/master	2020-05-07 17:20:38 +08:00
lei_ju	aaeda49434	Increase gnome-session yaml	2020-05-07 16:09:43 +08:00
openeuler-ci-bot	eb78483fd3	!3 modify spec Merge pull request !3 from chenholmes/master	2020-04-03 11:37:03 +08:00
chenholmes	4e4d145191	modify	2020-04-03 11:20:49 +08:00