evolution-data-server, folks, gnome-bluetooth, gnome-session, python3-dbusmock packaged
This commit is contained in:
Berk Çakar
+67
@@ -0,0 +1,67 @@
|
||||
From 1de3575a1ea9cdb3579ad538108c51818847797c Mon Sep 17 00:00:00 2001
|
||||
From: Rasmus Thomsen <oss@cogitri.dev>
|
||||
Date: Fri, 6 Dec 2019 11:48:02 +0100
|
||||
Subject: [PATCH] revert: autostart-app: Strip blacklisted variables from
|
||||
autostart environment
|
||||
|
||||
This breaks gnome-session on non-systemd systems.
|
||||
|
||||
https://gitlab.gnome.org/GNOME/gnome-session/issues/44
|
||||
---
|
||||
gnome-session/gsm-autostart-app.c | 5 -----
|
||||
gnome-session/gsm-util.c | 6 ------
|
||||
gnome-session/gsm-util.h | 1 -
|
||||
3 files changed, 12 deletions(-)
|
||||
|
||||
diff --git a/gnome-session/gsm-autostart-app.c b/gnome-session/gsm-autostart-app.c
|
||||
index 6fd5915..01ba5f9 100644
|
||||
--- gnome-session/gsm-autostart-app.c
|
||||
+++ gnome-session/gsm-autostart-app.c
|
||||
@@ -997,7 +997,6 @@ autostart_app_start_spawn (GsmAutostartApp *app,
|
||||
gboolean success;
|
||||
GError *local_error;
|
||||
const char *startup_id;
|
||||
- const char * const *variable_blacklist;
|
||||
const char * const *child_environment;
|
||||
int i;
|
||||
GAppLaunchContext *ctx;
|
||||
@@ -1014,10 +1013,6 @@ autostart_app_start_spawn (GsmAutostartApp *app,
|
||||
local_error = NULL;
|
||||
ctx = g_app_launch_context_new ();
|
||||
|
||||
- variable_blacklist = gsm_util_get_variable_blacklist ();
|
||||
- for (i = 0; variable_blacklist[i] != NULL; i++)
|
||||
- g_app_launch_context_unsetenv (ctx, variable_blacklist[i]);
|
||||
-
|
||||
child_environment = gsm_util_listenv ();
|
||||
for (i = 0; child_environment[i] != NULL; i++) {
|
||||
char **environment_tuple;
|
||||
diff --git a/gnome-session/gsm-util.c b/gnome-session/gsm-util.c
|
||||
index 02bc4a5..ada1225 100644
|
||||
--- gnome-session/gsm-util.c
|
||||
+++ gnome-session/gsm-util.c
|
||||
@@ -808,9 +808,3 @@ gsm_util_listenv (void)
|
||||
return (const char * const *) child_environment;
|
||||
|
||||
}
|
||||
-
|
||||
-const char * const *
|
||||
-gsm_util_get_variable_blacklist (void)
|
||||
-{
|
||||
- return variable_blacklist;
|
||||
-}
|
||||
diff --git a/gnome-session/gsm-util.h b/gnome-session/gsm-util.h
|
||||
index bd7b698..8bca5f4 100644
|
||||
--- gnome-session/gsm-util.h
|
||||
+++ gnome-session/gsm-util.h
|
||||
@@ -50,7 +50,6 @@ char * gsm_util_generate_startup_id (void);
|
||||
void gsm_util_setenv (const char *variable,
|
||||
const char *value);
|
||||
const char * const * gsm_util_listenv (void);
|
||||
-const char * const * gsm_util_get_variable_blacklist(void);
|
||||
|
||||
gboolean gsm_util_export_activation_environment (GError **error);
|
||||
#ifdef HAVE_SYSTEMD
|
||||
--
|
||||
2.24.0
|
||||
|
||||
@@ -0,0 +1,21 @@
|
||||
By default GNOME folks want us to put all stuff in /usr/share/gdm/env.d
|
||||
(which is a lot of effort for no good reason for us) or use the systemd
|
||||
specific /etc/environment.d to set environment variables. With this
|
||||
patch we just force gnome-session's hand to include the env variables
|
||||
of /etc/profile.
|
||||
|
||||
--- gnome-session/gnome-session.in
|
||||
+++ gnome-session/gnome-session.in
|
||||
@@ -1,4 +1,4 @@
|
||||
-#!/bin/sh
|
||||
+#!/bin/bash
|
||||
|
||||
if [ "x$XDG_SESSION_TYPE" = "xwayland" ] &&
|
||||
[ "x$XDG_SESSION_CLASS" != "xgreeter" ] &&
|
||||
@@ -25,4 +25,6 @@ if [ -n "$REGION" ]; then
|
||||
export LC_PAPER=$REGION
|
||||
fi
|
||||
|
||||
+source /etc/profile
|
||||
+
|
||||
exec @libexecdir@/gnome-session-binary "$@"
|
||||
@@ -0,0 +1,14 @@
|
||||
--- meson.build
|
||||
+++ meson.build
|
||||
@@ -130,10 +130,7 @@ if enable_systemd or enable_consolekit
|
||||
|
||||
# Check for systemd
|
||||
if enable_systemd
|
||||
- systemd_dep = dependency('systemd', version: '>= 242', required: true)
|
||||
- systemd_userunitdir = systemd_dep.get_pkgconfig_variable('systemduserunitdir',
|
||||
- define_variable: ['prefix', prefix])
|
||||
-
|
||||
+ systemd_userunitdir = '/tmp'
|
||||
libsystemd_dep = dependency('libsystemd', version: '>= 209', required: false)
|
||||
session_bin_deps += libsystemd_dep
|
||||
|
||||
@@ -0,0 +1,67 @@
|
||||
From 4454f2a63394b69fba2c900151165ad8b5742f31 Mon Sep 17 00:00:00 2001
|
||||
From: Mart Raudsepp <leio@gentoo.org>
|
||||
Date: Sun, 15 Mar 2020 14:34:39 +0200
|
||||
Subject: [PATCH] meson: Support elogind
|
||||
|
||||
---
|
||||
meson.build | 12 +++++++++---
|
||||
meson_options.txt | 1 +
|
||||
2 files changed, 10 insertions(+), 3 deletions(-)
|
||||
|
||||
diff --git a/meson.build b/meson.build
|
||||
index ef5132c6..7f68aaae 100644
|
||||
--- a/meson.build
|
||||
+++ b/meson.build
|
||||
@@ -124,8 +124,10 @@ enable_systemd = get_option('systemd')
|
||||
enable_systemd_session = get_option('systemd_session') != 'disable'
|
||||
use_systemd_session = get_option('systemd_session') == 'default'
|
||||
enable_systemd_journal = get_option('systemd_journal')
|
||||
+enable_elogind = get_option('elogind')
|
||||
enable_consolekit = get_option('consolekit')
|
||||
-if enable_systemd or enable_consolekit
|
||||
+assert(not (enable_systemd and enable_elogind), 'Can not support systemd and elogind at once')
|
||||
+if enable_systemd or enable_elogind or enable_consolekit
|
||||
session_bin_deps += dependency('gio-unix-2.0', version: glib_req_version)
|
||||
|
||||
# Check for systemd
|
||||
@@ -152,6 +154,10 @@ if enable_systemd or enable_consolekit
|
||||
endif
|
||||
|
||||
session_tracking = 'systemd'
|
||||
+ elif enable_elogind
|
||||
+ libelogind_dep = dependency('libelogind', version: '>= 239.4')
|
||||
+ session_bin_deps += libelogind_dep
|
||||
+ session_tracking = 'elogind'
|
||||
endif
|
||||
|
||||
# Check for ConsoleKit
|
||||
@@ -161,7 +167,7 @@ if enable_systemd or enable_consolekit
|
||||
|
||||
session_bin_deps += dbus_glib_dep
|
||||
|
||||
- if enable_systemd
|
||||
+ if enable_systemd or enable_elogind
|
||||
session_tracking += ' (with fallback to ConsoleKit)'
|
||||
else
|
||||
session_tracking = 'ConsoleKit'
|
||||
@@ -171,7 +177,7 @@ endif
|
||||
if enable_systemd_session
|
||||
assert(enable_systemd, 'Systemd support must be enabled when using systemd session management')
|
||||
endif
|
||||
-config_h.set('HAVE_SYSTEMD', enable_systemd)
|
||||
+config_h.set('HAVE_SYSTEMD', enable_systemd or enable_elogind)
|
||||
config_h.set('ENABLE_SYSTEMD_SESSION', enable_systemd_session)
|
||||
config_h.set('ENABLE_SYSTEMD_JOURNAL', enable_systemd_journal)
|
||||
config_h.set('HAVE_CONSOLEKIT', enable_consolekit)
|
||||
diff --git a/meson_options.txt b/meson_options.txt
|
||||
index 4c05dc6e..512d1528 100644
|
||||
--- a/meson_options.txt
|
||||
+++ b/meson_options.txt
|
||||
@@ -1,4 +1,5 @@
|
||||
option('deprecation_flags', type: 'boolean', value: false, description: 'use *_DISABLE_DEPRECATED flags')
|
||||
+option('elogind', type: 'boolean', value: true, description: 'Use elogind')
|
||||
option('session_selector', type: 'boolean', value: false, description: 'enable building a custom session selector dialog')
|
||||
option('systemd', type: 'boolean', value: true, description: 'Use systemd')
|
||||
option('systemd_session', type: 'combo', choices: ['disable', 'enable', 'default'], value: 'default', description: 'Whether to include systemd session support and use it by default')
|
||||
--
|
||||
2.26.2
|
||||
Reference in New Issue
Block a user