pool/gnome-session
SHA256
2
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Accepting request 429114 from GNOME:Factory

Browse Source 
New stable release (forwarded request 428804 from Zaitor)

OBS-URL: https://build.opensuse.org/request/show/429114
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/gnome-session?expand=0&rev=163
This commit is contained in:
Dominique Leuenberger 2016-09-21 16:37:55 +00:00 committed by Git OBS Bridge
commit c14d977fa9
7 changed files with 85 additions and 203 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
gnome-session-3.20.2.tar.xz
View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:025f97e0b9f5431890598d6130040e1e7071771cc29e1d29d8e2e7c84d95f6da
size 785952

3
gnome-session-3.22.0.tar.xz Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:ec5c5e133c8ff1c044802eb887f4911183c45ca2d9de4ce29c6f10768ddc8e42
size 777548

27
gnome-session-check-dbus-update-activation-environment.patch
View File

@ -1,27 +0,0 @@
commit 4abdb7925c3bf91e0802e42bab6c90d9a3086b2e
Author: Dominique Leuenberger <dimstar@opensuse.org>
Date: Tue Aug 16 16:15:21 2016 +0200
Do not report errors in absence of dbus-update-activation-environment
dbus-update-activation-environment was introduced with dbus 1.10.4
gnome-session by itself does not depend on any specific version of
dbus at all - but on dbus-glib-1 (DBUS_GLIB_REQUIRED=0.76)
The latest version of dbus-glib (ver 106) requires dbus-1 1.8: it is
thus a valid setup to run not have dbus-update-activation-environment
on the system. Warning the user about its absence is alerting users
for not reason.
diff --git a/gnome-session/gnome-session.in b/gnome-session/gnome-session.in
index 6b2ba18..5f4b303 100644
--- a/gnome-session/gnome-session.in
+++ b/gnome-session/gnome-session.in
@@ -12,6 +12,6 @@ if [ -n "$REGION" ]; then
export LC_PAPER=$REGION
fi
-dbus-update-activation-environment --all ||:
+dbus-update-activation-environment --all >& /dev/null ||:
exec @libexecdir@/gnome-session-binary "$@"

13
gnome-session-ice-auth-for-suid.patch
View File

@ -1,13 +0,0 @@
diff -aur gnome-session-2.23.5.orig/gnome-session/gsm-xsmp-server.c gnome-session-2.23.5/gnome-session/gsm-xsmp-server.c
--- gnome-session-2.23.5.orig/gnome-session/gsm-xsmp-server.c 2008-07-29 20:02:33.000000000 +0200
+++ gnome-session-2.23.5/gnome-session/gsm-xsmp-server.c 2008-07-29 20:24:58.000000000 +0200
@@ -421,6 +421,9 @@
fclose (fp);
ok = TRUE;
+ /* Lets programs auth with the session even if running as another user ID */
+ putenv (g_strconcat ("ICEAUTHORITY=", filename, NULL));
+
cleanup:
IceUnlockAuthFile (filename);
for (i = 0; i < server->priv->num_local_xsmp_sockets; i++) {

139
gnome-session-logging-to-systemd-journal-configurable.patch
View File

@ -1,139 +0,0 @@
From e7675cc3c3c078aedf57e6d386f10c47eb22f0d1 Mon Sep 17 00:00:00 2001
From: Felix Zhang <fezhang@suse.com>
Date: Sun, 17 Jul 2016 17:27:06 +0800
Subject: [PATCH] logging to systemd journal configurable
---
configure.ac | 19 +++++++++++++++++++
gnome-session/gsm-autostart-app.c | 6 ++++--
gnome-session/gsm-manager.c | 8 ++++----
gnome-session/main.c | 4 ++--
4 files changed, 29 insertions(+), 8 deletions(-)
diff --git a/configure.ac b/configure.ac
index 223ee89..f248e9d 100644
--- a/configure.ac
+++ b/configure.ac
@@ -147,6 +147,25 @@ AC_SUBST(SYSTEMD_LIBS)
AM_CONDITIONAL(HAVE_SYSTEMD, [test "$enable_systemd" = "yes"], [Using systemd])
dnl ====================================================================
+dnl systemd journal support
+dnl ====================================================================
+AC_ARG_ENABLE([systemd-journal],
+ AS_HELP_STRING([--enable-systemd-journal], [Send output to systemd journal]),
+ [enable_systemd_journal=$enableval],
+ [enable_systemd_journal=$enable_systemd])
+
+AC_MSG_CHECKING([whether to send the outputs of gnome-session and its child processes to systemd journal])
+
+AC_MSG_RESULT($enable_systemd_journal)
+
+if test x$enable_systemd_journal = xyes ; then
+ if test x$enable_systemd = xno ; then
+ AC_MSG_ERROR([Systemd not found, or it is not enabled])
+ fi
+ AC_DEFINE(ENABLE_SYSTEMD_JOURNAL, 1, [Define if output should be send to systemd journal])
+fi
+
+dnl ====================================================================
dnl Check for ConsoleKit
dnl ====================================================================
diff --git a/gnome-session/gsm-autostart-app.c b/gnome-session/gsm-autostart-app.c
index 1dc3ba3..0837258 100644
--- a/gnome-session/gsm-autostart-app.c
+++ b/gnome-session/gsm-autostart-app.c
@@ -33,7 +33,9 @@
#endif
#ifdef HAVE_SYSTEMD
+#ifdef ENABLE_SYSTEMD_JOURNAL
#include <systemd/sd-journal.h>
+#endif
#include <systemd/sd-daemon.h>
#endif
@@ -1021,7 +1023,7 @@ app_launched (GAppLaunchContext *ctx,
app->priv->startup_id = sn_id;
}
-#ifdef HAVE_SYSTEMD
+#ifdef ENABLE_SYSTEMD_JOURNAL
static void
on_child_setup (GsmAutostartApp *app)
{
@@ -1092,7 +1094,7 @@ autostart_app_start_spawn (GsmAutostartApp *app,
g_app_launch_context_setenv (ctx, "DESKTOP_AUTOSTART_ID", startup_id);
}
-#ifdef HAVE_SYSTEMD
+#ifdef ENABLE_SYSTEMD_JOURNAL
if (sd_booted () > 0) {
child_setup_func = (GSpawnChildSetupFunc) on_child_setup;
child_setup_data = app;
diff --git a/gnome-session/gsm-manager.c b/gnome-session/gsm-manager.c
index a378cd9..175f4f5 100644
--- a/gnome-session/gsm-manager.c
+++ b/gnome-session/gsm-manager.c
@@ -40,7 +40,7 @@
#include "gsm-manager.h"
#include "org.gnome.SessionManager.h"
-#ifdef HAVE_SYSTEMD
+#ifdef ENABLE_SYSTEMD_JOURNAL
#include <systemd/sd-journal.h>
#endif
@@ -271,7 +271,7 @@ on_required_app_failure (GsmManager *manager,
allow_logout = !_log_out_is_locked_down (manager);
}
-#ifdef HAVE_SYSTEMD
+#ifdef ENABLE_SYSTEMD_JOURNAL
sd_journal_send ("MESSAGE_ID=%s", GSM_MANAGER_UNRECOVERABLE_FAILURE_MSGID,
"PRIORITY=%d", 3,
"MESSAGE=Unrecoverable failure in required component %s", app_id,
@@ -301,7 +301,7 @@ on_display_server_failure (GsmManager *manager,
extensions = NULL;
}
-#ifdef HAVE_SYSTEMD
+#ifdef ENABLE_SYSTEMD_JOURNAL
sd_journal_send ("MESSAGE_ID=%s", GSM_MANAGER_UNRECOVERABLE_FAILURE_MSGID,
"PRIORITY=%d", 3,
"MESSAGE=Unrecoverable failure in required component %s", app_id,
@@ -1317,7 +1317,7 @@ start_phase (GsmManager *manager)
do_phase_startup (manager);
break;
case GSM_MANAGER_PHASE_RUNNING:
-#ifdef HAVE_SYSTEMD
+#ifdef ENABLE_SYSTEMD_JOURNAL
sd_journal_send ("MESSAGE_ID=%s", GSM_MANAGER_STARTUP_SUCCEEDED_MSGID,
"PRIORITY=%d", 5,
"MESSAGE=Entering running state",
diff --git a/gnome-session/main.c b/gnome-session/main.c
index bd23824..39757b9 100644
--- a/gnome-session/main.c
+++ b/gnome-session/main.c
@@ -41,7 +41,7 @@
#include "gsm-system.h"
#include "gsm-fail-whale.h"
-#ifdef HAVE_SYSTEMD
+#ifdef ENABLE_SYSTEMD_JOURNAL
#include <systemd/sd-journal.h>
#endif
@@ -329,7 +329,7 @@ main (int argc, char **argv)
* journald picks ups the nicer "gnome-session" as the program
* name instead of whatever shell script GDM happened to use.
*/
-#ifdef HAVE_SYSTEMD
+#ifdef ENABLE_SYSTEMD_JOURNAL
if (!debug) {
int journalfd;
--
2.6.6

64
gnome-session.changes
View File

@ -1,3 +1,67 @@
-------------------------------------------------------------------
Mon Sep 19 19:16:47 UTC 2016 - zaitor@opensuse.org
- Update to version 3.22.0:
+ Small fix for dash users.
+ Updated translations.
-------------------------------------------------------------------
Wed Sep 14 10:05:54 UTC 2016 - dimstar@opensuse.org
- Do not recommend gnome-session-wayland for now. There are still
a couple issues to solve:
+ openQA uses the cirrus video driver (qemu's default) which does
not work with Wayland (we can potentially switch that to qxl
for GNOME tests).
+ YaST still needs extra tricks to start (root has no direct
access to Xwayland.
-------------------------------------------------------------------
Thu Aug 18 21:07:52 UTC 2016 - zaitor@opensuse.org
- Update to version 3.21.90:
+ Do not report errors in the absence of
dbus-update-activation-environment.
+ Support reading kernel gnome.fallback variable on FreeBSD.
+ Allow IM environment variables to be overridden.
+ Updated translations.
- Drop gnome-session-ice-auth-for-suid.patch: Patch decleared
obsolete by author.
- Drop gnome-session-check-dbus-update-activation-environment.patch
and gnome-session-logging-to-systemd-journal-configurable.patch:
Fixed upstream.
- Following the above: Drop autoconf BuildRequires and stop passing
of it.
- Stop passing V=1 to makeinstall, debugging is local.
-------------------------------------------------------------------
Thu Aug 18 13:08:33 UTC 2016 - zaitor@opensuse.org
- Update to version 3.21.4:
+ Export renderer string for llvmpipe.
+ Small heap overflow fix.
+ Compiler warning fixes-
+ Misc doc fixes.
+ Futureproof gettext support.
-------------------------------------------------------------------
Thu Aug 18 13:08:32 UTC 2016 - zaitor@opensuse.org
- Update to version 3.21.3:
+ Updated translations.
-------------------------------------------------------------------
Thu Aug 18 13:08:31 UTC 2016 - zaitor@opensuse.org
- Update to version 3.21.2:
+ Switch back to wayland by default.
+ Update bus activation environment at startup.
+ Updated translations.
- Add pkgconfig(egl) and pkgconfig(glesv2) BuildRequires: New
dependencies.
- Add gnome-session-wayland Recommends to gnome-session main
package, we will now start gdm on wayland by default.
-------------------------------------------------------------------
Thu Aug 18 13:08:30 UTC 2016 - dimstar@opensuse.org

39
gnome-session.spec
View File

@ -17,22 +17,15 @@
Name: gnome-session
Version: 3.20.2
Version: 3.22.0
Release: 0
Summary: Session Tools for the GNOME Desktop
License: GPL-2.0+
Group: System/GUI/GNOME
Url: http://www.gnome.org
Source: http://download.gnome.org/sources/gnome-session/3.20/%{name}-%{version}.tar.xz
Source: http://download.gnome.org/sources/gnome-session/3.22/%{name}-%{version}.tar.xz
Source1: gnome
Source2: gnome.desktop
# PATCH-FIX-SLE gnome-session-ice-auth-for-suid.patch hpj@novell.com -- Carries ICE auth over to other UIDs in this session using an env var.
Patch0: gnome-session-ice-auth-for-suid.patch
# PATCH-FEATURE-UPSTREAM gnome-session-logging-to-systemd-journal-configurable.patch bsc#876685 bgo#768982 fezhang@suse.com -- Add a new configure switch for systemd journal support.
Patch1: gnome-session-logging-to-systemd-journal-configurable.patch
# PATCH-FIX-UPSTREAM gnome-session-check-dbus-update-activation-environment.patch bsc#993342 bgo#768036 fezhang@suse.com -- Check existence of dbus-update-activation-environment before calling it to avoid warnings.
Patch2: gnome-session-check-dbus-update-activation-environment.patch
BuildRequires: autoconf
BuildRequires: fdupes
BuildRequires: intltool
BuildRequires: tcpd-devel
@ -42,8 +35,10 @@ BuildRequires: translation-update-upstream
BuildRequires: update-desktop-files
BuildRequires: xsltproc
BuildRequires: pkgconfig(dbus-glib-1) >= 0.76
BuildRequires: pkgconfig(egl)
BuildRequires: pkgconfig(gio-unix-2.0) >= 2.35.0
BuildRequires: pkgconfig(gl)
BuildRequires: pkgconfig(glesv2)
BuildRequires: pkgconfig(glib-2.0) >= 2.35.0
BuildRequires: pkgconfig(gnome-desktop-3.0) >= 3.9.91
BuildRequires: pkgconfig(gtk+-3.0) >= 2.90.7
@ -61,6 +56,11 @@ BuildRequires: pkgconfig(xtst)
Requires: %{name}-core = %{version}
Requires: %{name}-default-session = %{version}
Recommends: %{name}-lang
# gnome-session-wayland not recommended by default yet: causes various issues:
# qemu's default video mode is 'cirrus', which stays black with GNOME Wayland
# YaST cannot be started without additional tricks
# All together this blocks us from passing openQA
# Recommends: %{name}-wayland
BuildRoot: %{_tmppath}/%{name}-%{version}-build
%description
@ -106,20 +106,19 @@ functional GNOME desktop.
%setup -q
%if !0%{?is_opensuse}
translation-update-upstream
%patch0 -p1
%endif
%patch1 -p1
%patch2 -p1
%build
%if !0%{?is_opensuse}
autoconf
%endif
%configure \
--enable-systemd \
%if !0%{?is_opensuse}
--disable-systemd-journal \
%endif
--disable-gconf
make %{?_smp_mflags} V=1
make %{?_smp_mflags}
%install
make DESTDIR=%{buildroot} install %{?_smp_mflags}
@ -152,10 +151,7 @@ install -m644 %{SOURCE2} %{buildroot}%{_datadir}/xsessions/gnome.desktop
%defattr (-, root, root)
%{_bindir}/gnome
%{_datadir}/xsessions/gnome.desktop
# XOrg session is again default, hence this is disabled for now.
#{_datadir}/xsessions/gnome-xorg.desktop
%{_datadir}/icons/hicolor/*/apps/session-properties*
%{_datadir}/gnome-session/session-properties.ui
%{_datadir}/xsessions/gnome-xorg.desktop
%files default-session
%defattr (-, root, root)
@ -165,9 +161,9 @@ install -m644 %{SOURCE2} %{buildroot}%{_datadir}/xsessions/gnome.desktop
%files wayland
%defattr (-, root, root)
%dir %{_datadir}/wayland-sessions
# XOrg session is again default, hence this is disabled for now.
#{_datadir}/wayland-sessions/gnome.desktop
%{_datadir}/wayland-sessions/gnome-wayland.desktop
%{_datadir}/wayland-sessions/gnome.desktop
# Disabled as wayland is now the default session again.
#{_datadir}/wayland-sessions/gnome-wayland.desktop
%files core
%defattr (-, root, root)
@ -185,7 +181,8 @@ install -m644 %{SOURCE2} %{buildroot}%{_datadir}/xsessions/gnome.desktop
%{_libexecdir}/gnome-session-binary
# Helper for the session definitions, to know if hardware is accelerated
%{_libexecdir}/gnome-session-check-accelerated
%{_libexecdir}/gnome-session-check-accelerated-helper
%{_libexecdir}/gnome-session-check-accelerated-gl-helper
%{_libexecdir}/gnome-session-check-accelerated-gles-helper
%{_libexecdir}/gnome-session-failed
%{_datadir}/gnome-session/hardware-compatibility