Changeset 7a8cbd82

Timestamp:

02/16/2019 07:18:44 AM (5 years ago)

Author:

DJ Lucas <dj@…>

Branches:

elogind

Children:

6a3628f

Parents:

3c68d94

Message:

Merge to HEAD 21170.
Add gnome-session elogind patch.

git-svn-id: svn://svn.linuxfromscratch.org/BLFS/branches/BOOK-elogind@21171 af4574ff-66df-0310-9fd7-8a98e5e911e0

Files:

• general/sysutils/accountsservice.xml (modified) (2 diffs)
• gnome/platform/gnome-session.xml (modified) (5 diffs)
• introduction/welcome/changelog.xml (modified) (1 diff)

general/sysutils/accountsservice.xml

@@ -110 +110 @@
     </para>
 
-<screen><userinput>mkdir build &amp;&amp;
+<screen revision="sysv"><userinput>mkdir build &amp;&amp;
 cd build &amp;&amp;
 
@@ -117 +117 @@
             -Delogind=true            \
             -Dsystemdsystemunitdir=no \
+            .. &amp;&amp;
+ninja</userinput></screen>
+
+<screen revision="systemd"><userinput>mkdir build &amp;&amp;
+cd build &amp;&amp;
+
+meson --prefix=/usr           \
+            -Dadmin_group=adm \
+            -Dsystemd=true    \
             .. &amp;&amp;
 ninja</userinput></screen>

gnome/platform/gnome-session.xml

@@ -73 +73 @@
     </itemizedlist>
 
+    <bridgehead renderas="sect3" revision="sysv">Additional Downloads</bridgehead>
+    <itemizedlist spacing="compact" revision="sysv">
+      <listitem>
+        <para>
+          Recommended patch:
+          <ulink url="&patch-root;/gnome-session-&gnome-session-version;-elogind-1.patch"/>
+        </para>
+      </listitem>
+    </itemizedlist>
+
     <bridgehead renderas="sect3">GNOME Session Dependencies</bridgehead>
 
@@ -78 +88 @@
     <para role="required">
       <xref linkend="dbus-glib"/>,
+      <phrase revision="sysv"><xref role="runtime" linkend="elogind"/>,</phrase>
       <xref linkend="gnome-desktop"/>,
       <xref linkend="json-glib"/>,
-      <xref linkend="mesa"/>, and
-      <xref linkend="upower"/>
+      <xref linkend="mesa"/>,
+      <phrase revision="systemd"><xref role="runtime" linkend="systemd"/>,</phrase>
+      and <xref linkend="upower"/>
     </para>
 
@@ -93 +105 @@
     </para>
    
-    <bridgehead renderas="sect4">Runtime Dependencies</bridgehead>
-    <para role="required">
-      <phrase revision="sysv"><xref role="runtime" linkend="elogind"/></phrase>
-      <phrase revision="systemd"><xref role="runtime" linkend="systemd"/></phrase>
-    </para>
-
     <para condition="html" role="usernotes">User Notes:
       <ulink url="&blfs-wiki;/gnome-session"/>
@@ -118 +124 @@
 <screen><userinput>sed 's@/bin/sh@/bin/sh -l@' -i gnome-session/gnome-session.in</userinput></screen>
 
+    <para revision="sysv">
+      Apply a patch to use <xref linkend="elogind"/> session tracking:
+    </para>
+
+<screen revision="sysv"><userinput>patch -Np1 -i ../gnome-session-&gnome-session-version;-elogind-1.patch</userinput></screen>
+
     <para>
       Install <application>GNOME Session</application> by
@@ -123 +135 @@
     </para>
 
-<screen><userinput>mkdir build &amp;&amp;
+<screen revision="sysv"><userinput>mkdir build &amp;&amp;
+cd    build &amp;&amp;
+
+meson --prefix=/usr           \
+      -Delogind=true          \
+      -Dsystemd=false         \
+      -Dsystemd_journal=false \
+      .. &amp;&amp;
+ninja</userinput></screen>
+
+<screen revision="systemd"><userinput>mkdir build &amp;&amp;
 cd    build &amp;&amp;
 

introduction/welcome/changelog.xml

@@ -46 +46 @@
       <para>February 16th, 2019</para>
       <itemizedlist>
+        <listitem revision="systemd">
+          <para>[dj] - Systemd is a required dependency for
+          gnome-session.</para>
+        </listitem>
         <listitem>
           <para>[dj] - Add sed to fix Gnome Color Manager build when
           DocBook-Utils is installed.</para>
+        </listitem>
+        <listitem revision="sysv">
+          <para>[dj] - Add gnome-session elogind patch.</para>
         </listitem>
         <listitem revision="sysv">