summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKristian Fiskerstrand <k_f@gentoo.org>2018-07-04 12:33:52 +0200
committerKristian Fiskerstrand <k_f@gentoo.org>2018-07-31 10:34:30 +0200
commit9e4009499fe36ae4c8fd761b001bb678955cf936 (patch)
treeefc22010943221ebccbb6f1bccfa1ce515abcd1f /gnome-extra/cinnamon-session/files
parentgnome-extra/cinnamon: New upstream version 3.8.8 (diff)
downloadgentoo-9e4009499fe36ae4c8fd761b001bb678955cf936.tar.gz
gentoo-9e4009499fe36ae4c8fd761b001bb678955cf936.tar.bz2
gentoo-9e4009499fe36ae4c8fd761b001bb678955cf936.zip
gnome-extra/cinnamon-session: New upstream version 3.8.0
Package-Manager: Portage-2.3.40, Repoman-2.3.9
Diffstat (limited to 'gnome-extra/cinnamon-session/files')
-rw-r--r--gnome-extra/cinnamon-session/files/cinnamon-session-3.8.0-elogind.patch26
-rw-r--r--gnome-extra/cinnamon-session/files/cinnamon-session-3.8.0-elogind2.patch25
2 files changed, 51 insertions, 0 deletions
diff --git a/gnome-extra/cinnamon-session/files/cinnamon-session-3.8.0-elogind.patch b/gnome-extra/cinnamon-session/files/cinnamon-session-3.8.0-elogind.patch
new file mode 100644
index 00000000000..7ae0fba5697
--- /dev/null
+++ b/gnome-extra/cinnamon-session/files/cinnamon-session-3.8.0-elogind.patch
@@ -0,0 +1,26 @@
+From e9857299d098d6e62d866fa738cf53197e45c8e3 Mon Sep 17 00:00:00 2001
+From: Kristian Fiskerstrand <kf@sumptuouscapital.com>
+Date: Mon, 9 Jul 2018 13:26:51 +0200
+Subject: [PATCH] ELOGIND also needs this code that is wrapped in LOGIND
+ condtional
+
+---
+ cinnamon-session/csm-systemd.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/cinnamon-session/csm-systemd.c b/cinnamon-session/csm-systemd.c
+index dc2aa2e..039abd9 100644
+--- a/cinnamon-session/csm-systemd.c
++++ b/cinnamon-session/csm-systemd.c
+@@ -23,7 +23,7 @@
+ #include "config.h"
+ #include "csm-systemd.h"
+
+-#ifdef HAVE_LOGIND
++#if defined(HAVE_LOGIND) || defined(HAVE_ELOGIND)
+
+ #include <errno.h>
+ #include <string.h>
+--
+2.16.4
+
diff --git a/gnome-extra/cinnamon-session/files/cinnamon-session-3.8.0-elogind2.patch b/gnome-extra/cinnamon-session/files/cinnamon-session-3.8.0-elogind2.patch
new file mode 100644
index 00000000000..935541cf2a5
--- /dev/null
+++ b/gnome-extra/cinnamon-session/files/cinnamon-session-3.8.0-elogind2.patch
@@ -0,0 +1,25 @@
+From 10148b8831ba26c7991b4643cbb05d92445f4b61 Mon Sep 17 00:00:00 2001
+From: Kristian Fiskerstrand <kf@sumptuouscapital.com>
+Date: Mon, 9 Jul 2018 13:56:57 +0200
+Subject: [PATCH] elogind
+
+---
+ cinnamon-session/meson.build | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/cinnamon-session/meson.build b/cinnamon-session/meson.build
+index 1d0db5b..4be50e5 100644
+--- a/cinnamon-session/meson.build
++++ b/cinnamon-session/meson.build
+@@ -77,7 +77,7 @@ executable('cinnamon-session',
+ xext,
+ xrender,
+ xtest,
+- # elogind,
++ elogind,
+ ],
+ link_with: [
+ libegg,
+--
+2.16.4
+