Merge remote-tracking branch 'refs/remotes/origin/trunk' into trunk

general/sysutils/cups-pk-helper.xml

@@ -88,9 +88,12 @@
       <xref linkend="polkit"/>
     </para>
 
+<!--
     <para condition="html" role="usernotes">
       Editor Notes: <ulink url="&blfs-wiki;/cups-pk-helper"/>
     </para>
+-->
+
   </sect2>
 
   <sect2 role="installation">

gnome/platform/gnome-session.xml

@@ -164,14 +164,14 @@ ninja</userinput></screen>
 
 <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,
       remove systemd units that are useless on SysV systems:
     </para>
 
 <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">

introduction/welcome/changelog.xml

@@ -45,6 +45,17 @@
           <para>[ken] - Use the gtk3 fork of epdfview. Addresses
           <ulink url="&blfs-ticket-root;18531">#18531</ulink>.</para>
         </listitem>
+        <listitem>
+          <para>[renodr] - Fix dependencies in adwaita-icon-theme.</para>
+        </listitem>
+        <listitem revision="sysv">
+          <para>[renodr] - Fix building GDM on SysV systems. Fixes
+          <ulink url="&blfs-ticket-root;18634">#18634</ulink>.</para>
+        </listitem>
+        <listitem revision="sysv">
+          <para>[renodr] - Remove systemd units in gnome-session that are not
+          useful on SysV systems.</para>
+        </listitem>
         <listitem>
           <para>[ken] - Update to dvisvgm-3.1.1. Fixes
           <ulink url="&blfs-ticket-root;18477">#18477</ulink>.</para>

lxqt/apps/qtermwidget.xml

@@ -74,9 +74,11 @@
 
     </para>
 
+<!--
     <para condition="html" role="usernotes">
       User Notes: <ulink url="&blfs-wiki;/qtermwidget"/>
     </para>
+-->
   </sect2>
 
   <sect2 role="installation">

lxqt/desktop/libqtxdg.xml

@@ -80,9 +80,11 @@
           (for <command>gtk-update-icon-cache</command>)
     </para>
 
+<!--
     <para condition="html" role="usernotes">
       User Notes: <ulink url="&blfs-wiki;/libqtxdg"/>
     </para>
+-->
   </sect2>
 
   <sect2 role="installation">

lxqt/desktop/libsysstat.xml

@@ -73,9 +73,11 @@
       <xref linkend="lxqt-build-tools"/>
     </para>
 
+<!--
     <para condition="html" role="usernotes">
       User Notes: <ulink url="&blfs-wiki;/libsysstat"/>
     </para>
+-->
   </sect2>
 
   <sect2 role="installation">

lxqt/desktop/lxqt-build-tools.xml

@@ -75,9 +75,11 @@
       &qt5-deps;
     </para>
 
+<!--
     <para condition="html" role="usernotes">
       User Notes: <ulink url="&blfs-wiki;/lxqt-build-tools"/>
     </para>
+-->
   </sect2>
 
   <sect2 role="installation">

lxqt/desktop/lxqt-kwindowsystem.xml

@@ -86,9 +86,11 @@
       &qt5-deps;
     </para>
 
+<!--
     <para condition="html" role="usernotes">
       User Notes: <ulink url="&blfs-wiki;/kwindowsystem"/>
     </para>
+-->
   </sect2>
 
   <sect2 role="installation">

lxqt/desktop/lxqt-menu-data.xml

@@ -73,9 +73,11 @@
       <xref linkend="lxqt-build-tools"/>
     </para>
 
+<!--
     <para condition="html" role="usernotes">
       User Notes: <ulink url="&blfs-wiki;/lxqt-menu-data"/>
     </para>
+-->
   </sect2>
 
   <sect2 role="installation">

lxqt/desktop/lxqt-themes.xml

@@ -73,9 +73,11 @@
       <xref linkend="lxqt-build-tools"/>
     </para>
 
+<!--
     <para condition="html" role="usernotes">
       User Notes: <ulink url="&blfs-wiki;/lxqt-themes"/>
     </para>
+-->
   </sect2>
 
   <sect2 role="installation">

x/dm/gdm.xml

@@ -118,11 +118,13 @@ useradd -c "GDM Daemon Owner" -d /var/lib/gdm -u 21 \
         -g gdm -s /bin/false gdm &&
 passwd -ql gdm</userinput></screen>
 
+<!--
     <para revision="sysv">
       First, adapt GDM to build without systemd present:
     </para>
 
 <screen revision="sysv"><userinput remap="pre">sed -i -r '/(^| )systemd_dep/d' meson.build</userinput></screen>
+-->
 
     <para>
       Install <application>GDM</application> by running the following
@@ -136,14 +138,15 @@ passwd -ql gdm</userinput></screen>
 mkdir build &amp;&amp;
 cd    build &amp;&amp;
 
-meson setup ..                    \
-      --prefix=/usr               \
-      --buildtype=release         \
-      -Dgdm-xsession=true         \
-      -Drun-dir=/run/gdm          \
-      -Dsystemd-journal=false     \
-      -Dsystemdsystemunitdir=/tmp \
-      -Dsystemduserunitdir=/tmp   &amp;&amp;
+meson setup ..                  \
+      --prefix=/usr             \
+      --buildtype=release       \
+      -Dgdm-xsession=true       \
+      -Drun-dir=/run/gdm        \
+      -Dlogind-provider=elogind \
+      -Dsystemd-journal=false   \
+      -Dsystemdsystemunitdir=no \
+      -Dsystemduserunitdir=no   &amp;&amp;
 ninja</userinput></screen>
 
 <screen revision="systemd"><userinput>mkdir build &amp;&amp;
@@ -164,10 +167,7 @@ ninja</userinput></screen>
       Now, as the <systemitem class="username">root</systemitem> user:
     </para>
 
-<screen role="root" revision="sysv"><userinput>ninja install &amp;&amp;
-rm -rv /tmp/*.{service,target.d}</userinput></screen>
-
-<screen role="root" revision="systemd"><userinput>ninja install</userinput></screen>
+<screen role="root"><userinput>ninja install</userinput></screen>
 
   </sect2>
 

x/icons/adwaita-icon-theme.xml

@@ -70,15 +70,26 @@
 
     <bridgehead renderas="sect3">Adwaita Icon Theme Dependencies</bridgehead>
 
+    <bridgehead renderas="sect4">Required</bridgehead>
+    <para role="required">
+      <xref linkend="gtk3"/> or <xref role="nodep" linkend="gtk4"/>, and
+      <xref linkend="librsvg"/>
+      <!-- Meson now unconditionally runs gtk-update-icon-cache and
+           gtk-encode-symbolic-svg after installing. See
+           https://lists.linuxfromscratch.org/sympa/arc/blfs-dev/2023-09/msg00128.html -->
+    </para>
+
     <bridgehead renderas="sect4">Optional</bridgehead>
     <para role="optional">
       <xref linkend="git"/>,
+<!--
       <xref linkend="gtk4"/> or <xref linkend="gtk3"/>
       (if present, <xref linkend="librsvg"/> is also
       required, and <command>gtk-update-icon-cache
       </command> and <command>gtk-encode-symbolic-svg</command> are run
       after installing),
-      <xref linkend="inkscape"/> and
+-->
+      <xref linkend="inkscape"/>, and
       <ulink url="https://launchpad.net/icontool/">Icon Tools</ulink>
     </para>