Pisilinux/main
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

gnome * ver. bump

Browse Source
This commit is contained in:
Rmys
2024-05-31 16:19:09 +03:00
parent ad1b684e79
commit 630bd418b8
10 changed files with 3 additions and 404 deletions
Download Patch File Download Diff File Expand all files Collapse all files
desktop/gnome/base/gnome-session/actions.py
+2 -5
View File
@@ -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())
desktop/gnome/base/gnome-session/pspec.xml
+1 -1
View File
@@ -29,7 +29,7 @@
<Dependency>meson</Dependency>
</BuildDependencies>
<Patches>
<Patch>gentoo/support-elogind.patch</Patch>
<!-- <Patch>gentoo/support-elogind.patch</Patch> -->
</Patches>
</Source>
desktop/gnome/base/gnome-session46/actions.py
-29
View File
@@ -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())
desktop/gnome/base/gnome-session46/files/0001-revert-autostart-app-Strip-blacklisted-variables-fro.patch
-67
View File
@@ -1,67 +0,0 @@
From 1de3575a1ea9cdb3579ad538108c51818847797c Mon Sep 17 00:00:00 2001
From: Rasmus Thomsen <oss@cogitri.dev>
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
desktop/gnome/base/gnome-session46/files/gentoo/support-elogind.patch
-68
View File
@@ -1,68 +0,0 @@
From 4454f2a63394b69fba2c900151165ad8b5742f31 Mon Sep 17 00:00:00 2001
From: Mart Raudsepp <leio@gentoo.org>
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
desktop/gnome/base/gnome-session46/files/include-profile-env-variables.patch
-21
View File
@@ -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 "$@"
desktop/gnome/base/gnome-session46/files/no-systemd-dep.patch
-14
View File
@@ -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
desktop/gnome/base/gnome-session46/files/support-elogind.patch
-68
View File
@@ -1,68 +0,0 @@
From 4454f2a63394b69fba2c900151165ad8b5742f31 Mon Sep 17 00:00:00 2001
From: Mart Raudsepp <leio@gentoo.org>
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
desktop/gnome/base/gnome-session46/pspec.xml
-124
View File
@@ -1,124 +0,0 @@
<?xml version="1.0" ?>
<!DOCTYPE PISI SYSTEM "https://pisilinux.org/projeler/pisi/pisi-spec.dtd">
<PISI>
<Source>
<Name>gnome-session</Name>
<Homepage>https://gitlab.gnome.org/GNOME/gnome-session</Homepage>
<Packager>
<Name>Pisi Linux Admins</Name>
<Email>admins@pisilinux.org</Email>
</Packager>
<License>GPLv2</License>
<Summary>GNOME session manager</Summary>
<Description>gnome-session manages X11-compliant sessions with ConsoleKit daemon and starts GNOME core services</Description>
<Archive sha1sum="60981c9e0aa44f1ff5d8705e2b4f5f4ce03587e0" type="tarxz">https://download.gnome.org/sources/gnome-session/46/gnome-session-46.0.tar.xz</Archive>
<BuildDependencies>
<Dependency>glib2-devel</Dependency>
<Dependency>intltool</Dependency>
<Dependency>xmlto</Dependency>
<Dependency>elogind-devel</Dependency>
<Dependency versionFrom="44.0">gnome-desktop-devel</Dependency>
<Dependency>gtk3-devel</Dependency>
<Dependency>json-glib-devel</Dependency>
<Dependency>libXtst-devel</Dependency>
<Dependency>libSM-devel</Dependency>
<Dependency>startup-notification-devel</Dependency>
<Dependency>upower-devel</Dependency>
<Dependency>libseccomp-devel</Dependency>
<Dependency>xtrans</Dependency>
<Dependency>meson</Dependency>
</BuildDependencies>
<Patches>
<!-- <Patch>gentoo/support-elogind.patch</Patch> -->
</Patches>
</Source>
<Package>
<Name>gnome-session</Name>
<RuntimeDependencies>
<Dependency>gtk3</Dependency>
<Dependency>glib2</Dependency>
<Dependency>libSM</Dependency>
<Dependency>libICE</Dependency>
<Dependency>libX11</Dependency>
<Dependency>libepoxy</Dependency>
<Dependency>libglvnd</Dependency>
<Dependency>json-glib</Dependency>
<Dependency>gnome-desktop</Dependency>
<Dependency>libXcomposite</Dependency>
<Dependency>elogind</Dependency>
</RuntimeDependencies>
<Files>
<Path fileType="executable">/usr/bin</Path>
<Path fileType="executable">/usr/libexec</Path>
<Path fileType="localedata">/usr/share/locale</Path>
<Path fileType="man">/usr/share/man</Path>
<Path fileType="doc">/usr/share/doc</Path>
<Path fileType="data">/usr/share/wayland-sessions</Path>
<Path fileType="doc">/usr/share/gnome-session</Path>
<Path fileType="doc">/usr/share/xsessions</Path>
<Path fileType="doc">/usr/share/glib-2.0</Path>
<Path fileType="doc">/usr/share/GConf</Path>
<Path fileType="data">/usr/share/xdg-desktop-portal/gnome-portals.conf</Path>
</Files>
</Package>
<History>
<Update release="8">
<Date>2024-03-19</Date>
<Version>46.0</Version>
<Comment>Version bump.</Comment>
<Name>Mustafa Cinasal</Name>
<Email>muscnsl@gmail.com</Email>
</Update>
<Update release="7">
<Date>2023-09-17</Date>
<Version>45.0</Version>
<Comment>Version bump.</Comment>
<Name>Mustafa Cinasal</Name>
<Email>muscnsl@gmail.com</Email>
</Update>
<Update release="6">
<Date>2023-03-20</Date>
<Version>44.0</Version>
<Comment>Version bump.</Comment>
<Name>Mustafa Cinasal</Name>
<Email>muscnsl@gmail.com</Email>
</Update>
<Update release="5">
<Date>2022-11-02</Date>
<Version>43.0</Version>
<Comment>Version bump.</Comment>
<Name>Mustafa Cinasal</Name>
<Email>muscnsl@gmail.com</Email>
</Update>
<Update release="4">
<Date>2022-03-22</Date>
<Version>42.0</Version>
<Comment>Version bump.</Comment>
<Name>Mustafa Cinasal</Name>
<Email>muscnsl@gmail.com</Email>
</Update>
<Update release="3">
<Date>2022-01-12</Date>
<Version>41.3</Version>
<Comment>Version bump.</Comment>
<Name>Mustafa Cinasal</Name>
<Email>muscnsl@gmail.com</Email>
</Update>
<Update release="2">
<Date>2021-09-26</Date>
<Version>40.1.1</Version>
<Comment>Rebuild.</Comment>
<Name>Mustafa Cinasal</Name>
<Email>muscnsl@gmail.com</Email>
</Update>
<Update release="1">
<Date>2021-05-27</Date>
<Version>40.1.1</Version>
<Comment>First release for Pisi Linux.</Comment>
<Name>Berk Çakar</Name>
<Email>berk2238@hotmail.com</Email>
</Update>
</History>
</PISI>
desktop/gnome/base/gnome-session46/translations.xml
-7
View File
@@ -1,7 +0,0 @@
<PISI>
<Source>
<Name>gnome-session</Name>
<Summary xml:lang="tr">GNOME oturum yöneticisi</Summary>
<Description xml:lang="tr">gnome-session, ConsoleKit ile birlikte X11-uyumlu oturumları yönetir ve temel GNOME servislerini başlatır.</Description>
</Source>
</PISI>