Changeset 1c2bec77 for kde/kf5/kf5-intro.xml

Timestamp:

09/24/2015 09:44:04 PM (8 years ago)

Author:

Bruce Dubbs <bdubbs@…>

Branches:

10.0, 10.1, 11.0, 11.1, 11.2, 11.3, 7.10, 7.8, 7.9, 8.0, 8.1, 8.2, 8.3, 8.4, 9.0, 9.1, basic, bdubbs/svn, elogind, ken/inkscape-core-mods, lazarus, nosym, perl-modules, plabs/python-mods, qt5new, trunk, upgradedb, xry111/intltool, xry111/soup3, xry111/test-20220226

Children:

eca7a58

Parents:

6665210

Message:

Update to KDE Frameworks 5.14.
Update to Net-DNS-1.02 (perl module).
Update to KDE5 Applications ot 15.06.1.

Finish tagging kde4 apps.

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

File:

• kde/kf5/kf5-intro.xml (modified) (4 diffs)

kde/kf5/kf5-intro.xml

@@ -51 +51 @@
 <literal># Begin /etc/profile.d/kf5.sh
 
+. /etc/profile.d/qt5.sh
+
 export KF5_PREFIX=/usr
 
@@ -65 +67 @@
 EOF
 
-cat &gt; /etc/profile.d/qt5.sh &lt;&lt; "EOF"
-<literal># Begin Qt5 changes for KF5
-
-pathappend $QT5DIR/lib/qt5/plugins  QT_PLUGIN_PATH
-pathappend $QT5DIR/lib/qt5/qml      QML_IMPORT_PATH
-pathappend $QT5DIR/lib/qt5/qml      QML2_IMPORT_PATH
-
-# End Qt5 changes for KF5</literal>
 EOF</userinput></screen>
     <warning>
@@ -106 +100 @@
 <literal># Begin /etc/profile.d/kf5.sh
 
+. /etc/profile.d/qt5.sh
+
 export KF5_PREFIX=/opt/kf5
 
@@ -117 +113 @@
 
 pathappend /usr/lib/qt5/plugins        QT_PLUGIN_PATH
+pathappend $QT5DIR/plugins             QT_PLUGIN_PATH
 pathappend $KF5_PREFIX/lib/plugins     QT_PLUGIN_PATH
 
 pathappend /usr/lib/qt5/qml            QML_IMPORT_PATH
+pathappend $QT5DIR/qml                 QML_IMPORT_PATH
 pathappend $KF5_PREFIX/lib/qml         QML_IMPORT_PATH
 
 pathappend /usr/lib/qt5/qml            QML2_IMPORT_PATH
+pathappend $QT5DIR/qml                 QML2_IMPORT_PATH
 pathappend $KF5_PREFIX/lib/qml         QML2_IMPORT_PATH