summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMart Raudsepp <leio@gentoo.org>2020-04-25 22:32:26 +0300
committerMart Raudsepp <leio@gentoo.org>2020-04-25 23:17:15 +0300
commitd7d1c705555158fd0cafcef3de4aee60cf12fb48 (patch)
treef4046a0bb5be9205ae1ab1eecd4eb33e98f7a7ec /gnome-base/gnome-session/files
parentgnome-base/gnome-desktop: remove old (diff)
downloadgentoo-d7d1c705555158fd0cafcef3de4aee60cf12fb48.tar.gz
gentoo-d7d1c705555158fd0cafcef3de4aee60cf12fb48.tar.bz2
gentoo-d7d1c705555158fd0cafcef3de4aee60cf12fb48.zip
gnome-base/gnome-session: remove old
Package-Manager: Portage-2.3.84, Repoman-2.3.20 Signed-off-by: Mart Raudsepp <leio@gentoo.org>
Diffstat (limited to 'gnome-base/gnome-session/files')
-rw-r--r--gnome-base/gnome-session/files/3.30.1-elogind-support.patch67
1 files changed, 0 insertions, 67 deletions
diff --git a/gnome-base/gnome-session/files/3.30.1-elogind-support.patch b/gnome-base/gnome-session/files/3.30.1-elogind-support.patch
deleted file mode 100644
index 4f1c5dab9dda..000000000000
--- a/gnome-base/gnome-session/files/3.30.1-elogind-support.patch
+++ /dev/null
@@ -1,67 +0,0 @@
-From 92072c73ab74ebe0654ac5bd4f9fd2182181ee9d Mon Sep 17 00:00:00 2001
-From: Mart Raudsepp <leio@gentoo.org>
-Date: Tue, 19 Mar 2019 11:00:21 +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 afc97457..7c32e3b9 100644
---- a/meson.build
-+++ b/meson.build
-@@ -121,8 +121,10 @@ session_tracking = 'null backend'
-
- enable_systemd = get_option('systemd')
- 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
-@@ -145,6 +147,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
-@@ -154,14 +160,14 @@ 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'
- endif
- endif
- endif
--config_h.set('HAVE_SYSTEMD', enable_systemd)
-+config_h.set('HAVE_SYSTEMD', enable_systemd or enable_elogind)
- 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 05174fec..cd85eae8 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_journal', type: 'boolean', value:'true', description: 'Send log to systemd-journal')
---
-2.17.0
-