diff options
4 files changed, 0 insertions, 168 deletions
diff --git a/mate-base/mate-session-manager/files/10-user-dirs-update-mate b/mate-base/mate-session-manager/files/10-user-dirs-update-mate deleted file mode 100644 index 35973aae2447..000000000000 --- a/mate-base/mate-session-manager/files/10-user-dirs-update-mate +++ /dev/null @@ -1,10 +0,0 @@ -#!/bin/sh - -# Create various XDG directories, and write ~/.config/user-dirs.dirs, etc. -# That file is read by glib to get XDG_PICTURES_DIR, etc - -if [ "$DESKTOP_SESSION" = "mate" ]; then - if type xdg-user-dirs-update >/dev/null 2>&1; then - xdg-user-dirs-update - fi -fi diff --git a/mate-base/mate-session-manager/files/15-xdg-data-mate b/mate-base/mate-session-manager/files/15-xdg-data-mate deleted file mode 100644 index df360cf85fdd..000000000000 --- a/mate-base/mate-session-manager/files/15-xdg-data-mate +++ /dev/null @@ -1,9 +0,0 @@ -#!/bin/sh - -if [ "$DESKTOP_SESSION" = "mate" ]; then - if [ -z "$XDG_DATA_DIRS" ]; then - export XDG_DATA_DIRS=/usr/share/mate:/usr/local/share/:/usr/share/ - else - export XDG_DATA_DIRS=/usr/share/mate:"$XDG_DATA_DIRS" - fi -fi diff --git a/mate-base/mate-session-manager/files/mate-session-manager-1.22.0-elogind.patch b/mate-base/mate-session-manager/files/mate-session-manager-1.22.0-elogind.patch deleted file mode 100644 index ebe68a0b3547..000000000000 --- a/mate-base/mate-session-manager/files/mate-session-manager-1.22.0-elogind.patch +++ /dev/null @@ -1,84 +0,0 @@ -From e6f62cd82d2717cb26951629e3f071814694fd07 Mon Sep 17 00:00:00 2001 -From: Victor Kareh <vkareh@redhat.com> -Date: Fri, 8 Mar 2019 13:37:01 -0500 -Subject: [PATCH] Add ELOGIND support - -Reuses HAVE_SYSTEMD #define to reduce #ifdef mess. - -ELOGIND is not officially supported, but since it's -a subset of systemd, it should work out of the box. - -Co-authored-by: Joakim Tjernlund <joakim.tjernlund@infinera.com> -Co-authored-by: Jorge Pizarro Callejas <jpizarrocallejas@gmail.com> ---- - configure.ac | 29 +++++++++++++++++++++++++++++ - mate-session/Makefile.am | 2 ++ - 2 files changed, 31 insertions(+) - -diff --git a/configure.ac b/configure.ac -index 207ad97..1390ba0 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -109,6 +109,34 @@ fi - AM_CONDITIONAL(HAVE_SYSTEMD, test "x$use_systemd" = "xyes") - AC_SUBST(HAVE_SYSTEMD) - -+dnl ==================================================================== -+dnl Check for elogind -+dnl -+dnl elogind is not officially supported, but since it's a subset of -+dnl systemd, it should work out of the box -+dnl ==================================================================== -+ -+AC_ARG_WITH(elogind, -+ AS_HELP_STRING([--with-elogind], -+ [Use libelogind instead of libsystemd-login]),, -+ with_elogind=auto) -+ -+use_elogind=no -+if test "x$with_elogind" != "xno"; then -+ PKG_CHECK_MODULES(LIBELOGIND,[libelogind], [use_elogind=yes], -+ [PKG_CHECK_MODULES([LIBELOGIND], [libelogind], -+ [use_elogind=yes], [use_elogind=no])]) -+ -+ if test "x$use_elogind" = "xyes"; then -+ AC_DEFINE([HAVE_ELOGIND], 1, [elogind support]) -+ AC_DEFINE([HAVE_SYSTEMD], 1, [Define to 1 to reduce ifdefs since elogind is a drop-in replacement for systemd]) -+ AC_SUBST(LIBELOGIND_CFLAGS) -+ AC_SUBST(LIBELOGIND_LIBS) -+ fi -+fi -+AM_CONDITIONAL(HAVE_ELOGIND, [test "x$use_elogind" = "xyes"]) -+AC_SUBST(HAVE_ELOGIND) -+ - dnl ==================================================================== - dnl Check for XSync extension - dnl ==================================================================== -@@ -333,6 +361,7 @@ echo " - - Default WM: ${with_default_wm} - Systemd support: ${use_systemd} -+ Elogind support: ${use_elogind} - IPv6 support: ${have_full_ipv6} - Backtrace support: ${have_backtrace} - XRender support: ${have_xrender} -diff --git a/mate-session/Makefile.am b/mate-session/Makefile.am -index 093c908..ea0dc95 100644 ---- a/mate-session/Makefile.am -+++ b/mate-session/Makefile.am -@@ -7,6 +7,7 @@ noinst_PROGRAMS = \ - AM_CPPFLAGS = \ - $(MATE_SESSION_CFLAGS) \ - $(SYSTEMD_CFLAGS) \ -+ $(LIBELOGIND_CFLAGS) \ - $(DISABLE_DEPRECATED_CFLAGS) - - AM_CFLAGS = $(WARN_CFLAGS) -@@ -80,6 +81,7 @@ mate_session_LDADD = \ - $(XEXT_LIBS) \ - $(MATE_SESSION_LIBS) \ - $(SYSTEMD_LIBS) \ -+ $(LIBELOGIND_LIBS) \ - $(EXECINFO_LIBS) - - libgsmutil_la_SOURCES = \ diff --git a/mate-base/mate-session-manager/files/mate-session-manager-1.22.0-fix-systemd-regression.patch b/mate-base/mate-session-manager/files/mate-session-manager-1.22.0-fix-systemd-regression.patch deleted file mode 100644 index eccfe5b5b18e..000000000000 --- a/mate-base/mate-session-manager/files/mate-session-manager-1.22.0-fix-systemd-regression.patch +++ /dev/null @@ -1,65 +0,0 @@ -From 7f0a938467e4e3d57c68af1caa146a664458a911 Mon Sep 17 00:00:00 2001 -From: Victor Kareh <vkareh@redhat.com> -Date: Wed, 6 Mar 2019 09:20:36 -0500 -Subject: [PATCH] Guard against missing systemd - ---- - mate-session/gsm-systemd.c | 19 +++++++++++++++++++ - 1 file changed, 19 insertions(+) - -diff --git a/mate-session/gsm-systemd.c b/mate-session/gsm-systemd.c -index da3f23b..d03cafd 100644 ---- a/mate-session/gsm-systemd.c -+++ b/mate-session/gsm-systemd.c -@@ -429,16 +429,31 @@ gsm_systemd_is_last_session_for_user (GsmSystemd *manager) - gboolean is_last_session; - int ret, i; - -+#ifdef HAVE_SYSTEMD - ret = sd_pid_get_session (getpid (), &session); -+#endif -+ -+ if (session == NULL) { -+ return FALSE; -+ } - - if (ret != 0) { -+ free (session); - return FALSE; - } - -+#ifdef HAVE_SYSTEMD - ret = sd_uid_get_sessions (getuid (), FALSE, &sessions); -+#endif -+ -+ if (sessions == NULL) { -+ free (session); -+ return FALSE; -+ } - - if (ret <= 0) { - free (session); -+ free (sessions); - return FALSE; - } - -@@ -450,7 +465,9 @@ gsm_systemd_is_last_session_for_user (GsmSystemd *manager) - if (g_strcmp0 (sessions[i], session) == 0) - continue; - -+#ifdef HAVE_SYSTEMD - ret = sd_session_get_state (sessions[i], &state); -+#endif - - if (ret != 0) - continue; -@@ -461,7 +478,9 @@ gsm_systemd_is_last_session_for_user (GsmSystemd *manager) - } - free (state); - -+#ifdef HAVE_SYSTEMD - ret = sd_session_get_type (sessions[i], &type); -+#endif - - if (ret != 0) - continue; |