Changeset 49828608

Timestamp:

07/24/2014 03:40:59 PM (10 years ago)

Author:

Krejzi <krejzi@…>

Branches:

7.6-blfs, 7.6-systemd, kde5-14269, kde5-14686, systemd-13485

Children:

93aad6a

Parents:

afd5400

Message:

Adjust kde5 section for systemd branch.

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

Location:

kde5

Files:

• frameworks/intro.xml (modified) (3 diffs)
• plasma/kinfocenter.xml (modified) (1 diff)
• plasma/kwin.xml (modified) (1 diff)
• plasma/starting.xml (modified) (3 diffs)

kde5/frameworks/intro.xml

@@ -27 +27 @@
       The instructions for <application>KDE Frameworks 5</application>
       packages assume that <xref linkend="qt5"/> was built with
-      recommended dependencies installed and that
-      <application>Qt5</application> executables are in user's $PATH.
+      recommended dependencies installed.
     </para>
   </important>
@@ -65 +64 @@
 export KF5_PREFIX=/usr
 export KF5_SYSCONFDIR=/etc
+
+export QT_SELECT=qt5
 
 pathappend /usr/lib/qt5/plugins        QT_PLUGIN_PATH
@@ -113 +114 @@
 export KF5_PREFIX=/opt/kf5
 export KF5_SYSCONFDIR=$KF5_PREFIX/etc
+
+export QT_SELECT=qt5
 
 pathappend $KF5_PREFIX               CMAKE_PREFIX_PATH

kde5/plasma/kinfocenter.xml

@@ -77 +77 @@
       <ulink url="http://www.linux1394.org/">libraw1394</ulink>,
       <xref linkend="pciutils"/> and
-      <ulink url="http://wayland.freedesktop.org/">Wayland</ulink>
+      <xref linkend="wayland"/>
     </para>
 

kde5/plasma/kwin.xml

@@ -75 +75 @@
     <bridgehead renderas="sect4">Optional</bridgehead>
     <para role="optional">
-      <ulink url="http://wayland.freedesktop.org/">Wayland</ulink>
+      <xref linkend="wayland"/>
     </para>
 

kde5/plasma/starting.xml

@@ -20 +20 @@
   <bridgehead renderas="sect4">Required</bridgehead>
   <para role="required">
-    <xref linkend="consolekit"/> (with configured PAM module),
-    <xref linkend="dbus"/> (built with X11 autolaunch support) and
+    <xref linkend="dbus"/>,
+    <xref linkend="systemd"/> (for Logind) and
     <xref linkend="xinit"/>
   </para>
@@ -37 +37 @@
 <literal># Begin .xinitrc
 
-exec ck-launch-session dbus-launch --exit-with-session startkde
+exec dbus-launch --exit-with-session startkde
 
 # End .xinitrc</literal>
@@ -50 +50 @@
     </tip>
 
-    <note>
-      <para>
-        If you are not using <application>ConsoleKit</application>, remove
-        <command>ck-launch-session</command> from the command above.
-      </para>
-    </note>
-
     <para>
       You can now start <application>KDE Plasma 5</application> using the