Changeset 33c8b427 for kde

Timestamp:

01/29/2019 04:41:39 PM (5 years ago)

Author:

Pierre Labastie <pieere@…>

Branches:

10.0, 10.1, 11.0, 11.1, 11.2, 11.3, 12.0, 12.1, 8.4, 9.0, 9.1, kea, ken/TL2024, ken/inkscape-core-mods, ken/tuningfonts, lazarus, lxqt, plabs/newcss, plabs/python-mods, python3.11, qt5new, rahul/power-profiles-daemon, renodr/vulkan-addition, trunk, upgradedb, xry111/intltool, xry111/llvm18, xry111/soup3, xry111/test-20220226, xry111/xf86-video-removal

Children:

88057a1

Parents:

7dda4c9

Message:

Tweak KF5 and plasma for Python 3 use

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

Location:

kde

Files:

• kf5/kf5-intro.xml (modified) (2 diffs)
• plasma5/plasma-all.xml (modified) (3 diffs)

kde/kf5/kf5-intro.xml

@@ -85 +85 @@
 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>
 
@@ -129 +120 @@
 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

kde/plasma5/plasma-all.xml

@@ -71 +71 @@
     <xref linkend="NetworkManager"/>,
     <xref linkend="pulseaudio"/>,
-    <xref linkend="python2"/>,
     <xref linkend="qca"/>,
     <xref linkend="taglib"/>, and
@@ -246 +245 @@
 exit
 
-cd /usr/share/xsessions/
-[ -e plasma.desktop ] || as_root ln -sfv $KF5_PREFIX/share/xsessions/plasma.desktop
-<!--
+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<!--
 cd $KF5_PREFIX/share/plasma/plasmoids
 
@@ -394 +394 @@
     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>