Changeset 2e633b6 for kde

Timestamp:

05/10/2016 05:26:28 PM (8 years ago)

Author:

Douglas R. Reno <renodr@…>

Branches:

systemd-13485

Children:

f080ae0e

Parents:

d7bee48

Message:

Archived KDE4
Fixed Xorg-Server installation instructions

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

Location:

kde

Files:

• kde-intro.xml (modified) (2 diffs)
• kde.xml (modified) (2 diffs)
• phonon-backend-gstreamer.xml (modified) (1 diff)
• phonon-backend-vlc.xml (modified) (1 diff)
• phonon.xml (modified) (5 diffs)
• polkit-qt.xml (modified) (3 diffs)

kde/kde-intro.xml

@@ -21 +21 @@
 
   <para>There are two versions of <application>KDE</application>. KDE4
-  is a mature version that combines libraries and the desktop environment
+  is a deprecated version that combines libraries and the desktop environment
   into one set of packages and has numerous appplications that can be
-  built on that base.  For KDE5, the libraries, now called KDE Frameworks
-  5 or KF5, are separate from the desktop environment called KDE Plasma 5.
-  Both envionments can be installed, but Plasma is not yet considered
-  stable.</para>
+  built on that base. It is no longer in BLFS.  For KDE5, the libraries, 
+  now called KDE Frameworks 5 or KF5, are separate from the desktop environment
+  called KDE Plasma 5. </para>
 
   <para>For more information visit the official KDE project site at
   <ulink url="http://www.kde.org/"/>.</para>
-
+<!--
   <sect2><title>Common Packages</title>
 
@@ -36 +35 @@
   These packages are presented in the following sections of this chapter.</para>
 
+  -->
   <!-- <para>The core <application>KDE</application> packages are listed in the
   recommended and tested build order. The additional
-  <application>KDE</application> packages can be built in any order.</para>-->
+  <application>KDE</application> packages can be built in any order.</para<
 
-  </sect2>
+  </sect2> -->
 
 </sect1>

kde/kde.xml

@@ -21 +21 @@
   It is based on the <application>Qt</application> framework.</para>
 
-  <para>There are two versions of <application>KDE</application>. KDE4
+<!--  <para>There are two versions of <application>KDE</application>. KDE4
   is a mature version that combines libraries and the desktop environment
   into one set of packages and has numerous appplications that can be
   built on that base.  For KDE5, the libraries, now called KDE Frameworks
   5 or KF5, are separate from the desktop environment called KDE Plasma 5.
-  </para>
+  </para> -->
 
   <para>For more information visit the official KDE project site at
@@ -33 +33 @@
 
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="introduction.xml"/>
+<!--
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="core/core.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="add/add.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="add/add.xml"/> -->
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="kf5/kf5.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="kf5-apps/kf5-apps.xml"/>

kde/phonon-backend-gstreamer.xml

@@ -119 +119 @@
         <seg>none</seg>
         <seg>phonon_gstreamer.so</seg>
-        <seg>&kde-dir;/lib/kde4/plugins/phonon_backend and 
-        &kde-dir;/share/kde4/services/phononbackends</seg>
+        <seg>/usr/lib/qt5/plugins/phonon4qt5_backend</seg>
       </seglistitem>
     </segmentedlist>

kde/phonon-backend-vlc.xml

@@ -110 +110 @@
         <seg>none</seg>
         <seg>phonon_vlc.so</seg>
-        <seg>&kde-dir;/lib/kde4/plugins/phonon_backend and 
-        &kde-dir;/share/kde4/services/phononbackends</seg>
+        <seg>/usr/lib/qt5/plugins/phonon4qt5_backend</seg>
       </seglistitem>
     </segmentedlist>

kde/phonon.xml

@@ -64 +64 @@
       <xref linkend="cmake"/>,
       <xref linkend="glib2"/> and
-      <xref linkend="qt4"/>
+      <xref linkend="qt5"/>
     </para>
 
@@ -81 +81 @@
     <title>Installation of Phonon</title>
 
-    <para>Make sure that <xref linkend="qt4"/> is compiled without the bundled
+<!--    <para>Make sure that <xref linkend="qt4"/> is compiled without the bundled
     <application>Phonon</application> library. This package provides
-    a better implementation.</para>
+    a better implementation.</para> -->
 
     <para>
@@ -120 +120 @@
     </para>
 
+<!--
     <para>
       <parameter>-DPHONON_INSTALL_QT_EXTENSIONS_INTO_SYSTEM_QT=FALSE</parameter>:
       This switch ensures that the plugins and mkspecs files get installed in
       the correct location.
-    </para>
-<!--
+    </para> -->
+
     <para>
       <option>-DPHONON_BUILD_PHONON4QT5=ON</option>: Use this switch if you want to
@@ -132 +133 @@
       versions can be installed at the same time without any conflicts.
     </para>
--->
+
 
   </sect2>
@@ -149 +150 @@
         </seg>
         <seg>
-          libphonon.so and
-          libphononexperimental.so
+          libphonon4qt5.so and
+          libphonon4qt5experimental.so
         </seg>
         <seg>
-          &kde-dir;/include/KDE/Phonon,
-          &kde-dir;/include/phonon,
-          &kde-dir;/lib/cmake/phonon, and
-          &kde-dir;/share/phonon
+          /usr/include/phonon4qt5,
+          /usr/lib/cmake/phonon4qt5, and
+          /usr/share/phonon4qt5
         </seg>
       </seglistitem>

kde/polkit-qt.xml

@@ -112 +112 @@
     </para>
 
+<!--
     <para>
       <parameter>-DUSE_QT4=TRUE</parameter>: This switch is used to ensure
@@ -117 +118 @@
       built even if <application>Qt5</application> is present.
     </para>
+-->
 
   </sect2>
@@ -130 +132 @@
       <seglistitem>
         <seg>none</seg>
-        <seg>libpolkit-qt-agent-1.so, libpolkit-qt-core-1.so and libpolkit-qt-gui-1.so</seg>
-        <seg>&kde-dir;/include/polkit-qt-1</seg>
+        <seg>
+             libpolkit-qt5-agent-1.so, 
+             libpolkit-qt5-core-1.so,
+             and libpolkit-qt5-gui-1.so
+        </seg>
+        <seg>
+             /usr/include/polkit-qt5-1 and
+             /usr/lib/cmake/PolkitQt5-1
+        </seg>
       </seglistitem>
     </segmentedlist>