commit: af225f1a0eadaaa3492293854e28868c20f493c5 Author: Adam Feldman <NP-Hardass <AT> gentoo <DOT> org> AuthorDate: Sun May 23 19:52:20 2021 +0000 Commit: Adam Feldman <np-hardass <AT> gentoo <DOT> org> CommitDate: Sun May 23 19:52:20 2021 +0000 URL: https://gitweb.gentoo.org/proj/gentoo-mate.git/commit/?id=af225f1a
mate-base/mate-session-manager: Drop 1.22.x Package-Manager: Portage-3.0.18, Repoman-3.0.3 Signed-off-by: Adam Feldman <NP-Hardass <AT> gentoo.org> mate-base/mate-session-manager/Manifest | 1 - .../files/10-user-dirs-update-mate | 10 --- .../mate-session-manager/files/15-xdg-data-mate | 9 --- .../mate-session-manager-1.22.0-elogind.patch | 84 --------------------- ...ion-manager-1.22.0-fix-systemd-regression.patch | 65 ---------------- .../mate-session-manager-1.22.3-r3.ebuild | 87 ---------------------- 6 files changed, 256 deletions(-) diff --git a/mate-base/mate-session-manager/Manifest b/mate-base/mate-session-manager/Manifest index 1cf0f5a..5f83a57 100644 --- a/mate-base/mate-session-manager/Manifest +++ b/mate-base/mate-session-manager/Manifest @@ -1,3 +1,2 @@ -DIST mate-session-manager-1.22.3.tar.xz 582412 BLAKE2B 9e502b356e09aa4ecebb5a75771cfed0dd16a3e44baf176fd5ba3dbf9b5bd000f6572498dfee69e794971e491eb5d9f2fa3a8c923aefe2ee6e42a086521fdd9d SHA512 2a53722c1468c244e90632e3a949c331922e018998300ee8c5de44973e17116822d2a747b4d0d315348da9a20c011f46c2b5ea569eef0b6b90785f3df55d98f6 DIST mate-session-manager-1.24.0.tar.xz 709712 BLAKE2B 6455872dfc89cdd3ced563a877e30ef59d2c6d94bd8f3b930eb778ea6b22a52ee860d785ba13d348e37e0d74526de4aef229d5c7b022e7f974ac949f553d7704 SHA512 ee519c8ded1f2df26e62a1384439e8929942d19560c258c91010f8d34bcc7518975406fbc0a5b76d4e73e954cdc2ea106d71476e446573d4a77d2704f6cc9e37 DIST mate-session-manager-1.24.1.tar.xz 711188 BLAKE2B a2d48b53fbff6f2bf56cdf24efb709a17458341c75a37ab7494fcf344064b64f50e9527f11d74b681d2156508e24fefdb7a5c7637b72deddf1f3a82e4096031b SHA512 ca561e13080ef334a69f18b3aec0993532381ea5c178a0acf969bf2ed9cb5d484626404ab43d809727d8eef9b5eda29adc224168290f78a63da2621ac7ef79f5 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 35973aa..0000000 --- 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 df360cf..0000000 --- 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 ebe68a0..0000000 --- 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 <[email protected]> -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 <[email protected]> -Co-authored-by: Jorge Pizarro Callejas <[email protected]> ---- - 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 eccfe5b..0000000 --- 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 <[email protected]> -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; diff --git a/mate-base/mate-session-manager/mate-session-manager-1.22.3-r3.ebuild b/mate-base/mate-session-manager/mate-session-manager-1.22.3-r3.ebuild deleted file mode 100644 index 1eca4cc..0000000 --- a/mate-base/mate-session-manager/mate-session-manager-1.22.3-r3.ebuild +++ /dev/null @@ -1,87 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -inherit mate - -if [[ ${PV} != 9999 ]]; then - KEYWORDS="amd64 ~arm ~arm64 x86" -fi - -DESCRIPTION="MATE session manager" -HOMEPAGE="https://mate-desktop.org/"; - -LICENSE="GPL-2+ GPL-3+ HPND LGPL-2+ LGPL-2.1+" -SLOT="0" -IUSE="debug elogind gnome-keyring ipv6 systemd +xtrans" - -REQUIRED_USE="?? ( elogind systemd )" - -# x11-misc/xdg-user-dirs{,-gtk} are needed to create the various XDG_*_DIRs, and -# create .config/user-dirs.dirs which is read by glib to get G_USER_DIRECTORY_* -# xdg-user-dirs-update is run during login (see 10-user-dirs-update-gnome below). - -COMMON_DEPEND=" - >=dev-libs/dbus-glib-0.76 - >=dev-libs/glib-2.50:2 - dev-libs/libxslt - sys-apps/dbus - x11-libs/gdk-pixbuf:2 - >=x11-libs/gtk+-3.22:3 - x11-libs/libICE - x11-libs/libSM - x11-libs/libX11 - x11-libs/libXau - x11-libs/libXext - x11-libs/libXrender - x11-libs/libXtst - x11-libs/pango - virtual/libintl - systemd? ( sys-apps/systemd ) - !systemd? ( - elogind? ( sys-auth/elogind ) - !elogind? ( >=sys-auth/consolekit-0.9.2 ) - ) - xtrans? ( x11-libs/xtrans )" - -RDEPEND="${COMMON_DEPEND} - x11-apps/xdpyinfo - x11-misc/xdg-user-dirs - x11-misc/xdg-user-dirs-gtk - gnome-keyring? ( gnome-base/gnome-keyring ) - !<gnome-base/gdm-2.20.4" - -DEPEND="${COMMON_DEPEND} - >=dev-lang/perl-5 - dev-util/glib-utils - >=dev-util/intltool-0.40 - >=sys-devel/gettext-0.10.40 - virtual/pkgconfig" - -MATE_FORCE_AUTORECONF=true - -src_configure() { - mate_src_configure \ - $(use_with elogind) \ - $(use_with systemd) \ - $(use_with xtrans) \ - $(use_enable debug) \ - $(use_enable ipv6) -} - -src_install() { - mate_src_install - - exeinto /etc/X11/Sessions/ - doexe "${FILESDIR}"/MATE - - insinto /usr/share/mate/applications/ - doins "${FILESDIR}"/defaults.list - - exeinto /etc/X11/xinit/xinitrc.d/ - newexe "${FILESDIR}"/15-xdg-data-mate-r2 15-xdg-data-mate - - # This should be done in MATE too, see Gentoo bug #270852 - newexe "${FILESDIR}"/10-user-dirs-update-mate-r2 10-user-dirs-update-mate -}
