diff options
author | Paul Bredbury <brebs@sent.com> | 2019-06-16 10:34:25 +0100 |
---|---|---|
committer | Natanael Copa <ncopa@alpinelinux.org> | 2019-06-17 12:19:44 +0000 |
commit | 7f5587f87424430a11a522e24332254eb7392d0e (patch) | |
tree | 615400947d195cebc8962e0735a8c8424bf23902 /community/mate-session-manager | |
parent | 854c76c54a4deb3f6199904ae87b446d740057f1 (diff) | |
download | aports-7f5587f87424430a11a522e24332254eb7392d0e.tar.bz2 aports-7f5587f87424430a11a522e24332254eb7392d0e.tar.xz |
community/mate-session-manager: upgrade to 1.22.1
Remove patches, are applied upstream.
Remove unnecessary "cd" commands.
Diffstat (limited to 'community/mate-session-manager')
-rw-r--r-- | community/mate-session-manager/APKBUILD | 14 | ||||
-rw-r--r-- | community/mate-session-manager/install-sh.patch | 10 | ||||
-rw-r--r-- | community/mate-session-manager/systemd-dependency.patch | 67 |
3 files changed, 3 insertions, 88 deletions
diff --git a/community/mate-session-manager/APKBUILD b/community/mate-session-manager/APKBUILD index 12e709d2ed..31eb049a28 100644 --- a/community/mate-session-manager/APKBUILD +++ b/community/mate-session-manager/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Alan Lacerda <alacerda@alpinelinux.org> # Maintainer: Alan Lacerda <alacerda@alpinelinux.org> pkgname=mate-session-manager -pkgver=1.22.0 +pkgver=1.22.1 pkgrel=0 pkgdesc="The MATE session manager" url="https://github.com/mate-desktop/mate-session-manager" @@ -11,14 +11,10 @@ depends="mate-common mate-desktop" makedepends="intltool libtool dconf-dev dbus-glib-dev gtk+3.0-dev libsm-dev mate-desktop-dev" subpackages="$pkgname-doc $pkgname-lang" -source="https://pub.mate-desktop.org/releases/${pkgver%.*}/$pkgname-$pkgver.tar.xz - systemd-dependency.patch - install-sh.patch - " +source="https://pub.mate-desktop.org/releases/${pkgver%.*}/$pkgname-$pkgver.tar.xz" builddir="$srcdir/$pkgname-$pkgver" build() { - cd "$builddir" ./configure \ --build=$CBUILD \ --host=$CHOST \ @@ -28,15 +24,11 @@ build() { } check() { - cd "$builddir" make check } package() { - cd "$builddir" make DESTDIR="${pkgdir}" install } -sha512sums="7e5e21e37c7ac55ca7d71302edef9aabeccf39233aec9edfe93a2fdcd4150d039e8121adecebb3d0a4a707eccef0c7afa1b54c5b52b57853242964c7506eeb9a mate-session-manager-1.22.0.tar.xz -0291b0c9f1bc07043ab8ec6f209d46b85e5cfea6bc057f87da9e0db15f61374cb063d57e809ea2c236489e2eb2bca0b0ef289507d4ace9eee47d77e1c0359385 systemd-dependency.patch -2220612dcda2f992ce6e7d8225c3d012497ff297921c24d40853553783c6b0f95c8e25ab0ad3454931e6e104a9951892972c045e4b9e2672cbbe34cd5a0936f3 install-sh.patch" +sha512sums="1c47134813d24abef7b2f5df098120a2cd138f822ea3d687a1a2566224bbde21482bf40ac47ba08a39ed0899ff35eeac3c3690c83c006774c47f22189688990b mate-session-manager-1.22.1.tar.xz" diff --git a/community/mate-session-manager/install-sh.patch b/community/mate-session-manager/install-sh.patch deleted file mode 100644 index d32f681c0e..0000000000 --- a/community/mate-session-manager/install-sh.patch +++ /dev/null @@ -1,10 +0,0 @@ -diff --git a/install-sh b/install-sh -index defb86a..8175c64 100755 ---- a/install-sh -+++ b/install-sh -@@ -1,4 +1,4 @@ --#!/usr/bin/sh -+#!/bin/sh - # install - install a program, script, or datafile - - scriptversion=2018-03-11.20; # UTC diff --git a/community/mate-session-manager/systemd-dependency.patch b/community/mate-session-manager/systemd-dependency.patch deleted file mode 100644 index 912a5e1b50..0000000000 --- a/community/mate-session-manager/systemd-dependency.patch +++ /dev/null @@ -1,67 +0,0 @@ -From https://github.com/mate-desktop/mate-session-manager/commit/254a091b31517a25bc037b31daff27fbb74ac90d - -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; |