From feb0daf81d888e9160f9f94502de09b66f2a63fd Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sun, 21 Jun 2020 17:50:24 +0100 Subject: gentoo resync : 21.06.2020 --- mate-base/Manifest.gz | Bin 2231 -> 2234 bytes mate-base/mate-session-manager/Manifest | 4 - .../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 ---------------- 6 files changed, 172 deletions(-) delete mode 100644 mate-base/mate-session-manager/files/10-user-dirs-update-mate delete mode 100644 mate-base/mate-session-manager/files/15-xdg-data-mate delete mode 100644 mate-base/mate-session-manager/files/mate-session-manager-1.22.0-elogind.patch delete mode 100644 mate-base/mate-session-manager/files/mate-session-manager-1.22.0-fix-systemd-regression.patch (limited to 'mate-base') diff --git a/mate-base/Manifest.gz b/mate-base/Manifest.gz index 5f45598d78ff..8592d63ba7cc 100644 Binary files a/mate-base/Manifest.gz and b/mate-base/Manifest.gz differ diff --git a/mate-base/mate-session-manager/Manifest b/mate-base/mate-session-manager/Manifest index 6451987c22c8..a6db0d06e489 100644 --- a/mate-base/mate-session-manager/Manifest +++ b/mate-base/mate-session-manager/Manifest @@ -1,11 +1,7 @@ -AUX 10-user-dirs-update-mate 267 BLAKE2B d1943bd1ee27d95ffd9a09f7d6c4f98681b9c36bd6f0aeee908df716a90c54c569cac762f2021dc064edfe9b41e4d5c87a01fd1d9165b941e9fd9cf2eebd4a27 SHA512 3f2803e9dfc7368ce6effdd538f67714e3ec5554b32fcc4ada4ef033e8e4dabcca17db095c49c368ab7f76a478bf536bd0ce26cceaf1b20ec5e75db470656076 AUX 10-user-dirs-update-mate-r2 343 BLAKE2B 43cc2f879fe3ee7d1c175bbbb8d7edf628a32335800368aef3181b8d5317e3368dc0bf84bd38cbbf4fd24b972f496aaffe03d2bf5d7fae5d56326b50d1772d1d SHA512 331e60ba688ac047398e6e8eda66dcd293aeb2d30ffb53147d255305913eba009832a986c8ff50ef0b57b639b6c170bdaf6ae9606ca4d31714446cc45ed4dd82 -AUX 15-xdg-data-mate 224 BLAKE2B ae38eaf5c0abc088a353d244de928ff12c7da020da0304c5592c7232ae4be69db55083da91fa8d95cdbb6bbc4c4d76ac37df3e011a5a5b984348435a0c615b3c SHA512 a19acef85d510d6244fd29ba7daa6d5cc314392257b47574d8aedea235e4a5273d36bd67c138da9496663c2786ba5f7f433ff4aa6990a91a39be267026e5694d AUX 15-xdg-data-mate-r2 300 BLAKE2B dd937a405d9207d337a1bf9a630b3717e1c93a02231d0442f58d22a8d3cfdc9e280dfe88fb05cc670dae12f937cdc77815a360ef527a600c5a5bab6134d2aba6 SHA512 500d2e1a532ddda84dadd2952d6391c47a19befc52add0e9c78f92b30a985d5076b0be049a547e15cce44b546aba1b1f3a82622296ea4bfa760a89705ec0fc2d AUX MATE 2378 BLAKE2B 824c6e357c90322a499aeeece3e38d25bcfb87c23eab159e1bc3c4dc39aeb535eb86f7833e8d9b9b1d48fc765414ca79120bee81ffde8c7d1f0ea6a112fe2dcc SHA512 dbb162f694eeee806a12b46bf45d47f4887a83562b61d05037b3de5a7778a68d79de5528327588da13a5c17c283c8b7590c10877eba77cea75ebe5113ef2c920 AUX defaults.list 14293 BLAKE2B b8de50636f845e5ed197968a0f917a3d2c1f59b082ae7d76841c9802ce6182556a29faebcd28f71dfdd778ae73268ebba1d450c9f18ac730aedd5ba0f025e53c SHA512 d3b14a4676bbadb93bc33e94ddf74fc6a2c072c52ada51d8f658008301d795102d47b3e1b71f9884d117111329774deaab1a5c1718c3dab5bcf96df1657f3c9d -AUX mate-session-manager-1.22.0-elogind.patch 3002 BLAKE2B 90f18a3e7c98d5dbadd34c327bb9ac0a971f4585da35b401625641842ac05c8fe0385cbf1ab0955e16865c106d2046de44409a452ce4a251e09ec127a33390e4 SHA512 aa5fba7040879aeeba931d5cc62896ff43fc5d770664cfcd9ca45cbf5959e7eec3fa74ba632ef19d653b2516589119a8c2c1349c054be1e9a8d42ccf3dd755da -AUX mate-session-manager-1.22.0-fix-systemd-regression.patch 1833 BLAKE2B 894f6f223fefc7921ef42d604fccb30d3f9efb80ecea1bc0637b286e57552a9eaaad2f42c6e6bb2cdddd396954dea2712c8aa02da5ba54ca2974acb54d825acc SHA512 7a0036c706b56d4431fbb3d54be77930aede8d8d1d0889a568bc0432d91b15026ac26ef4ccdc0f41a860a6adf1a88cf07d4c260c810f66f1a910ff568b4e90fb 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 EBUILD mate-session-manager-1.22.3-r2.ebuild 2015 BLAKE2B ba9bf1a3e493a51607a7ed20efd3813a8cc8c2065da337fd1c70f882ec3edfde87a974ba1692e5f0021b9b3486d99f4449787d22c966e1c42e3e8c5fc41dddfc SHA512 d536c0824f5da33bb1dadccbea862cb25b4d153ee17f7d958b77586064dac236434942e012bb2f2f20b0770bab7e6c90f8f5ec723fdb13da1acd31dc02bdd28a 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 -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 -Co-authored-by: Jorge Pizarro Callejas ---- - 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 -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; -- cgit v1.2.3