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

Merge pull request #14649 from Rmys/master

Browse Source 
gnome-session rebuild
This commit is contained in:
Rmys
2024-08-05 15:02:11 +03:00
committed by GitHub
parent 5dc9c99e8e 1c5f17554d
commit 75d655c7eb
3 changed files with 28 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
desktop/gnome/base/gnome-session/actions.py
+2 -2
View File
@@ -23,7 +23,7 @@ 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())
# 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/gnome-session-46.0-meson-Support-elogind.patch
+18
View File
@@ -0,0 +1,18 @@
--- a/meson.build 2024-07-29 16:43:01.812864903 +0200
+++ b/meson.build 2024-07-29 16:54:16.654741387 +0200
@@ -113,8 +113,13 @@
pkgconfig_define: ['prefix', session_prefix])
endif
-libsystemd_dep = dependency('libsystemd', version: '>= 209', required: true)
-session_bin_deps += libsystemd_dep
+libsystemd_dep = dependency('libsystemd', version: '>= 209', required: false)
+if libsystemd_dep.found()
+ session_bin_deps += libsystemd_dep
+else
+ elogind_dep = dependency('libelogind', version: '>=209', required: true)
+ session_bin_deps += elogind_dep
+endif
configure_file(
output: 'config.h',
desktop/gnome/base/gnome-session/pspec.xml
+8 -1
View File
@@ -29,7 +29,7 @@
<Dependency>meson</Dependency>
</BuildDependencies>
<Patches>
<!-- <Patch>gentoo/support-elogind.patch</Patch> -->
<Patch>gentoo/gnome-session-46.0-meson-Support-elogind.patch</Patch>
</Patches>
</Source>
@@ -64,6 +64,13 @@
</Package>
<History>
<Update release="9">
<Date>2024-08-05</Date>
<Version>46.0</Version>
<Comment>Rebuild.</Comment>
<Name>Mustafa Cinasal</Name>
<Email>muscnsl@gmail.com</Email>
</Update>
<Update release="8">
<Date>2024-03-19</Date>
<Version>46.0</Version>