Changeset 529638d

Timestamp:

06/22/2019 05:08:08 PM (5 years ago)

Author:

DJ Lucas <dj@…>

Branches:

elogind

Children:

802fac7c

Parents:

af8f9a3a

Message:

Merge to HEAD 21716.

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

Files:

• general.ent (modified) (2 diffs)
• introduction/welcome/changelog.xml (modified) (1 diff)
• kde/plasma5/plasma-all.xml (modified) (1 diff)

general.ent

@@ -1 +1 @@
 <!-- $LastChangedBy$ $Date$ -->
 
-<!ENTITY day          "21">                   <!-- Always 2 digits -->
+<!ENTITY day          "22">                   <!-- Always 2 digits -->
 <!ENTITY month        "06">                   <!-- Always 2 digits -->
 <!ENTITY year         "2019">
@@ -7 +7 @@
 <!ENTITY copyholder   "The BLFS Development Team">
 <!ENTITY version      "&year;-&month;-&day; elogind">
-<!ENTITY releasedate  "June 21st, &year;">
+<!ENTITY releasedate  "June 22nd, &year;">
 <!ENTITY pubdate      "&year;-&month;-&day;"> <!-- metadata req. by TLDP -->
 <!ENTITY blfs-version "svn">                  <!-- svn|[release #] -->

introduction/welcome/changelog.xml

@@ -42 +42 @@
     </listitem>
     -->
+     <listitem>
+      <para>June 22nd, 2019</para>
+      <itemizedlist>
+        <listitem>
+          <para>[dj] - Only create xsessions symlink in Plasma if not installed
+          into /usr. Do the same for wayland sessions.</para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
+
     <listitem>
       <para>June 21st, 2019</para>

kde/plasma5/plasma-all.xml

@@ -259 +259 @@
 done < plasma-&plasma5-version;.md5
 
-exit
-
-install -dvm 755 /usr/share/xsessions &&
-cd /usr/share/xsessions/              &&
-[ -e plasma.desktop ]                 ||
-as_root ln -sfv $KF5_PREFIX/share/xsessions/plasma.desktop<!--
+exit</userinput></screen>
+
+    <para>
+      If you did not set <envar>$KF5_PREFIX</envar> to
+      <filename>/usr</filename>, create symlinks to allow display managers to
+      find <application>Plasma</application>:
+    </para>
+
+<screen><userinput>as_root install -dvm 755 /usr/share/xsessions              &amp;&amp;
+cd /usr/share/xsessions/                                   &amp;&amp;
+[ -e plasma.desktop ]                                      ||
+as_root ln -sfv $KF5_PREFIX/share/xsessions/plasma.desktop &amp;&amp;
+as_root install -dvm 755 /usr/share/wayland-sessions       &amp;&amp;
+cd /usr/share/wayland-sessions/                            &amp;&amp;
+[ -e plasma.desktop ]                                      ||
+as_root ln -sfv $KF5_PREFIX/share/wayland-sessions/plasma.desktop<!--
 cd $KF5_PREFIX/share/plasma/plasmoids