diff options
| -rw-r--r-- | user/mate-session-manager/APKBUILD | 8 | ||||
| -rw-r--r-- | user/mate-session-manager/no-systemd.patch | 65 |
2 files changed, 3 insertions, 70 deletions
diff --git a/user/mate-session-manager/APKBUILD b/user/mate-session-manager/APKBUILD index 09ee4cc78..82ff187a5 100644 --- a/user/mate-session-manager/APKBUILD +++ b/user/mate-session-manager/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> # Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> pkgname=mate-session-manager -pkgver=1.22.0 +pkgver=1.22.1 pkgrel=0 pkgdesc="Session manager for the MATE desktop environment" url="https://mate-desktop.org" @@ -10,8 +10,7 @@ license="GPL-2.0+ AND LGPL-2.0+" depends="" makedepends="dbus-glib-dev gtk+3.0-dev intltool libsm-dev" subpackages="$pkgname-doc $pkgname-lang" -source="https://pub.mate-desktop.org/releases/${pkgver%.*}/mate-session-manager-$pkgver.tar.xz - no-systemd.patch" +source="https://pub.mate-desktop.org/releases/${pkgver%.*}/mate-session-manager-$pkgver.tar.xz" build() { cd "$builddir" @@ -35,5 +34,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="7e5e21e37c7ac55ca7d71302edef9aabeccf39233aec9edfe93a2fdcd4150d039e8121adecebb3d0a4a707eccef0c7afa1b54c5b52b57853242964c7506eeb9a mate-session-manager-1.22.0.tar.xz -ea84e562b3a5d08b373f270d8d5fa9eeae9b803e3eb4ef925c31bad0e4e185eecfcff5465864a4a449fc5cade000b3ee18dea515744fcb59ac2efaf9df420a43 no-systemd.patch" +sha512sums="1c47134813d24abef7b2f5df098120a2cd138f822ea3d687a1a2566224bbde21482bf40ac47ba08a39ed0899ff35eeac3c3690c83c006774c47f22189688990b mate-session-manager-1.22.1.tar.xz" diff --git a/user/mate-session-manager/no-systemd.patch b/user/mate-session-manager/no-systemd.patch deleted file mode 100644 index 79c19f34a..000000000 --- a/user/mate-session-manager/no-systemd.patch +++ /dev/null @@ -1,65 +0,0 @@ -From 254a091b31517a25bc037b31daff27fbb74ac90d 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; |