Changeset f81638e for xfce/core

Timestamp:

07/19/2014 11:32:06 PM (10 years ago)

Author:

Krejzi <krejzi@…>

Branches:

systemd-11177

Children:

7edfe43

Parents:

c6f9253

Message:

Begin merging Christophers work into systemd branch part 1.

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

Location:

xfce/core

Files:

• core.xml (modified) (1 diff)
• xfce4-session-systemd.xml (moved) (moved from xfce/core/xfce4-session.xml ) (3 diffs)

xfce/core/core.xml

@@ -52 +52 @@
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="xfdesktop.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="xfwm4.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="xfce4-session.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="xfce4-session-systemd.xml"/>
 
 </chapter>

xfce/core/xfce4-session-systemd.xml

@@ -75 +75 @@
     </itemizedlist>
 
+    <bridgehead renderas="sect3">Additional Downloads</bridgehead>
+    <itemizedlist spacing="compact">
+      <listitem>
+        <para>
+          Required patch:
+          <ulink url="&patch-root;/xfce4-session-&xfce4-session-version;-logind_suspend_hibernate-1.patch"/>
+        </para>
+      </listitem>
+    </itemizedlist>
+
     <bridgehead renderas="sect3">Xfce4 Session Dependencies</bridgehead>
 
@@ -97 +107 @@
     </para>
 
-<screen><userinput>./configure --prefix=/usr \
+<screen><userinput>patch -Np1 -i ..//xfce4-session-&xfce4-session-version;-logind_suspend_hibernate-1.patch &amp;&amp;
+./configure --prefix=/usr \
             --sysconfdir=/etc \
             --disable-legacy-sm &amp;&amp;
@@ -131 +142 @@
       There are several optional run time dependencies for
       <application>Xfce4</application>:
-      <xref linkend="consolekit"/>,
       <xref linkend="dbus"/>,
       <xref linkend="gnupg2"/>,
-      <xref linkend="hicolor-icon-theme"/> and
-      <xref linkend="openssh"/>
+      <xref linkend="hicolor-icon-theme"/>,
+      <xref linkend="openssh"/> and
+      <xref linkend="systemd"/> (for Logind)
     </para>
 
     <para>
       To launch <application>Xfce4</application> use the command
-      <command>startxfce4</command>. If you have <xref linkend="consolekit"/>
-      installed, use <command>startxfce4 --with-ck-launch</command>.
-      <application>ConsoleKit</application> is required to perform any
-      task that requires administrative access, including shut down
-      and reboot.
+      <command>startxfce4</command>.
     </para>