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

Accepting request 586726 from GNOME:Factory

Browse Source 
(forwarded request 586710 from dimstar)

OBS-URL: https://build.opensuse.org/request/show/586726
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/gnome-session?expand=0&rev=178
This commit is contained in:
Dominique Leuenberger 2018-03-14 18:32:46 +00:00 committed by Git OBS Bridge
commit b50e493d7f
7 changed files with 126 additions and 405 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

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

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

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

13
gnome-session-better-handle-empty-xdg_session_type.patch Normal file
View File

@ -0,0 +1,13 @@
Index: gnome-session-3.28.0/tools/gnome-session-check-accelerated.c
===================================================================
--- gnome-session-3.28.0.orig/tools/gnome-session-check-accelerated.c
+++ gnome-session-3.28.0/tools/gnome-session-check-accelerated.c
@@ -147,7 +147,7 @@ main (int argc, char **argv)
* Also make sure that we don't read cached information about the first GPU
* when requesting information about the second.
*/
- if (is_discrete_gpu_check () || g_strcmp0 (g_getenv ("XDG_SESSION_TYPE"), "x11") != 0) {
+ if (is_discrete_gpu_check () || g_strcmp0 (g_getenv ("XDG_SESSION_TYPE"), "wayland") == 0) {
renderer_string = get_gtk_gles_renderer ();
if (renderer_string) {
g_print ("%s", renderer_string);

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

@ -1,136 +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(-)
Index: gnome-session-3.26.0/configure.ac
===================================================================
--- gnome-session-3.26.0.orig/configure.ac 2017-09-12 16:06:00.000000000 +0200
+++ gnome-session-3.26.0/configure.ac 2017-09-22 13:53:17.805764740 +0200
@@ -148,6 +148,25 @@
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 ====================================================================
Index: gnome-session-3.26.0/gnome-session/gsm-autostart-app.c
===================================================================
--- gnome-session-3.26.0.orig/gnome-session/gsm-autostart-app.c 2017-05-30 18:57:54.000000000 +0200
+++ gnome-session-3.26.0/gnome-session/gsm-autostart-app.c 2017-09-22 13:53:17.805764740 +0200
@@ -33,7 +33,9 @@
#endif
#ifdef HAVE_SYSTEMD
+#ifdef ENABLE_SYSTEMD_JOURNAL
#include <systemd/sd-journal.h>
+#endif
#include <systemd/sd-daemon.h>
#endif
@@ -1027,7 +1029,7 @@
app->priv->startup_id = sn_id;
}
-#ifdef HAVE_SYSTEMD
+#ifdef ENABLE_SYSTEMD_JOURNAL
static void
on_child_setup (GsmAutostartApp *app)
{
@@ -1098,7 +1100,7 @@
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;
Index: gnome-session-3.26.0/gnome-session/gsm-manager.c
===================================================================
--- gnome-session-3.26.0.orig/gnome-session/gsm-manager.c 2017-07-19 17:07:22.000000000 +0200
+++ gnome-session-3.26.0/gnome-session/gsm-manager.c 2017-09-22 13:53:17.805764740 +0200
@@ -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 @@
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 @@
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,
@@ -1355,7 +1355,7 @@
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",
Index: gnome-session-3.26.0/gnome-session/main.c
===================================================================
--- gnome-session-3.26.0.orig/gnome-session/main.c 2017-06-29 16:24:18.000000000 +0200
+++ gnome-session-3.26.0/gnome-session/main.c 2017-09-22 13:53:17.805764740 +0200
@@ -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 @@
* 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;

251
gnome-session-nb-translation.patch
View File

@ -1,251 +0,0 @@
From 987a1f3d2f4985df6393360091b5519bcf8f88a3 Mon Sep 17 00:00:00 2001
From: Kjartan Maraas <kmaraas@gnome.org>
Date: Mon, 6 Nov 2017 12:58:39 +0100
Subject: =?UTF-8?q?Updated=20Norwegian=20bokm=C3=A5l=20translation.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
po/nb.po | 108 +++++++++++++++++++++------------------------------------------
1 file changed, 36 insertions(+), 72 deletions(-)
diff --git a/po/nb.po b/po/nb.po
index afad648..16aa63f 100644
--- a/po/nb.po
+++ b/po/nb.po
@@ -1,14 +1,14 @@
# Norwegian bokmål translation of gnome-session.
# Copyright (C) 1998-2004 Free Software Foundation, Inc.
-# Kjartan Maraas <kmaraas@gnome.org>, 1998-2015.
+# Kjartan Maraas <kmaraas@gnome.org>, 1998-2017.
# Torstein Adolf Winterseth <kvikende@fsfe.org>, 2010.
#
msgid ""
msgstr ""
-"Project-Id-Version: gnome-session 3.19.x\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-11-15 19:57+0100\n"
-"PO-Revision-Date: 2015-11-15 19:59+0100\n"
+"Project-Id-Version: gnome-session 3.26.x\n"
+"Report-Msgid-Bugs-To: https://bugzilla.gnome.org/enter_bug.cgi?product=gnome-session&keywords=I18N+L10N&component=general\n"
+"POT-Creation-Date: 2017-09-18 14:31+0000\n"
+"PO-Revision-Date: 2017-11-06 12:58+0100\n"
"Last-Translator: Kjartan Maraas <kmaraas@gnome.org>\n"
"Language-Team: Norwegian bokmål <i18n-nb@lister.ping.uio.no>\n"
"Language: nb\n"
@@ -65,49 +65,13 @@ msgstr "E_ndre navn på økt"
msgid "_Continue"
msgstr "_Fortsett"
-#: ../data/session-properties.ui.h:1
-msgid "Additional startup _programs:"
-msgstr "Flere oppstarts_programmer:"
-
-#: ../data/session-properties.ui.h:2
-msgid "Startup Programs"
-msgstr "Oppstartsprogrammer"
-
-#: ../data/session-properties.ui.h:3
-msgid "_Automatically remember running applications when logging out"
-msgstr "Husk kjørende programmer _automatisk når du logger ut"
-
-#: ../data/session-properties.ui.h:4
-msgid "_Remember Currently Running Applications"
-msgstr "Husk kjø_rende programmer"
-
-#: ../data/session-properties.ui.h:5
-msgid "Options"
-msgstr "Alternativer"
-
-#: ../data/session-properties.ui.h:6
-msgid "Browse…"
-msgstr "Bla gjennom …"
-
-#: ../data/session-properties.ui.h:7
-msgid "Comm_ent:"
-msgstr "Komm_entar:"
-
-#: ../data/session-properties.ui.h:8
-msgid "Co_mmand:"
-msgstr "Ko_mmando:"
-
-#: ../data/session-properties.ui.h:9
-msgid "_Name:"
-msgstr "_Navn:"
-
#: ../gnome-session/gsm-fail-whale-dialog.c:313
msgid "Oh no! Something has gone wrong."
msgstr "Å nei! Noe har gått galt."
#: ../gnome-session/gsm-fail-whale-dialog.c:320
msgid ""
-"A problem has occurred and the system can't recover. Please contact a system "
+"A problem has occurred and the system can’t recover. Please contact a system "
"administrator"
msgstr ""
"Et problem har oppstått og systemet kan ikke gjenopprettes. Vennligst "
@@ -115,7 +79,7 @@ msgstr ""
#: ../gnome-session/gsm-fail-whale-dialog.c:322
msgid ""
-"A problem has occurred and the system can't recover. All extensions have "
+"A problem has occurred and the system can’t recover. All extensions have "
"been disabled as a precaution."
msgstr ""
"Et problem har oppstått og systemet kan ikke gjenopprettes. Alle utvidelser "
@@ -123,7 +87,7 @@ msgstr ""
#: ../gnome-session/gsm-fail-whale-dialog.c:324
msgid ""
-"A problem has occurred and the system can't recover.\n"
+"A problem has occurred and the system can’t recover.\n"
"Please log out and try again."
msgstr ""
"Et problem har oppstått og systemet kan ikke gjenopprettes.\n"
@@ -133,7 +97,7 @@ msgstr ""
msgid "_Log Out"
msgstr "_Logg ut"
-#: ../gnome-session/gsm-fail-whale-dialog.c:361 ../gnome-session/main.c:280
+#: ../gnome-session/gsm-fail-whale-dialog.c:361 ../gnome-session/main.c:281
msgid "Enable debugging code"
msgstr "Aktiver feilsøkingskode"
@@ -145,11 +109,11 @@ msgstr "Tillat utlogging"
msgid "Show extension warning"
msgstr "Vis advarsel om utvidelser"
-#: ../gnome-session/gsm-manager.c:1256 ../gnome-session/gsm-manager.c:1902
+#: ../gnome-session/gsm-manager.c:1266 ../gnome-session/gsm-manager.c:1919
msgid "Not responding"
msgstr "Svarer ikke"
-#: ../gnome-session/gsm-util.c:381
+#: ../gnome-session/gsm-util.c:382
msgid "_Log out"
msgstr "_Logg ut"
@@ -176,47 +140,47 @@ msgstr "Nekter ny klient tilgang fordi økten er i ferd med å avsluttes\n"
msgid "Could not create ICE listening socket: %s"
msgstr "Kunne ikke opprette plugg for ICE-lytting: %s"
-#: ../gnome-session/main.c:278
+#: ../gnome-session/main.c:279
msgid "Override standard autostart directories"
msgstr "Overstyr forvalgte kataloger for autostart"
-#: ../gnome-session/main.c:278
+#: ../gnome-session/main.c:279
msgid "AUTOSTART_DIR"
msgstr "AUTOSTART_DIR"
-#: ../gnome-session/main.c:279
+#: ../gnome-session/main.c:280
msgid "Session to use"
msgstr "Økt som skal brukes"
-#: ../gnome-session/main.c:279
+#: ../gnome-session/main.c:280
msgid "SESSION_NAME"
msgstr "SESSION_NAME"
-#: ../gnome-session/main.c:281
+#: ../gnome-session/main.c:282
msgid "Do not load user-specified applications"
msgstr "Ikke last brukerdefinerte programmer"
-#: ../gnome-session/main.c:282
+#: ../gnome-session/main.c:283
msgid "Version of this application"
msgstr "Versjon av dette programmet"
#. Translators: the 'fail whale' is the black dialog we show when something goes seriously wrong
-#: ../gnome-session/main.c:284
+#: ../gnome-session/main.c:285
msgid "Show the fail whale dialog for testing"
msgstr "Vis feildialog for testing"
-#: ../gnome-session/main.c:285
+#: ../gnome-session/main.c:286
msgid "Disable hardware acceleration check"
msgstr "Slå av sjekk for maskinvareaksellerasjon"
-#: ../gnome-session/main.c:307
-msgid " - the GNOME session manager"
-msgstr "- GNOME økthåndterer"
+#: ../gnome-session/main.c:318
+msgid " — the GNOME session manager"
+msgstr "– GNOME økthåndterer"
#: ../tools/gnome-session-inhibit.c:108
#, c-format
msgid ""
-"%s [OPTION...] COMMAND\n"
+"%s [OPTION…] COMMAND\n"
"\n"
"Execute COMMAND while inhibiting some session functionality.\n"
"\n"
@@ -264,46 +228,46 @@ msgstr "Økt %d"
#: ../tools/gnome-session-selector.c:107
msgid ""
-"Session names are not allowed to start with ‘.’ or contain ‘/’ characters"
-msgstr "Øktnavn kan ikke starte med «.» eller inneholde «/»-tegn"
+"Session names are not allowed to start with “.” or contain “/” characters"
+msgstr "Øktnavn kan ikke starte med «.» eller inneholde tegnet «/»"
#: ../tools/gnome-session-selector.c:111
-msgid "Session names are not allowed to start with ‘.’"
+msgid "Session names are not allowed to start with “.”"
msgstr "Øktnavn kan ikke starte med «.»"
#: ../tools/gnome-session-selector.c:115
-msgid "Session names are not allowed to contain ‘/’ characters"
+msgid "Session names are not allowed to contain “/” characters"
msgstr "Øktnavn kan ikke inneholde «/»-tegn"
#: ../tools/gnome-session-selector.c:123
#, c-format
-msgid "A session named ‘%s’ already exists"
+msgid "A session named “%s” already exists"
msgstr "En økt med navn «%s» eksisterer allerede"
-#: ../tools/gnome-session-quit.c:49
+#: ../tools/gnome-session-quit.c:50
msgid "Log out"
msgstr "Logg ut"
-#: ../tools/gnome-session-quit.c:50
+#: ../tools/gnome-session-quit.c:51
msgid "Power off"
msgstr "Slå av"
-#: ../tools/gnome-session-quit.c:51
+#: ../tools/gnome-session-quit.c:52
msgid "Reboot"
msgstr "Start på nytt"
-#: ../tools/gnome-session-quit.c:52
+#: ../tools/gnome-session-quit.c:53
msgid "Ignoring any existing inhibitors"
msgstr "Overser eventuelle hindringer"
-#: ../tools/gnome-session-quit.c:53
-msgid "Don't prompt for user confirmation"
+#: ../tools/gnome-session-quit.c:54
+msgid "Don’t prompt for user confirmation"
msgstr "Ikke spør etter bekreftelse fra bruker"
-#: ../tools/gnome-session-quit.c:87 ../tools/gnome-session-quit.c:101
+#: ../tools/gnome-session-quit.c:88 ../tools/gnome-session-quit.c:102
msgid "Could not connect to the session manager"
msgstr "Kunne ikke koble til økthåndterer"
-#: ../tools/gnome-session-quit.c:196
+#: ../tools/gnome-session-quit.c:198
msgid "Program called with conflicting options"
msgstr "Programmet ble kalt med motstridende alternativer"
--
cgit v0.12

86
gnome-session.changes
View File

@ -1,3 +1,89 @@
-------------------------------------------------------------------
Wed Mar 14 00:41:35 UTC 2018 - yfjiang@suse.com
- Add gnome-session-better-handle-empty-xdg_session_type.patch
The gnome-session-check-accelerated currently detects wayland
by checking if XDG_SESSION_TYPE != "x11". More appropriate test
would be XDG_SESSION_TYPE == "wayland".
This is especially important for cases when XDG_SESSION_TYPE is
not set to anything at all - in such case it is more likely
that the intention is to run gnome inside X11 (bsc#1084756,
bgo#794256).
The analysis and the patch is fully provided by msrb@suse.com.
-------------------------------------------------------------------
Tue Mar 13 14:28:25 UTC 2018 - dimstar@opensuse.org
- Update to version 3.28.0:
+ Updated translations.
-------------------------------------------------------------------
Wed Mar 7 16:43:13 UTC 2018 - dimstar@opensuse.org
- Update to version 3.27.92:
+ Updated translations.
-------------------------------------------------------------------
Wed Feb 28 16:29:33 UTC 2018 - dimstar@opensuse.org
- Modernize spec-file by calling spec-cleaner
-------------------------------------------------------------------
Tue Feb 27 03:27:51 UTC 2018 - dimstar@opensuse.org
- Update to version 3.27.91:
+ Updated translations.
-------------------------------------------------------------------
Tue Feb 27 03:27:50 UTC 2018 - dimstar@opensuse.org
- Update to version 3.27.90.1:
+ Add back deprecated environment variable to fix GNOME on
systems that have proxies set up.
-------------------------------------------------------------------
Tue Feb 27 03:27:50 UTC 2018 - dimstar@opensuse.org
- Update to version 3.27.90:
+ Session saving fix.
+ Remove dropped g-s-d plugin.
+ Updated translations.
-------------------------------------------------------------------
Tue Feb 27 03:27:04 UTC 2018 - dimstar@opensuse.org
- Update to version 3.27.4:
+ GLES fixes.
+ Make systemd journal configurable again.
+ switch from intltool to gettext.
+ Fix wayland session file.
+ Updated translations.
- Drop intltool BuildRequires: no longer needed after the switch to
gettext.
- Drop gnome-session-logging-to-systemd-journal-configurable.patch:
fixed upstream.
-------------------------------------------------------------------
Tue Feb 27 03:27:03 UTC 2018 - dimstar@opensuse.org
- Update to version 3.27.3:
+ Drop deprecated bits.
+ Port to meson.
+ Fix crash at shutdown.
+ Fix session saving.
+ BSD fixes.
+ Updated translations.
- Add meson BuildRequires and replace configure/make/make_install
with the respective meson/meson_build/meson_install macros.
- Port gnome-session-logging-to-systemd-journal-configurable.patch
to support the meson build system.
- Add docbook-xsl-stylesheets BuildRequires: new dependency to
generete the manpages.
- Drop gnome-session-nb-translation.patch: fixed upstream.
-------------------------------------------------------------------
Mon Feb 26 16:44:00 CET 2018 - ro@suse.de

39
gnome-session.spec
View File

@ -17,21 +17,20 @@
Name: gnome-session
Version: 3.26.1
Version: 3.28.0
Release: 0
Summary: Session Tools for the GNOME Desktop
License: GPL-2.0-or-later
Group: System/GUI/GNOME
Url: http://www.gnome.org
Source: http://download.gnome.org/sources/gnome-session/3.26/%{name}-%{version}.tar.xz
Source: http://download.gnome.org/sources/gnome-session/3.28/%{name}-%{version}.tar.xz
Source1: gnome
Source2: gnome.desktop
# 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.
Patch0: gnome-session-logging-to-systemd-journal-configurable.patch
# PATCH-FIX-UPSTREAM gnome-session-nb-translation.patch zaitor@opensuse.org -- Update Norwegian bokmål translations
Patch1: gnome-session-nb-translation.patch
# PATCH-FIX-UPSTREAM gnome-session-better-handle-empty-xdg_session_type.patch bsc#1084756 bgo#794256 yfjiang@suse.com -- solution provided by msrb@suse.com using a more reasonable way to handle gpu acceleration check
Patch0: gnome-session-better-handle-empty-xdg_session_type.patch
BuildRequires: docbook-xsl-stylesheets
BuildRequires: fdupes
BuildRequires: intltool
BuildRequires: meson
BuildRequires: pkgconfig
BuildRequires: tcpd-devel
BuildRequires: update-desktop-files
@ -110,22 +109,31 @@ functional GNOME desktop.
%prep
%setup -q
%patch0 -p1
%patch1 -p1
%if !0%{?is_opensuse}
translation-update-upstream
%endif
%build
%configure \
--enable-systemd \
%if !0%{?is_opensuse}
--disable-systemd-journal \
%meson \
-D docbook=false \
-D systemd=true \
%if !0%{is_opensuse}
-D systemd_journal=false \
%endif
--disable-gconf
make %{?_smp_mflags}
%{nil}
%meson_build
%install
%make_install
%meson_install
# Copy /usr/share/xsessions to /usr/share/wayland-sessions, workaround a meson issue
# https://bugzilla.gnome.org/show_bug.cgi?id=792207
if ! -d %{buildroot}%{_datadir}/wayland-sessions; then
mkdir -p %{buildroot}%{_datadir}/wayland-sessions
cp %{buildroot}%{_datadir}/xsessions/gnome.desktop %{buildroot}%{_datadir}/wayland-sessions/
else
echo "meson_install copied the wayland session already, remove this hack"
exit 42
fi
# install startup script and xsession file
install -d -m755 %{buildroot}%{_bindir}
install -m755 %{SOURCE1} %{buildroot}%{_bindir}/gnome
@ -189,6 +197,7 @@ ln -s %{_sysconfdir}/alternatives/default-waylandsession.desktop %{buildroot}%{_
%license COPYING
%doc AUTHORS ChangeLog NEWS README
%{_bindir}/gnome-session
%{_bindir}/gnome-session-custom-session
%{_bindir}/gnome-session-inhibit
%{_bindir}/gnome-session-quit
%{_datadir}/GConf/gsettings/gnome-session.convert