diff --git a/desktop/gnome/base/gnome-session/actions.py b/desktop/gnome/base/gnome-session/actions.py index 61cf72f734..42c166758a 100644 --- a/desktop/gnome/base/gnome-session/actions.py +++ b/desktop/gnome/base/gnome-session/actions.py @@ -14,10 +14,7 @@ def setup(): # shelltools.system("""sed -i "/ systemd_dep/,+3d;/if enable_systemd/a \ systemd_userunitdir = '/tmp\'" meson.build""") mesontools.configure("--buildtype=release \ - -Dsystemd_session=disable \ - -Delogind=true \ - -Dsystemd=false \ - -Dsystemd_journal=false") + -Dsystemduserunitdir=/tmp") def build(): mesontools.build() @@ -28,5 +25,5 @@ def install(): # lfs shelltools.system("sed -e 's@^Exec=@&/usr/bin/dbus-run-session @' \ -i %s/usr/share/wayland-sessions/gnome-wayland.desktop" % get.installDIR()) - # pisitools.removeDir("/tmp") + pisitools.removeDir("/tmp") #shelltools.system("rm -rv %s/tmp/{*.d,*.target,*.service}" % get.installDIR()) diff --git a/desktop/gnome/base/gnome-session/pspec.xml b/desktop/gnome/base/gnome-session/pspec.xml index 19f7416691..b4a70dfdf1 100644 --- a/desktop/gnome/base/gnome-session/pspec.xml +++ b/desktop/gnome/base/gnome-session/pspec.xml @@ -29,7 +29,7 @@ meson - gentoo/support-elogind.patch + diff --git a/desktop/gnome/base/gnome-session46/actions.py b/desktop/gnome/base/gnome-session46/actions.py deleted file mode 100644 index 42c166758a..0000000000 --- a/desktop/gnome/base/gnome-session46/actions.py +++ /dev/null @@ -1,29 +0,0 @@ -#!/usr/bin/env python3 -# -*- coding: utf-8 -*- -# -# Licensed under the GNU General Public License, version 2. -# See the file http://www.gnu.org/copyleft/gpl.txt. - -from pisi.actionsapi import mesontools -from pisi.actionsapi import pisitools -from pisi.actionsapi import shelltools -from pisi.actionsapi import get - -def setup(): - shelltools.system("sed 's@/bin/sh@/bin/sh -l@' -i gnome-session/gnome-session.in") - # shelltools.system("""sed -i "/ systemd_dep/,+3d;/if enable_systemd/a \ systemd_userunitdir = '/tmp\'" meson.build""") - - mesontools.configure("--buildtype=release \ - -Dsystemduserunitdir=/tmp") - -def build(): - mesontools.build() - -def install(): - mesontools.install() - - # lfs - shelltools.system("sed -e 's@^Exec=@&/usr/bin/dbus-run-session @' \ - -i %s/usr/share/wayland-sessions/gnome-wayland.desktop" % get.installDIR()) - pisitools.removeDir("/tmp") - #shelltools.system("rm -rv %s/tmp/{*.d,*.target,*.service}" % get.installDIR()) diff --git a/desktop/gnome/base/gnome-session46/files/0001-revert-autostart-app-Strip-blacklisted-variables-fro.patch b/desktop/gnome/base/gnome-session46/files/0001-revert-autostart-app-Strip-blacklisted-variables-fro.patch deleted file mode 100644 index cfd9f4ba6c..0000000000 --- a/desktop/gnome/base/gnome-session46/files/0001-revert-autostart-app-Strip-blacklisted-variables-fro.patch +++ /dev/null @@ -1,67 +0,0 @@ -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/desktop/gnome/base/gnome-session46/files/gentoo/support-elogind.patch b/desktop/gnome/base/gnome-session46/files/gentoo/support-elogind.patch deleted file mode 100644 index 4173ccf041..0000000000 --- a/desktop/gnome/base/gnome-session46/files/gentoo/support-elogind.patch +++ /dev/null @@ -1,68 +0,0 @@ -From 4454f2a63394b69fba2c900151165ad8b5742f31 Mon Sep 17 00:00:00 2001 -From: Mart Raudsepp -Date: Sun, 15 Mar 2020 14:34:39 +0200 -Subject: [PATCH] meson: Support elogind - ---- - meson.build | 12 +++++++++--- - meson_options.txt | 1 + - 2 files changed, 10 insertions(+), 3 deletions(-) - -diff --git a/meson.build b/meson.build -index ef5132c6..7f68aaae 100644 ---- a/meson.build -+++ b/meson.build -@@ -124,8 +124,10 @@ enable_systemd = get_option('systemd') - enable_systemd_session = get_option('systemd_session') != 'disable' - use_systemd_session = get_option('systemd_session') == 'default' - enable_systemd_journal = get_option('systemd_journal') -+enable_elogind = get_option('elogind') - enable_consolekit = get_option('consolekit') --if enable_systemd or enable_consolekit -+assert(not (enable_systemd and enable_elogind), 'Can not support systemd and elogind at once') -+if enable_systemd or enable_elogind or enable_consolekit - session_bin_deps += dependency('gio-unix-2.0', version: glib_req_version) - - # Check for systemd -@@ -152,6 +154,10 @@ if enable_systemd or enable_consolekit - endif - - session_tracking = 'systemd' -+ elif enable_elogind -+ libelogind_dep = dependency('libelogind', version: '>= 239.4') -+ session_bin_deps += libelogind_dep -+ session_tracking = 'elogind' - endif - - # Check for ConsoleKit -@@ -161,7 +167,7 @@ if enable_systemd or enable_consolekit - - session_bin_deps += dbus_glib_dep - -- if enable_systemd -+ if enable_systemd or enable_elogind - session_tracking += ' (with fallback to ConsoleKit)' - else - session_tracking = 'ConsoleKit' -@@ -171,7 +177,7 @@ endif - if enable_systemd_session - assert(enable_systemd, 'Systemd support must be enabled when using systemd session management') - endif --config_h.set('HAVE_SYSTEMD', enable_systemd) -+config_h.set('HAVE_SYSTEMD', enable_systemd or enable_elogind) - config_h.set('ENABLE_SYSTEMD_SESSION', enable_systemd_session) - config_h.set('ENABLE_SYSTEMD_JOURNAL', enable_systemd_journal) - config_h.set('HAVE_CONSOLEKIT', enable_consolekit) -diff --git a/meson_options.txt b/meson_options.txt -index 4c05dc6e..512d1528 100644 ---- a/meson_options.txt -+++ b/meson_options.txt -@@ -1,4 +1,5 @@ - option('deprecation_flags', type: 'boolean', value: false, description: 'use *_DISABLE_DEPRECATED flags') -+option('elogind', type: 'boolean', value: true, description: 'Use elogind') - option('session_selector', type: 'boolean', value: false, description: 'enable building a custom session selector dialog') - option('systemd', type: 'boolean', value: true, description: 'Use systemd') - option('systemd_session', type: 'combo', choices: ['disable', 'enable', 'default'], value: 'default', description: 'Whether to include systemd session support and use it by default') --- -2.26.2 - diff --git a/desktop/gnome/base/gnome-session46/files/include-profile-env-variables.patch b/desktop/gnome/base/gnome-session46/files/include-profile-env-variables.patch deleted file mode 100644 index 09b87bbbce..0000000000 --- a/desktop/gnome/base/gnome-session46/files/include-profile-env-variables.patch +++ /dev/null @@ -1,21 +0,0 @@ -By default GNOME folks want us to put all stuff in /usr/share/gdm/env.d -(which is a lot of effort for no good reason for us) or use the systemd -specific /etc/environment.d to set environment variables. With this -patch we just force gnome-session's hand to include the env variables -of /etc/profile. - ---- gnome-session/gnome-session.in -+++ gnome-session/gnome-session.in -@@ -1,4 +1,4 @@ --#!/bin/sh -+#!/bin/bash - - if [ "x$XDG_SESSION_TYPE" = "xwayland" ] && - [ "x$XDG_SESSION_CLASS" != "xgreeter" ] && -@@ -25,4 +25,6 @@ if [ -n "$REGION" ]; then - export LC_PAPER=$REGION - fi - -+source /etc/profile -+ - exec @libexecdir@/gnome-session-binary "$@" diff --git a/desktop/gnome/base/gnome-session46/files/no-systemd-dep.patch b/desktop/gnome/base/gnome-session46/files/no-systemd-dep.patch deleted file mode 100644 index 8e55a0f798..0000000000 --- a/desktop/gnome/base/gnome-session46/files/no-systemd-dep.patch +++ /dev/null @@ -1,14 +0,0 @@ ---- 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/desktop/gnome/base/gnome-session46/files/support-elogind.patch b/desktop/gnome/base/gnome-session46/files/support-elogind.patch deleted file mode 100644 index 4173ccf041..0000000000 --- a/desktop/gnome/base/gnome-session46/files/support-elogind.patch +++ /dev/null @@ -1,68 +0,0 @@ -From 4454f2a63394b69fba2c900151165ad8b5742f31 Mon Sep 17 00:00:00 2001 -From: Mart Raudsepp -Date: Sun, 15 Mar 2020 14:34:39 +0200 -Subject: [PATCH] meson: Support elogind - ---- - meson.build | 12 +++++++++--- - meson_options.txt | 1 + - 2 files changed, 10 insertions(+), 3 deletions(-) - -diff --git a/meson.build b/meson.build -index ef5132c6..7f68aaae 100644 ---- a/meson.build -+++ b/meson.build -@@ -124,8 +124,10 @@ enable_systemd = get_option('systemd') - enable_systemd_session = get_option('systemd_session') != 'disable' - use_systemd_session = get_option('systemd_session') == 'default' - enable_systemd_journal = get_option('systemd_journal') -+enable_elogind = get_option('elogind') - enable_consolekit = get_option('consolekit') --if enable_systemd or enable_consolekit -+assert(not (enable_systemd and enable_elogind), 'Can not support systemd and elogind at once') -+if enable_systemd or enable_elogind or enable_consolekit - session_bin_deps += dependency('gio-unix-2.0', version: glib_req_version) - - # Check for systemd -@@ -152,6 +154,10 @@ if enable_systemd or enable_consolekit - endif - - session_tracking = 'systemd' -+ elif enable_elogind -+ libelogind_dep = dependency('libelogind', version: '>= 239.4') -+ session_bin_deps += libelogind_dep -+ session_tracking = 'elogind' - endif - - # Check for ConsoleKit -@@ -161,7 +167,7 @@ if enable_systemd or enable_consolekit - - session_bin_deps += dbus_glib_dep - -- if enable_systemd -+ if enable_systemd or enable_elogind - session_tracking += ' (with fallback to ConsoleKit)' - else - session_tracking = 'ConsoleKit' -@@ -171,7 +177,7 @@ endif - if enable_systemd_session - assert(enable_systemd, 'Systemd support must be enabled when using systemd session management') - endif --config_h.set('HAVE_SYSTEMD', enable_systemd) -+config_h.set('HAVE_SYSTEMD', enable_systemd or enable_elogind) - config_h.set('ENABLE_SYSTEMD_SESSION', enable_systemd_session) - config_h.set('ENABLE_SYSTEMD_JOURNAL', enable_systemd_journal) - config_h.set('HAVE_CONSOLEKIT', enable_consolekit) -diff --git a/meson_options.txt b/meson_options.txt -index 4c05dc6e..512d1528 100644 ---- a/meson_options.txt -+++ b/meson_options.txt -@@ -1,4 +1,5 @@ - option('deprecation_flags', type: 'boolean', value: false, description: 'use *_DISABLE_DEPRECATED flags') -+option('elogind', type: 'boolean', value: true, description: 'Use elogind') - option('session_selector', type: 'boolean', value: false, description: 'enable building a custom session selector dialog') - option('systemd', type: 'boolean', value: true, description: 'Use systemd') - option('systemd_session', type: 'combo', choices: ['disable', 'enable', 'default'], value: 'default', description: 'Whether to include systemd session support and use it by default') --- -2.26.2 - diff --git a/desktop/gnome/base/gnome-session46/pspec.xml b/desktop/gnome/base/gnome-session46/pspec.xml deleted file mode 100644 index b4a70dfdf1..0000000000 --- a/desktop/gnome/base/gnome-session46/pspec.xml +++ /dev/null @@ -1,124 +0,0 @@ - - - - - gnome-session - https://gitlab.gnome.org/GNOME/gnome-session - - Pisi Linux Admins - admins@pisilinux.org - - GPLv2 - GNOME session manager - gnome-session manages X11-compliant sessions with ConsoleKit daemon and starts GNOME core services - https://download.gnome.org/sources/gnome-session/46/gnome-session-46.0.tar.xz - - glib2-devel - intltool - xmlto - elogind-devel - gnome-desktop-devel - gtk3-devel - json-glib-devel - libXtst-devel - libSM-devel - startup-notification-devel - upower-devel - libseccomp-devel - xtrans - meson - - - - - - - - gnome-session - - gtk3 - glib2 - libSM - libICE - libX11 - libepoxy - libglvnd - json-glib - gnome-desktop - libXcomposite - elogind - - - /usr/bin - /usr/libexec - /usr/share/locale - /usr/share/man - /usr/share/doc - /usr/share/wayland-sessions - /usr/share/gnome-session - /usr/share/xsessions - /usr/share/glib-2.0 - /usr/share/GConf - /usr/share/xdg-desktop-portal/gnome-portals.conf - - - - - - 2024-03-19 - 46.0 - Version bump. - Mustafa Cinasal - muscnsl@gmail.com - - - 2023-09-17 - 45.0 - Version bump. - Mustafa Cinasal - muscnsl@gmail.com - - - 2023-03-20 - 44.0 - Version bump. - Mustafa Cinasal - muscnsl@gmail.com - - - 2022-11-02 - 43.0 - Version bump. - Mustafa Cinasal - muscnsl@gmail.com - - - 2022-03-22 - 42.0 - Version bump. - Mustafa Cinasal - muscnsl@gmail.com - - - 2022-01-12 - 41.3 - Version bump. - Mustafa Cinasal - muscnsl@gmail.com - - - 2021-09-26 - 40.1.1 - Rebuild. - Mustafa Cinasal - muscnsl@gmail.com - - - 2021-05-27 - 40.1.1 - First release for Pisi Linux. - Berk Çakar - berk2238@hotmail.com - - - diff --git a/desktop/gnome/base/gnome-session46/translations.xml b/desktop/gnome/base/gnome-session46/translations.xml deleted file mode 100644 index cd4fe188c5..0000000000 --- a/desktop/gnome/base/gnome-session46/translations.xml +++ /dev/null @@ -1,7 +0,0 @@ - - - gnome-session - GNOME oturum yöneticisi - gnome-session, ConsoleKit ile birlikte X11-uyumlu oturumları yönetir ve temel GNOME servislerini başlatır. - - \ No newline at end of file