Changeset 2dbcc855

Timestamp:

06/10/2023 08:25:40 AM (4 months ago)

Author:

Pierre Labastie <pierre.labastie@…>

Branches:

12.0, kea, lazarus, lxqt, trunk, xry111/xf86-video-removal

Children:

ddafabd

Parents:

23b6848

Message:

Fix building gnome-session on SysV

File:

• gnome/platform/gnome-session.xml (modified) (6 diffs)

gnome/platform/gnome-session.xml

@@ -109 +109 @@
 <screen><userinput>sed 's@/bin/sh@/bin/sh -l@' -i gnome-session/gnome-session.in</userinput></screen>
 
-
+<!--
     <para revision="sysv">
       Adapt meson.build so that gnome-session can build without systemd:
@@ -115 +115 @@
 
 <screen revision="sysv"><userinput remap="pre">sed -i "/  systemd_dep/,+3d;/if enable_systemd/a \    systemd_userunitdir = '/tmp\'" meson.build</userinput></screen>
-
+-->
     <para>
       Install <application>GNOME Session</application> by
@@ -124 +124 @@
 cd    build &amp;&amp;
 
-meson setup --prefix=/usr           \
-            --buildtype=release     \
-            -Dsystemd_journal=false \
-            ..                      &amp;&amp;
+meson setup --prefix=/usr             \
+            --buildtype=release       \
+            -Dsystemd=false           \
+            -Dsystemd_journal=false   \
+            -Dsystemd_session=disable \
+            ..                        &amp;&amp;
 ninja</userinput></screen>
 
@@ -167 +169 @@
 <screen role="root"><userinput>rm -v /usr/share/xsessions/gnome.desktop &amp;&amp;
 rm -v /usr/share/wayland-sessions/gnome.desktop</userinput></screen>
-
+<!--
     <para revision="sysv">
       Now, as the <systemitem class="username">root</systemitem> user,
@@ -174 +176 @@
 
 <screen role="root" revision="sysv"><userinput>rm -rv /tmp/{*.d,*.target,*.service}</userinput></screen>
-
+-->
 <!-- this part is not needed on systemd, since the dbus session is created
 by systemd-user.-->
@@ -194 +196 @@
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
       href="../../xincludes/meson-buildtype-release.xml"/>
-   </sect2>
+
+    <para revision="sysv">
+      <parameter>-Dsystemd=false</parameter>,
+      <parameter>-Dsystemd_journal=false</parameter>,
+      and <parameter>-Dsystemd_session=disable</parameter>: Allow building
+      without systemd support on a SysV based system.
+    </para>
+
+  </sect2>
 
   <sect2 role="starting">