Changeset 86324838

Timestamp:

02/26/2023 09:02:44 PM (14 months ago)

Author:

Pierre Labastie <pierre.labastie@…>

Branches:

11.3, 12.0, 12.1, kea, ken/TL2024, ken/tuningfonts, lazarus, lxqt, plabs/newcss, python3.11, qt5new, rahul/power-profiles-daemon, renodr/vulkan-addition, trunk, xry111/llvm18, xry111/xf86-video-removal

Children:

60244f7

Parents:

8fdbeef

Message:

Tweak /usr/share/{x,wayland-}sessions files

Don't create a "deprecated directory, just remove spurious files
also fix starting gnome-wayland from lightdm

Files:

• gnome/platform/gnome-session.xml (modified) (2 diffs)
• x/wm/icewm.xml (modified) (1 diff)
• x/wm/openbox.xml (modified) (1 diff)
• x/wm/sawfish.xml (modified) (1 diff)

gnome/platform/gnome-session.xml

@@ -154 +154 @@
 
 
-  <para>This package creates two Xorg based .desktop files in the
-  /usr/share/xsessions/ directory.  Only one is needed in a 
-  BLFS system, so prevent the extra file showing up as an option 
-  in a window manager.  Also differentiate the X11 and Wayland versions
-  of Gnome.  As the &root; user:</para>
-
-<screen role="root"><userinput>mkdir -p /usr/share/xsessions/deprecated                                      &amp;&amp;
-mv -v /usr/share/xsessions/gnome-xorg.desktop /usr/share/xsessions/deprecated &amp;&amp;
-sed -i '/Name/s/$/ (X11)/' /usr/share/xsessions/gnome.desktop
-</userinput></screen>
+    <para>
+      This package creates two Xorg based <filename>.desktop</filename> files
+      in the <filename class="directory">/usr/share/xsessions/</filename>
+      directory, and two Wayland based <filename>.desktop</filename> files in
+      the <filename class="directory">/usr/share/wayland-sessions/</filename>
+      directory.  Only one is needed in each directory on a BLFS system, so
+      prevent the extra files showing up as options in a display manager.  As
+      the &root; user:
+    </para>
+
+<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">
@@ -171 +173 @@
 
 <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.-->
+    <para revision="sysv">
+      The startup sequence of gnome-wayland needs to create a dbus session.
+      On SysV, this has to be added to the shipped
+      <filename>gnome-wayland.desktop</filename> file, which is written for
+      systemd. As the &root; user:
+    </para>
+
+<screen role="root" revision="sysv"><userinput>sed -e 's@^Exec=@&amp;/usr/bin/dbus-run-session @' \
+    -i /usr/share/wayland-sessions/gnome-wayland.desktop</userinput></screen>
 
   </sect2>

x/wm/icewm.xml

@@ -136 +136 @@
 <screen role="root"><userinput>make install</userinput></screen>
 
-  <para>This package creates two .desktop files in the
-  /usr/share/xsessions/ directory.  Both are not needed in a 
-  BLFS system, so prevent the extra file showing up as an option 
-  in a window manager.  As the &root; user:</para>
-
-<screen role="root"><userinput>mkdir -p /usr/share/xsessions/deprecated &amp;&amp;
-mv -v /usr/share/xsessions/icewm.desktop /usr/share/xsessions/deprecated</userinput></screen>
+    <para>
+      This package creates two <filename>.desktop</filename> files in the
+      <filename class="directory">/usr/share/xsessions/</filename> directory.
+      Both are not needed in a BLFS system, so prevent the extra file showing
+      up as an option in a display manager.  As the &root; user:
+    </para>
+
+<screen role="root"><userinput>rm -v /usr/share/xsessions/icewm.desktop</userinput></screen>
 
   </sect2>

x/wm/openbox.xml

@@ -130 +130 @@
 <screen role="root"><userinput>make install</userinput></screen>
 
-  <para>This package creates three .desktop files in the
-  /usr/share/xsessions/ directory.  Two of these are not appropriate in a 
-  BLFS system, so prevent the extra files showing up as options 
-  in a window manager.  As the &root; user:</para>
-
-<screen role="root"><userinput>mkdir -p /usr/share/xsessions/deprecated &amp;&amp;
-mv -v /usr/share/xsessions/openbox-{gnome,kde}.desktop /usr/share/xsessions/deprecated</userinput></screen>
+    <para>
+      This package creates three <filename>.desktop</filename> files in the
+      <filename class="directory">/usr/share/xsessions/</filename> directory.
+      Two of these are not appropriate in a BLFS system, so prevent the extra
+      files showing up as options in a display manager.  As the &root; user:
+    </para>
+
+<screen role="root"><userinput>rm -v /usr/share/xsessions/openbox-{gnome,kde}.desktop</userinput></screen>
 
 </sect2>

x/wm/sawfish.xml

@@ -129 +129 @@
 <screen role="root"><userinput>make install</userinput></screen>
 
-  <para>This package creates six .desktop files in the
-  /usr/share/xsessions/ directory.  All but one are needed in a 
-  BLFS system, so prevent the extra files showing up as options
-  in a window manager.  As the &root; user:</para>
-
-<screen role="root"><userinput>mkdir -p /usr/share/xsessions/deprecated &amp;&amp;
-mv -v /usr/share/xsessions/sawfish-*.desktop /usr/share/xsessions/deprecated</userinput></screen>
+    <para>
+      This package creates six <filename>.desktop</filename> files in the
+      <filename class="directory">/usr/share/xsessions/</filename> directory.
+      All but one are needed in a BLFS system, so prevent the extra files
+      showing up as options in a display manager.  As the &root; user:
+    </para>
+
+<screen role="root"><userinput>rm -v /usr/share/xsessions/sawfish-*.desktop</userinput></screen>
 
   </sect2>