Author: pierre
Date: Tue Jan 29 08:41:39 2019
New Revision: 21062
Log:
Tweak KF5 and plasma for Python 3 use
Modified:
trunk/BOOK/general.ent
trunk/BOOK/introduction/welcome/changelog.xml
trunk/BOOK/kde/kf5/kf5-intro.xml
trunk/BOOK/kde/plasma5/plasma-all.xml
Modified: trunk/BOOK/general.ent
==============================================================================
--- trunk/BOOK/general.ent Mon Jan 28 16:30:09 2019 (r21061)
+++ trunk/BOOK/general.ent Tue Jan 29 08:41:39 2019 (r21062)
@@ -1,12 +1,12 @@
<!-- $LastChangedBy$ $Date$ -->
-<!ENTITY day "28"> <!-- Always 2 digits -->
+<!ENTITY day "29"> <!-- Always 2 digits -->
<!ENTITY month "01"> <!-- Always 2 digits -->
<!ENTITY year "2019">
<!ENTITY copyrightdate "2001-&year;">
<!ENTITY copyholder "The BLFS Development Team">
<!ENTITY version "&year;-&month;-&day;">
-<!ENTITY releasedate "January 28th, &year;">
+<!ENTITY releasedate "January 29th, &year;">
<!ENTITY pubdate "&year;-&month;-&day;"> <!-- metadata req. by TLDP -->
<!ENTITY blfs-version "svn"> <!-- svn|[release #] -->
<!ENTITY lfs-version "development"> <!-- x.y|development -->
Modified: trunk/BOOK/introduction/welcome/changelog.xml
==============================================================================
--- trunk/BOOK/introduction/welcome/changelog.xml Mon Jan 28 16:30:09
2019 (r21061)
+++ trunk/BOOK/introduction/welcome/changelog.xml Tue Jan 29 08:41:39
2019 (r21062)
@@ -43,6 +43,16 @@
-->
<listitem>
+ <para>January 29th, 2019</para>
+ <itemizedlist>
+ <listitem>
+ <para>[pierre] - Remove dependency on Python 2 for plasma, and
+ adapt PYTHONPATH for Python 3 in /etc/profile.d/kf5.sh.</para>
+ </listitem>
+ </itemizedlist>
+ </listitem>
+
+ <listitem>
<para>January 28th, 2019</para>
<itemizedlist>
<listitem>
Modified: trunk/BOOK/kde/kf5/kf5-intro.xml
==============================================================================
--- trunk/BOOK/kde/kf5/kf5-intro.xml Mon Jan 28 16:30:09 2019 (r21061)
+++ trunk/BOOK/kde/kf5/kf5-intro.xml Tue Jan 29 08:41:39 2019 (r21062)
@@ -84,15 +84,6 @@
<literal>Defaults env_keep += KF5_PREFIX</literal>
EOF</userinput></screen>
- <warning>
- <para>
- If <application>KDE4</application> is installed in
- <filename class="directory">/usr</filename>, some packages
- from this chapter might overwrite some programs installed
- by <application>KDE4</application> packages.
- </para>
- </warning>
-
</sect2>
<sect2>
@@ -128,7 +119,7 @@
pathappend $KF5_PREFIX/lib/qml QML2_IMPORT_PATH
-pathappend $KF5_PREFIX/lib/python&python2-majorver;/site-packages PYTHONPATH
+pathappend $KF5_PREFIX/lib/python&python3-majorver;/site-packages PYTHONPATH
pathappend $KF5_PREFIX/share/man MANPATH
# End /etc/profile.d/kf5.sh</literal>
Modified: trunk/BOOK/kde/plasma5/plasma-all.xml
==============================================================================
--- trunk/BOOK/kde/plasma5/plasma-all.xml Mon Jan 28 16:30:09 2019
(r21061)
+++ trunk/BOOK/kde/plasma5/plasma-all.xml Tue Jan 29 08:41:39 2019
(r21062)
@@ -70,7 +70,6 @@
<xref linkend="mesa"/> built with <xref linkend="wayland"/>,
<xref linkend="NetworkManager"/>,
<xref linkend="pulseaudio"/>,
- <xref linkend="python2"/>,
<xref linkend="qca"/>,
<xref linkend="taglib"/>, and
<xref linkend="xcb-util-cursor"/>
@@ -245,9 +244,10 @@
exit
-cd /usr/share/xsessions/
-[ -e plasma.desktop ] || as_root ln -sfv
$KF5_PREFIX/share/xsessions/plasma.desktop
-<!--
+install -dvm 755 /usr/share/xsessions &&
+cd /usr/share/xsessions/ &&
+[ -e plasma.desktop ] ||
+as_root ln -sfv $KF5_PREFIX/share/xsessions/plasma.desktop<!--
cd $KF5_PREFIX/share/plasma/plasmoids
for j in $(find -name \*.js); do
@@ -393,7 +393,7 @@
<systemitem class="username">root</systemitem> user, so that you can
differentiate between the two:</para>
-<screen><userinput role="root">sed '/^Name=/s/Plasma/Plasma on Xorg/' -i
/usr/share/xsessions/plasma.desktop</userinput></screen>
+<screen role="root"><userinput>sed '/^Name=/s/Plasma/Plasma on Xorg/' -i
/usr/share/xsessions/plasma.desktop</userinput></screen>
</sect2>
--
http://lists.linuxfromscratch.org/listinfo/blfs-book
FAQ: http://www.linuxfromscratch.org/blfs/faq.html
Unsubscribe: See the above information page
