From b7b97785ebbb2f11d24d14dab8b81ed274f4ce6a Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Tue, 19 Mar 2019 11:37:34 +0000 Subject: gentoo resync : 19.03.2019 --- mate-base/mate-session-manager/Manifest | 3 + ...ion-manager-1.22.0-fix-systemd-regression.patch | 65 ++++++++++++++++ .../mate-session-manager-1.22.0.ebuild | 87 ++++++++++++++++++++++ 3 files changed, 155 insertions(+) create mode 100644 mate-base/mate-session-manager/files/mate-session-manager-1.22.0-fix-systemd-regression.patch create mode 100644 mate-base/mate-session-manager/mate-session-manager-1.22.0.ebuild (limited to 'mate-base/mate-session-manager') diff --git a/mate-base/mate-session-manager/Manifest b/mate-base/mate-session-manager/Manifest index 90463cc368e2..6ab823caf7be 100644 --- a/mate-base/mate-session-manager/Manifest +++ b/mate-base/mate-session-manager/Manifest @@ -2,6 +2,9 @@ AUX 10-user-dirs-update-mate 267 BLAKE2B d1943bd1ee27d95ffd9a09f7d6c4f98681b9c36 AUX 15-xdg-data-mate 224 BLAKE2B ae38eaf5c0abc088a353d244de928ff12c7da020da0304c5592c7232ae4be69db55083da91fa8d95cdbb6bbc4c4d76ac37df3e011a5a5b984348435a0c615b3c SHA512 a19acef85d510d6244fd29ba7daa6d5cc314392257b47574d8aedea235e4a5273d36bd67c138da9496663c2786ba5f7f433ff4aa6990a91a39be267026e5694d AUX MATE 2378 BLAKE2B 824c6e357c90322a499aeeece3e38d25bcfb87c23eab159e1bc3c4dc39aeb535eb86f7833e8d9b9b1d48fc765414ca79120bee81ffde8c7d1f0ea6a112fe2dcc SHA512 dbb162f694eeee806a12b46bf45d47f4887a83562b61d05037b3de5a7778a68d79de5528327588da13a5c17c283c8b7590c10877eba77cea75ebe5113ef2c920 AUX defaults.list 14293 BLAKE2B b8de50636f845e5ed197968a0f917a3d2c1f59b082ae7d76841c9802ce6182556a29faebcd28f71dfdd778ae73268ebba1d450c9f18ac730aedd5ba0f025e53c SHA512 d3b14a4676bbadb93bc33e94ddf74fc6a2c072c52ada51d8f658008301d795102d47b3e1b71f9884d117111329774deaab1a5c1718c3dab5bcf96df1657f3c9d +AUX mate-session-manager-1.22.0-fix-systemd-regression.patch 1833 BLAKE2B 894f6f223fefc7921ef42d604fccb30d3f9efb80ecea1bc0637b286e57552a9eaaad2f42c6e6bb2cdddd396954dea2712c8aa02da5ba54ca2974acb54d825acc SHA512 7a0036c706b56d4431fbb3d54be77930aede8d8d1d0889a568bc0432d91b15026ac26ef4ccdc0f41a860a6adf1a88cf07d4c260c810f66f1a910ff568b4e90fb DIST mate-session-manager-1.18.2.tar.xz 570336 BLAKE2B d1fd8f6a037fa38833d4aae05dcc9ed98ff192c712819342a77d19fb00e09febaa90fd0396048a3cee64ea424c6a72e8ae90f067d61929ef524825c97d500f8e SHA512 e3d3e2524cd0d00930b5c6b81134b969555f00550d23a357d426a6f0d475884ce6ab16be365fd5e95801dd53c250069ad091dec6c93f2ab70818460fbef4765e +DIST mate-session-manager-1.22.0.tar.xz 603016 BLAKE2B 5d7064756b7d7d2ca4fdebf18319dc8a8d8eca6ed31c5e8e37e503c7099a0d541186028d6b4e174bff1ce9ca727a374e9597498b2ca6d5494dc74f21fec0baeb SHA512 7e5e21e37c7ac55ca7d71302edef9aabeccf39233aec9edfe93a2fdcd4150d039e8121adecebb3d0a4a707eccef0c7afa1b54c5b52b57853242964c7506eeb9a EBUILD mate-session-manager-1.18.2-r1.ebuild 2050 BLAKE2B 9863863dcb955c561cd69f67c141608a73e7bfe70804efee79438f5271e342c80da8e2a45e00c25e66ad5092ed8ca944ef9afd8133232e80a181910b5a1fa945 SHA512 cf6cbac9c513aadafa94bbb995bf4ca2f91fde90a0b3f09daab720b3fd73b4fbb349336e8ab96663c3abc557d6eede12e49e37036545f492d67a9775cad5d31a +EBUILD mate-session-manager-1.22.0.ebuild 2108 BLAKE2B 7dc60870e72603c64ffb58c5a3525cc9eb3f76bf23c4f51eb3b72ddef9c6a2b753d345e2c9172808af5c54e1f3e70fa8761c008241665986ea4de2654710a961 SHA512 a986b52222ad4e026e3105ebe7f40fe94f7660be9c35022a5c69a4502a035a424ee01a0c7a7d5a5a87428c6f090bfffeac8cfd4168db7f5b3dbc607ad7c24be4 MISC metadata.xml 497 BLAKE2B 85510300fad0274831fbbb5dbedb00bd3e6347518e0188838f8dce213064db44612ca7e7fbbe922cc46924f02f2fda50120ecba21774231af6e3acea45fc9db4 SHA512 19f431c7d3a9912baaa3df85fd222be5b2649f46a723ffdc084524b172c6c387e4a9928b219d9e73217c7e6ef677f2e5e82473547489001fc20fee7529373568 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 new file mode 100644 index 000000000000..eccfe5b5b18e --- /dev/null +++ b/mate-base/mate-session-manager/files/mate-session-manager-1.22.0-fix-systemd-regression.patch @@ -0,0 +1,65 @@ +From 7f0a938467e4e3d57c68af1caa146a664458a911 Mon Sep 17 00:00:00 2001 +From: Victor Kareh +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.0.ebuild b/mate-base/mate-session-manager/mate-session-manager-1.22.0.ebuild new file mode 100644 index 000000000000..9b948b230380 --- /dev/null +++ b/mate-base/mate-session-manager/mate-session-manager-1.22.0.ebuild @@ -0,0 +1,87 @@ +# Copyright 1999-2019 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="http://mate-desktop.org/" + +LICENSE="GPL-2 LGPL-2 FDL-1.1" +SLOT="0" + +IUSE="debug elibc_FreeBSD gnome-keyring ipv6 systemd +xtrans" + +PATCHES=( "${FILESDIR}"/${P}-fix-systemd-regression.patch ) + +# 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 + elibc_FreeBSD? ( || ( dev-libs/libexecinfo >=sys-freebsd/freebsd-lib-10.0 ) ) + systemd? ( sys-apps/systemd ) + !systemd? ( >=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 )" + +DEPEND="${COMMON_DEPEND} + >=dev-util/intltool-0.40 + >=dev-lang/perl-5 + >=sys-devel/gettext-0.10.40:* + virtual/pkgconfig:* + !