Changeset b9ae33f

Timestamp:

08/17/2014 03:38:57 PM (10 years ago)

Author:

Krejzi <krejzi@…>

Branches:

systemd-11177

Children:

ed99bef

Parents:

0670cc0

Message:

Fixes to KDE5.

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

Location:

kde5

Files:

• frameworks/intro.xml (modified) (2 diffs)
• frameworks/kdelibs4support.xml (modified) (1 diff)
• plasma/plasma-workspace.xml (modified) (1 diff)

kde5/frameworks/intro.xml

@@ -64 +64 @@
 export KF5_PREFIX=/usr
 export KF5_SYSCONFDIR=/etc
-
-export QT_SELECT=qt5
 
 pathappend /usr/lib/qt5/plugins        QT_PLUGIN_PATH
@@ -114 +112 @@
 export KF5_PREFIX=/opt/kf5
 export KF5_SYSCONFDIR=$KF5_PREFIX/etc
-
-export QT_SELECT=qt5
 
 pathappend $KF5_PREFIX                             CMAKE_PREFIX_PATH

kde5/frameworks/kdelibs4support.xml

@@ -86 +86 @@
 
     <para>
+      Fix detection of <application>DocBook XML</application> by running
+      the following command:
+    </para>
+
+<screen><userinput>sed -i "s:4.2:4.5:g" cmake/FindDocBookXML4.cmake</userinput></screen>
+
+    <para>
       Install <application>KDELibs4Support</application> by running the following
       commands:

kde5/plasma/plasma-workspace.xml

@@ -140 +140 @@
 
 <screen role="root"><userinput>make install</userinput></screen>
+
+    <para>
+      Make the startup script call <command>qtpaths-qt5</command> instead of
+      <command>qtpaths</command> in case <application>qtchooser</application>
+      is being used by running the following command as the
+      <systemitem class="username">root</systemitem> user:
+    </para>
+
+<screen role="root"><userinput>sed -i "s:qtpaths:&amp;-qt5:g" $KF5_PREFIX/bin/startkde</userinput></screen>
 
   </sect2>