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

gnome-44.0

Browse Source
This commit is contained in:
Rmys
2023-04-22 16:43:53 +03:00
parent 40523d7d10
commit 1502d96e4d
37 changed files with 650 additions and 163 deletions
Download Patch File Download Diff File Expand all files Collapse all files
desktop/gnome/base/gnome-session/actions.py
+8 -2
View File
@@ -11,9 +11,12 @@ 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""")
# 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")
def build():
@@ -22,5 +25,8 @@ def build():
def install():
mesontools.install()
pisitools.removeDir("/tmp")
# 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-session/files/gentoo/support-elogind.patch
+68
View File
@@ -0,0 +1,68 @@
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-session/pspec.xml
+10 -6
View File
@@ -11,13 +11,13 @@
<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="4c50ca44f48c57558fae6ca8d101f578da73858a" type="tarxz">https://download.gnome.org/sources/gnome-session/43/gnome-session-43.0.tar.xz</Archive>
<Archive sha1sum="1697040139a1c38b1165e5af67022916513810d4" type="tarxz">https://download.gnome.org/sources/gnome-session/44/gnome-session-44.0.tar.xz</Archive>
<BuildDependencies>
<Dependency>glib2-devel</Dependency>
<Dependency>intltool</Dependency>
<Dependency>xmlto</Dependency>
<Dependency>elogind-devel</Dependency>
<Dependency versionFrom="43.0">gnome-desktop-devel</Dependency>
<Dependency versionFrom="44.0">gnome-desktop-devel</Dependency>
<Dependency>gtk3-devel</Dependency>
<Dependency>json-glib-devel</Dependency>
<Dependency>libXtst-devel</Dependency>
@@ -29,10 +29,7 @@
<Dependency>meson</Dependency>
</BuildDependencies>
<Patches>
<!--Patch>0001-revert-autostart-app-Strip-blacklisted-variables-fro.patch</Patch>
<Patch>include-profile-env-variables.patch</Patch>
<Patch>no-systemd-dep.patch</Patch-->
<!-- <Patch>support-elogind.patch</Patch> -->
<Patch>gentoo/support-elogind.patch</Patch>
</Patches>
</Source>
@@ -66,6 +63,13 @@
</Package>
<History>
<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>