diff --git a/srcpkgs/gnome-session/patches/0001-revert-autostart-app-Strip-blacklisted-variables-fro.patch b/srcpkgs/gnome-session/patches/0001-revert-autostart-app-Strip-blacklisted-variables-fro.patch new file mode 100644 index 00000000000..cfd9f4ba6cf --- /dev/null +++ b/srcpkgs/gnome-session/patches/0001-revert-autostart-app-Strip-blacklisted-variables-fro.patch @@ -0,0 +1,67 @@ +From 1de3575a1ea9cdb3579ad538108c51818847797c Mon Sep 17 00:00:00 2001 +From: Rasmus Thomsen +Date: Fri, 6 Dec 2019 11:48:02 +0100 +Subject: [PATCH] revert: autostart-app: Strip blacklisted variables from + autostart environment + +This breaks gnome-session on non-systemd systems. + +https://gitlab.gnome.org/GNOME/gnome-session/issues/44 +--- + gnome-session/gsm-autostart-app.c | 5 ----- + gnome-session/gsm-util.c | 6 ------ + gnome-session/gsm-util.h | 1 - + 3 files changed, 12 deletions(-) + +diff --git a/gnome-session/gsm-autostart-app.c b/gnome-session/gsm-autostart-app.c +index 6fd5915..01ba5f9 100644 +--- gnome-session/gsm-autostart-app.c ++++ gnome-session/gsm-autostart-app.c +@@ -997,7 +997,6 @@ autostart_app_start_spawn (GsmAutostartApp *app, + gboolean success; + GError *local_error; + const char *startup_id; +- const char * const *variable_blacklist; + const char * const *child_environment; + int i; + GAppLaunchContext *ctx; +@@ -1014,10 +1013,6 @@ autostart_app_start_spawn (GsmAutostartApp *app, + local_error = NULL; + ctx = g_app_launch_context_new (); + +- variable_blacklist = gsm_util_get_variable_blacklist (); +- for (i = 0; variable_blacklist[i] != NULL; i++) +- g_app_launch_context_unsetenv (ctx, variable_blacklist[i]); +- + child_environment = gsm_util_listenv (); + for (i = 0; child_environment[i] != NULL; i++) { + char **environment_tuple; +diff --git a/gnome-session/gsm-util.c b/gnome-session/gsm-util.c +index 02bc4a5..ada1225 100644 +--- gnome-session/gsm-util.c ++++ gnome-session/gsm-util.c +@@ -808,9 +808,3 @@ gsm_util_listenv (void) + return (const char * const *) child_environment; + + } +- +-const char * const * +-gsm_util_get_variable_blacklist (void) +-{ +- return variable_blacklist; +-} +diff --git a/gnome-session/gsm-util.h b/gnome-session/gsm-util.h +index bd7b698..8bca5f4 100644 +--- gnome-session/gsm-util.h ++++ gnome-session/gsm-util.h +@@ -50,7 +50,6 @@ char * gsm_util_generate_startup_id (void); + void gsm_util_setenv (const char *variable, + const char *value); + const char * const * gsm_util_listenv (void); +-const char * const * gsm_util_get_variable_blacklist(void); + + gboolean gsm_util_export_activation_environment (GError **error); + #ifdef HAVE_SYSTEMD +-- +2.24.0 + diff --git a/srcpkgs/gnome-session/patches/no-systemd-dep.patch b/srcpkgs/gnome-session/patches/no-systemd-dep.patch new file mode 100644 index 00000000000..8e55a0f7987 --- /dev/null +++ b/srcpkgs/gnome-session/patches/no-systemd-dep.patch @@ -0,0 +1,14 @@ +--- meson.build ++++ meson.build +@@ -130,10 +130,7 @@ if enable_systemd or enable_consolekit + + # Check for systemd + if enable_systemd +- systemd_dep = dependency('systemd', version: '>= 242', required: true) +- systemd_userunitdir = systemd_dep.get_pkgconfig_variable('systemduserunitdir', +- define_variable: ['prefix', prefix]) +- ++ systemd_userunitdir = '/tmp' + libsystemd_dep = dependency('libsystemd', version: '>= 209', required: false) + session_bin_deps += libsystemd_dep + diff --git a/srcpkgs/gnome-session/template b/srcpkgs/gnome-session/template index 4444f162bf1..c9bc4930c39 100644 --- a/srcpkgs/gnome-session/template +++ b/srcpkgs/gnome-session/template @@ -1,9 +1,9 @@ # Template file for 'gnome-session' pkgname=gnome-session -version=3.34.1 +version=3.38.0 revision=1 build_style=meson -configure_args="-Dsystemd_journal=false" +configure_args="-Dsystemd_journal=false -Dsystemd_session=disable" hostmakedepends="glib-devel intltool pkg-config xmlto" makedepends="elogind-devel gnome-desktop-devel gtk+3-devel json-glib-devel libglib-devel libICE-devel libSM-devel libXtst-devel startup-notification-devel @@ -15,4 +15,8 @@ maintainer="Enno Boland " license="GPL-2.0-or-later, LGPL-2.1-or-later" homepage="https://gitlab.gnome.org/GNOME/gnome-session" distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz" -checksum=d7801fe2d5a751b19cb58081771316a76aabd5c550cd58d4e4c6a5a4ed356660 +checksum=7bcc0eb2cdba4b3f6d1b459b3a30873b7bb65b383c1f6a5f63c3e3b5c7943d67 + +post_install() { + rm -rf ${DESTDIR}/tmp +}