packages/gnome-session
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

!6 Upgrade to 3.38.0

Browse Source 
From: @weijin-deng
Reviewed-by: @dwl301
Signed-off-by: @dwl301
This commit is contained in:
openeuler-ci-bot 2021-06-01 14:14:15 +08:00 committed by Gitee
commit 3db4e7ec25
5 changed files with 46 additions and 52 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
0001-Add-support-for-new-ConfirmedRebootToBootOptions-sig.patch
View File

@ -22,48 +22,43 @@ this for the distro's chosen bootloader. I will start a discussion on
systemd-devel to come up with a distro / bootloader agnostic interface systemd-devel to come up with a distro / bootloader agnostic interface
for this. 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 diff --git a/gnome-session/gsm-manager.c b/gnome-session/gsm-manager.c
index 6eeea4a6..e0f190a1 100644 index 6839a02..a915785 100644
--- a/gnome-session/gsm-manager.c --- a/gnome-session/gsm-manager.c
+++ b/gnome-session/gsm-manager.c +++ b/gnome-session/gsm-manager.c
@@ -109,6 +109,7 @@ typedef enum @@ -117,6 +117,7 @@ typedef enum
GSM_MANAGER_LOGOUT_NONE, GSM_MANAGER_LOGOUT_NONE,
GSM_MANAGER_LOGOUT_LOGOUT, GSM_MANAGER_LOGOUT_LOGOUT,
GSM_MANAGER_LOGOUT_REBOOT, GSM_MANAGER_LOGOUT_REBOOT,
+ GSM_MANAGER_LOGOUT_REBOOT_TO_BOOT_OPTIONS, + GSM_MANAGER_LOGOUT_REBOOT_TO_BOOT_OPTIONS,
GSM_MANAGER_LOGOUT_REBOOT_INTERACT, GSM_MANAGER_LOGOUT_REBOOT_INTERACT,
GSM_MANAGER_LOGOUT_SHUTDOWN, GSM_MANAGER_LOGOUT_SHUTDOWN,
GSM_MANAGER_LOGOUT_SHUTDOWN_INTERACT, GSM_MANAGER_LOGOUT_SHUTDOWN_INTERACT,
@@ -165,6 +166,7 @@ struct GsmManagerPrivate @@ -176,6 +177,7 @@ struct GsmManagerPrivate
guint shell_end_session_dialog_confirmed_logout_id; guint shell_end_session_dialog_confirmed_logout_id;
guint shell_end_session_dialog_confirmed_shutdown_id; guint shell_end_session_dialog_confirmed_shutdown_id;
guint shell_end_session_dialog_confirmed_reboot_id; guint shell_end_session_dialog_confirmed_reboot_id;
+ guint shell_end_session_dialog_confirmed_reboot_to_boot_options_id; + guint shell_end_session_dialog_confirmed_reboot_to_boot_options_id;
}; };
enum { enum {
@@ -478,6 +480,7 @@ gsm_manager_quit (GsmManager *manager) @@ -490,6 +492,7 @@ gsm_manager_quit (GsmManager *manager)
gsm_quit (); gsm_quit ();
break; break;
case GSM_MANAGER_LOGOUT_REBOOT: case GSM_MANAGER_LOGOUT_REBOOT:
+ case GSM_MANAGER_LOGOUT_REBOOT_TO_BOOT_OPTIONS: + case GSM_MANAGER_LOGOUT_REBOOT_TO_BOOT_OPTIONS:
case GSM_MANAGER_LOGOUT_REBOOT_INTERACT: case GSM_MANAGER_LOGOUT_REBOOT_INTERACT:
gsm_system_complete_shutdown (manager->priv->system); gsm_system_complete_shutdown (manager->priv->system);
break; gsm_quit ();
@@ -1138,6 +1141,7 @@ end_session_or_show_shell_dialog (GsmManager *manager) @@ -1161,6 +1164,7 @@ end_session_or_show_shell_dialog (GsmManager *manager)
type = GSM_SHELL_END_SESSION_DIALOG_TYPE_LOGOUT; type = GSM_SHELL_END_SESSION_DIALOG_TYPE_LOGOUT;
break; break;
case GSM_MANAGER_LOGOUT_REBOOT: case GSM_MANAGER_LOGOUT_REBOOT:
+ case GSM_MANAGER_LOGOUT_REBOOT_TO_BOOT_OPTIONS: + case GSM_MANAGER_LOGOUT_REBOOT_TO_BOOT_OPTIONS:
case GSM_MANAGER_LOGOUT_REBOOT_INTERACT: case GSM_MANAGER_LOGOUT_REBOOT_INTERACT:
type = GSM_SHELL_END_SESSION_DIALOG_TYPE_RESTART; type = GSM_SHELL_END_SESSION_DIALOG_TYPE_RESTART;
break; break;
@@ -3324,6 +3328,12 @@ disconnect_shell_dialog_signals (GsmManager *manager) @@ -3455,6 +3459,12 @@ disconnect_shell_dialog_signals (GsmManager *manager)
manager->priv->shell_end_session_dialog_confirmed_reboot_id = 0; manager->priv->shell_end_session_dialog_confirmed_reboot_id = 0;
} }
@ -76,7 +71,7 @@ index 6eeea4a6..e0f190a1 100644
if (manager->priv->shell_end_session_dialog_open_failed_id != 0) { if (manager->priv->shell_end_session_dialog_open_failed_id != 0) {
g_signal_handler_disconnect (manager->priv->shell, g_signal_handler_disconnect (manager->priv->shell,
manager->priv->shell_end_session_dialog_open_failed_id); manager->priv->shell_end_session_dialog_open_failed_id);
@@ -3386,6 +3396,14 @@ on_shell_end_session_dialog_confirmed_reboot (GsmShell *shell, @@ -3517,6 +3527,14 @@ on_shell_end_session_dialog_confirmed_reboot (GsmShell *shell,
disconnect_shell_dialog_signals (manager); disconnect_shell_dialog_signals (manager);
} }
@ -91,7 +86,7 @@ index 6eeea4a6..e0f190a1 100644
static void static void
connect_shell_dialog_signals (GsmManager *manager) connect_shell_dialog_signals (GsmManager *manager)
{ {
@@ -3421,6 +3439,12 @@ connect_shell_dialog_signals (GsmManager *manager) @@ -3552,6 +3570,12 @@ connect_shell_dialog_signals (GsmManager *manager)
"end-session-dialog-confirmed-reboot", "end-session-dialog-confirmed-reboot",
G_CALLBACK (on_shell_end_session_dialog_confirmed_reboot), G_CALLBACK (on_shell_end_session_dialog_confirmed_reboot),
manager); manager);
@ -104,7 +99,7 @@ index 6eeea4a6..e0f190a1 100644
} }
static void static void
@@ -3694,6 +3718,10 @@ do_query_end_session_exit (GsmManager *manager) @@ -3825,6 +3849,10 @@ do_query_end_session_exit (GsmManager *manager)
case GSM_MANAGER_LOGOUT_REBOOT_INTERACT: case GSM_MANAGER_LOGOUT_REBOOT_INTERACT:
reboot = TRUE; reboot = TRUE;
break; break;
@ -116,14 +111,14 @@ index 6eeea4a6..e0f190a1 100644
case GSM_MANAGER_LOGOUT_SHUTDOWN_INTERACT: case GSM_MANAGER_LOGOUT_SHUTDOWN_INTERACT:
shutdown = TRUE; shutdown = TRUE;
diff --git a/gnome-session/gsm-shell.c b/gnome-session/gsm-shell.c diff --git a/gnome-session/gsm-shell.c b/gnome-session/gsm-shell.c
index 04cfa2f5..d727232d 100644 index 04cfa2f..ac2a157 100644
--- a/gnome-session/gsm-shell.c --- a/gnome-session/gsm-shell.c
+++ b/gnome-session/gsm-shell.c +++ b/gnome-session/gsm-shell.c
@@ -69,6 +69,7 @@ enum { @@ -69,6 +69,7 @@ enum {
END_SESSION_DIALOG_CONFIRMED_LOGOUT, END_SESSION_DIALOG_CONFIRMED_LOGOUT,
END_SESSION_DIALOG_CONFIRMED_SHUTDOWN, END_SESSION_DIALOG_CONFIRMED_SHUTDOWN,
END_SESSION_DIALOG_CONFIRMED_REBOOT, END_SESSION_DIALOG_CONFIRMED_REBOOT,
+ END_SESSION_DIALOG_CONFIRMED_REBOOT_TO_BOOT_OPTIONS, + END_SESSION_DIALOG_CONFIRMED_REBOOT_TO_BOOT_OPTIONS,
NUMBER_OF_SIGNALS NUMBER_OF_SIGNALS
}; };
@ -146,12 +141,12 @@ index 04cfa2f5..d727232d 100644
{ "Canceled", END_SESSION_DIALOG_CANCELED }, { "Canceled", END_SESSION_DIALOG_CANCELED },
{ "ConfirmedLogout", END_SESSION_DIALOG_CONFIRMED_LOGOUT }, { "ConfirmedLogout", END_SESSION_DIALOG_CONFIRMED_LOGOUT },
{ "ConfirmedReboot", END_SESSION_DIALOG_CONFIRMED_REBOOT }, { "ConfirmedReboot", END_SESSION_DIALOG_CONFIRMED_REBOOT },
+ { "ConfirmedRebootToBootOptions", END_SESSION_DIALOG_CONFIRMED_REBOOT_TO_BOOT_OPTIONS }, + { "ConfirmedRebootToBootOptions", END_SESSION_DIALOG_CONFIRMED_REBOOT_TO_BOOT_OPTIONS },
{ "ConfirmedShutdown", END_SESSION_DIALOG_CONFIRMED_SHUTDOWN }, { "ConfirmedShutdown", END_SESSION_DIALOG_CONFIRMED_SHUTDOWN },
{ NULL, -1 } { NULL, -1 }
}; };
diff --git a/gnome-session/gsm-shell.h b/gnome-session/gsm-shell.h diff --git a/gnome-session/gsm-shell.h b/gnome-session/gsm-shell.h
index e236493a..b1cdd457 100644 index e236493..b1cdd45 100644
--- a/gnome-session/gsm-shell.h --- a/gnome-session/gsm-shell.h
+++ b/gnome-session/gsm-shell.h +++ b/gnome-session/gsm-shell.h
@@ -64,9 +64,10 @@ struct _GsmShellClass @@ -64,9 +64,10 @@ struct _GsmShellClass
@ -168,6 +163,3 @@ index e236493a..b1cdd457 100644
}; };
--
2.19.0

37
0001-check-accelerated-gles-Use-eglGetPlatformDisplay-EXT.patch
View File

@ -8,14 +8,12 @@ can't guess correctly. Be explicit.
Signed-off-by: Adam Jackson <ajax@redhat.com> Signed-off-by: Adam Jackson <ajax@redhat.com>
--- ---
.../gnome-session-check-accelerated-gles-helper.c | 36 +++++++++++++++++++++-
1 file changed, 35 insertions(+), 1 deletion(-)
diff --git a/tools/gnome-session-check-accelerated-gles-helper.c b/tools/gnome-session-check-accelerated-gles-helper.c diff --git a/tools/gnome-session-check-accelerated-gles-helper.c b/tools/gnome-session-check-accelerated-gles-helper.c
index 2a38d9e..472d1ad 100644 index 6a4463d..e05d49f 100644
--- a/tools/gnome-session-check-accelerated-gles-helper.c --- a/tools/gnome-session-check-accelerated-gles-helper.c
+++ b/tools/gnome-session-check-accelerated-gles-helper.c +++ b/tools/gnome-session-check-accelerated-gles-helper.c
@@ -34,11 +34,43 @@ @@ -38,11 +38,43 @@
#include <GLES2/gl2.h> #include <GLES2/gl2.h>
#include <GLES2/gl2ext.h> #include <GLES2/gl2ext.h>
#include <EGL/egl.h> #include <EGL/egl.h>
@ -32,25 +30,25 @@ index 2a38d9e..472d1ad 100644
+ const char *client_exts = eglQueryString (NULL, EGL_EXTENSIONS); + const char *client_exts = eglQueryString (NULL, EGL_EXTENSIONS);
+ +
+ if (g_strstr_len (client_exts, -1, "EGL_KHR_platform_base")) { + if (g_strstr_len (client_exts, -1, "EGL_KHR_platform_base")) {
+ PFNEGLGETPLATFORMDISPLAYEXTPROC get_platform_display = + PFNEGLGETPLATFORMDISPLAYEXTPROC get_platform_display =
+ (void *) eglGetProcAddress ("eglGetPlatformDisplay"); + (void *) eglGetProcAddress ("eglGetPlatformDisplay");
+ +
+ if (get_platform_display) + if (get_platform_display)
+ dpy = get_platform_display (EGL_PLATFORM_X11_KHR, native, NULL); + dpy = get_platform_display (EGL_PLATFORM_X11_KHR, native, NULL);
+ +
+ if (dpy) + if (dpy)
+ return dpy; + return dpy;
+ } + }
+ +
+ if (g_strstr_len (client_exts, -1, "EGL_EXT_platform_base")) { + if (g_strstr_len (client_exts, -1, "EGL_EXT_platform_base")) {
+ PFNEGLGETPLATFORMDISPLAYEXTPROC get_platform_display = + PFNEGLGETPLATFORMDISPLAYEXTPROC get_platform_display =
+ (void *) eglGetProcAddress ("eglGetPlatformDisplayEXT"); + (void *) eglGetProcAddress ("eglGetPlatformDisplayEXT");
+ +
+ if (get_platform_display) + if (get_platform_display)
+ dpy = get_platform_display (EGL_PLATFORM_X11_KHR, native, NULL); + dpy = get_platform_display (EGL_PLATFORM_X11_KHR, native, NULL);
+ +
+ if (dpy) + if (dpy)
+ return dpy; + return dpy;
+ } + }
+ +
+ return eglGetDisplay ((EGLNativeDisplayType) native); + return eglGetDisplay ((EGLNativeDisplayType) native);
@ -59,17 +57,14 @@ index 2a38d9e..472d1ad 100644
static char * static char *
get_gles_renderer (void) get_gles_renderer (void)
{ {
@@ -67,7 +99,9 @@ get_gles_renderer (void) @@ -71,7 +103,9 @@ get_gles_renderer (void)
gdk_error_trap_push (); gdk_error_trap_push ();
display = GDK_DISPLAY_XDISPLAY (gdk_display_get_default ()); display = GDK_DISPLAY_XDISPLAY (gdk_display_get_default ());
- egl_dpy = eglGetDisplay (display); - egl_dpy = eglGetDisplay (display);
+ +
+ egl_dpy = get_display (display); + egl_dpy = get_display (display);
+ +
if (!egl_dpy) { if (!egl_dpy) {
g_warning ("eglGetDisplay() failed"); g_warning ("eglGetDisplay() failed");
goto out; goto out;
--
2.9.3

BIN
gnome-session-3.30.1.tar.xz
View File

Binary file not shown.

BIN
gnome-session-3.38.0.tar.xz Normal file
View File

Binary file not shown.

17
gnome-session.spec
View File

@ -1,10 +1,10 @@
Name: gnome-session Name: gnome-session
Summary: Session Management Tools for the GNOME Desktop Summary: Session Management Tools for the GNOME Desktop
Version: 3.30.1 Version: 3.38.0
Release: 4 Release: 1
License: GPLv2+ License: GPLv2+
URL: http://www.gnome.org URL: http://www.gnome.org
Source0: http://download.gnome.org/sources/%{name}/3.30/%{name}-%{version}.tar.xz Source0: http://download.gnome.org/sources/%{name}/3.38/%{name}-%{version}.tar.xz
Patch0001: 0001-check-accelerated-gles-Use-eglGetPlatformDisplay-EXT.patch Patch0001: 0001-check-accelerated-gles-Use-eglGetPlatformDisplay-EXT.patch
Patch0002: 0001-Add-support-for-new-ConfirmedRebootToBootOptions-sig.patch Patch0002: 0001-Add-support-for-new-ConfirmedRebootToBootOptions-sig.patch
@ -20,9 +20,9 @@ Requires: dconf dbus-x11 system-logos control-center-filesystem gnome-shell
Requires: xorg-x11-server-Xorg%{?_isa} Requires: xorg-x11-server-Xorg%{?_isa}
Requires: xorg-x11-server-Xwayland%{?_isa} Requires: xorg-x11-server-Xwayland%{?_isa}
Obsoletes: %{name}-xsession = %{version}-%{release} Obsoletes: %{name}-xsession < %{version}-%{release}
Provides: %{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} Provides: %{name}-wayland-session = %{version}-%{release}
%description %description
@ -54,6 +54,8 @@ sed -i 's/idm[0-9]\{5,32\}\"/idm123456789123456\"/g' $(find -name %{name}.html)
%{_datadir}/GConf/gsettings/%{name}.convert %{_datadir}/GConf/gsettings/%{name}.convert
%{_datadir}/xsessions/* %{_datadir}/xsessions/*
%{_datadir}/wayland-sessions/* %{_datadir}/wayland-sessions/*
%{_userunitdir}/gnome-session*
%{_userunitdir}/gnome-launched-.scope.d/
%files help %files help
%doc AUTHORS NEWS README %doc AUTHORS NEWS README
@ -64,6 +66,11 @@ sed -i 's/idm[0-9]\{5,32\}\"/idm123456789123456\"/g' $(find -name %{name}.html)
%postun -p /sbin/ldconfig %postun -p /sbin/ldconfig
%changelog %changelog
* 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 * Fri Apr 3 2020 chenli <chenli147@huawei.com> - 3.30.1-4
- modify spec - modify spec