Changeset 8e6f4f8

Timestamp:

06/24/2015 11:03:07 PM (9 years ago)

Author:

Bruce Dubbs <bdubbs@…>

Branches:

10.0, 10.1, 11.0, 11.1, 11.2, 11.3, 12.0, 12.1, 7.10, 7.8, 7.9, 8.0, 8.1, 8.2, 8.3, 8.4, 9.0, 9.1, basic, bdubbs/svn, elogind, kea, ken/TL2024, ken/inkscape-core-mods, ken/tuningfonts, lazarus, lxqt, nosym, perl-modules, 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:

f594857

Parents:

1b0d0188

Message:

Reorganize KDE4 and put in placeholders for KF5 and Phonon 5.
Oxygen Icons are now put in /usr.

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

Files:

• archive/kde/intro/introduction.xml (moved) (moved from kde/intro/introduction.xml ) (1 diff)
• archive/kde/intro/kde-intro.xml (added)
• kde/add/add.xml (modified) (1 diff)
• kde/core/attica.xml (modified) (2 diffs)
• kde/core/config.xml (modified) (7 diffs)
• kde/core/core.xml (modified) (3 diffs)
• kde/core/oxygen-icons.xml (modified) (1 diff)
• kde/core/phonon-backend-gstreamer.xml (modified) (5 diffs)
• kde/core/phonon.xml (modified) (5 diffs)
• kde/core/polkit-qt.xml (modified) (1 diff)
• kde/core/pre-install-config.xml (moved) (moved from kde/intro/pre-install-config.xml ) (1 diff)
• kde/intro/kde-intro.xml (deleted)
• kde/kde.xml (modified) (1 diff)
• kde/kf5-apps/kf5-apps.xml (added)
• kde/kf5/extra-cmake-modules.xml (added)
• kde/kf5/kf5.xml (added)
• kde/plasma5/plasma5.xml (added)

archive/kde/intro/introduction.xml

@@ -17 +17 @@
 
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="kde-intro.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="pre-install-config.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="extra-cmake-modules.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="phonon.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="phonon-backend-gstreamer.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="phonon-backend-vlc.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="polkit-qt.xml"/>
 
 </chapter>

kde/add/add.xml

@@ -14 +14 @@
   <?dbhtml filename="add.html"?>
 
-  <title>KDE Additional Packages</title>
+  <title>KDE4 Additional Packages</title>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="konsole.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="kate.xml"/>

kde/core/attica.xml

@@ -65 +65 @@
     </para>
 
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional">
-      <xref linkend="qt5"/> (requires
-      <ulink url="http://quickgit.kde.org/index.php?p=extra-cmake-modules.git">
-      extra-cmake-modules</ulink>)
-    </para>
-
     <para condition="html" role="usernotes">User Notes:
     <ulink url="&blfs-wiki;/attica"/></para>
@@ -111 +104 @@
       <parameter>-DQT4_BUILD=ON</parameter>: This switch forces the package
       to build against <application>Qt4</application> even if
-      <application>Qt5</application> is present on the system. Remove it if
-       you want to build the package against <application>Qt5</application>.
+      <application>Qt5</application> is present on the system. 
     </para>
 

kde/core/config.xml

@@ -6 +6 @@
 ]>
 
-<sect1 id="kde-core-config" xreflabel="Starting KDE">
+<sect1 id="kde-core-config" xreflabel="Starting KDE4">
   <?dbhtml filename="config.html"?>
 
@@ -14 +14 @@
   </sect1info>
 
-  <title>Starting KDE</title>
+  <title>Starting KDE4</title>
 
-  <bridgehead renderas="sect3">KDE Startup Dependencies</bridgehead>
+  <bridgehead renderas="sect3">KDE4 Startup Dependencies</bridgehead>
 
   <bridgehead renderas="sect4">Optional</bridgehead>
@@ -25 +25 @@
   <para>After <application>Kde-workspace</application> has been installed, the
   first important milestone has been reached. Now you need to configure your
-  system to start KDE.</para>
+  system to start KDE4.</para>
 
   <sect2 role="content">
-  <title>Starting KDE from the command prompt</title>
+  <title>Starting KDE4 from the command prompt</title>
 
- <para>To start <application>KDE</application> from the command prompt, you
+ <para>To start <application>KDE4</application> from the command prompt, you
  first need to modify your <filename>.xinitrc</filename> file:</para>
 
@@ -44 +44 @@
     <userinput>ck-launch-session</userinput>.</para></note>
 
-    <para>You can now start KDE using the <command>startx</command> command.</para>
+    <para>You can now start KDE4 using the <command>startx</command> command.</para>
 
     </sect2>
 
     <sect2 role="content">
-    <title>Starting KDE at boot</title>
+    <title>Starting KDE4 at boot</title>
 
-    <para>KDE comes with a graphical login interface called KDM (the KDE Display
+    <para>KDE4 comes with a graphical login interface called KDM (the KDE4 Display
     Manager), which provides a customizable graphical login at boot. To use KDM,
     you need to edit your <filename>/etc/inittab</filename> file (as the
@@ -66 +66 @@
 <screen><userinput>sed -i 's#id:3:initdefault:#id:5:initdefault:#' /etc/inittab</userinput></screen>
 
-    <para>You can now restart your system and see the KDE login
+    <para>You can now restart your system and see the KDE4 login
     screen.</para>
 
@@ -79 +79 @@
          &kde-download-http;applications/&kde-apps-version;/src/kde-l10n/</ulink>.
     See <xref linkend="kde-add-pkgs"/> for build instructions. If you are in a
-    KDE session when installing a new language and configure KDE to use it, the
+    KDE4 session when installing a new language and configure KDE4 to use it, the
     session needs to be restarted, in order to see the effects.</para>
 
@@ -85 +85 @@
 
   <sect2 role="content">
-    <title>Installing further KDE packages</title>
+    <title>Installing further KDE4 packages</title>
 
     <para>Every subsequent package can be built while having
-    <application>KDE</application> up and running, but remember to keep
+    <application>KDE4</application> up and running, but remember to keep
     <envar>&kde-dir;</envar> and <envar>&qt4-dir;</envar> set.</para>
 

kde/core/core.xml

@@ -14 +14 @@
   <?dbhtml filename="core.html"?>
 
-  <title>The KDE Core</title>
+  <title>The KDE4 Core</title>
 
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="pre-install-config.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="automoc4.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="phonon.xml"/>
@@ -23 +24 @@
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="attica.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="qimageblitz.xml"/>
-<!-- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="shrdesktopontologies.xml"/>-->
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="polkit-qt.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="oxygen-icons.xml"/>
@@ -32 +32 @@
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="baloo-widgets.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="polkit-kde-agent.xml"/>
-<!--  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="nepomuk-core.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="nepomuk-widgets.xml"/> -->
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="kactivities.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="kde-runtime.xml"/>

kde/core/oxygen-icons.xml

@@ -75 +75 @@
     the following commands:</para>
 
+    <note><para>Unlike most packages in this section, the icons are placed
+    in /usr so other applications can find them.</para></note>
+
 <screen><userinput>mkdir build &amp;&amp;
 cd    build &amp;&amp;
 
-cmake -DCMAKE_INSTALL_PREFIX=&kde-dir; -Wno-dev ..</userinput></screen>
+cmake -DCMAKE_INSTALL_PREFIX=/usr -Wno-dev ..</userinput></screen>
 
     <para>

kde/core/phonon-backend-gstreamer.xml

@@ -62 +62 @@
     <para role="required">
     <xref linkend="gstreamer10"/>,
-    <xref linkend="libxml2"/> and
+    <xref linkend="libxml2"/>, and
     <xref linkend="phonon"/>
     </para>
@@ -70 +70 @@
     <xref linkend="gst10-plugins-base"/> (needed for output to ALSA),
     <xref linkend="gst10-plugins-good"/> (needed for output to PulseAudio),
-    <xref linkend="gst10-plugins-bad"/> (needed for AAC/M4A support), and
+    <xref linkend="gst10-plugins-bad"/>  (needed for AAC/M4A support), and
     <xref linkend="gst10-plugins-ugly"/> (needed for MP3 support)
-    </para>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional">
-    <xref linkend="qt5"/>
     </para>
 
@@ -87 +82 @@
     <title>Installation of Phonon-backend-gstreamer</title>
 
-    <para>Install <application>Phonon-backend-gstreamer</application> by running the following
-    commands:</para>
+    <para>Install <application>Phonon-backend-gstreamer</application> by
+    running the following commands:</para>
+
+    <note>
+      <para>
+        If you have both Qt4 and Qt5 installed, be sure to run
+        <userinput>source setqt4</userinput> before installing this package.
+      </para>
+    </note> 
 
 <screen><userinput>mkdir build &amp;&amp;
@@ -108 +110 @@
     <title>Command Explanations</title>
 
-    <para><option>-DCMAKE_BUILD_TYPE=Release</option>: This switch is used to apply
-    higher level of compiler optimizations.</para>
+    <para><option>-DCMAKE_BUILD_TYPE=Release</option>: This switch is used to
+    apply higher level of compiler optimizations.</para>
 
   </sect2>
@@ -124 +126 @@
         <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/kde4/plugins/phonon_backend and 
+             /usr/share/kde4/services/phononbackends</seg>
       </seglistitem>
     </segmentedlist>

kde/core/phonon.xml

@@ -31 +31 @@
 
     <para><application>Phonon</application> is the multimedia API for KDE4.
-    It replaces the old <application>aRts</application>, that is no longer
-    supported by KDE. Phonon needs either the GStreamer or VLC backend.</para>
+    It replaces the old <application>aRts</application> package.
+    Phonon needs either the GStreamer or VLC backend.</para>
 
     &lfs77_checked; &gcc5_checked;
@@ -62 +62 @@
     <bridgehead renderas="sect4">Required</bridgehead>
     <para role="required">
-      <!--<xref linkend="automoc4"/> and-->
       <xref linkend="cmake"/>,
-      <xref linkend="glib2"/> and
-      <xref linkend="qt4"/>
+      <xref linkend="glib2"/>, and
+      <xref linkend="qt4"/> 
     </para>
 
     <bridgehead renderas="sect4">Optional</bridgehead>
     <para role="optional">
-      <xref linkend="pulseaudio"/>,
-      <xref linkend="qt5"/> and
+      <xref linkend="pulseaudio"/> and
       <ulink url="http://projects.kde.org/projects/kdesupport/libqzeitgeist/">QZeitgeist</ulink>
     </para>
@@ -83 +81 @@
     <title>Installation of Phonon</title>
 
-    <para>Make sure that <xref linkend="qt4"/> is compiled without the bundled
+    <para>Make sure <xref linkend="qt4"/> has been built without the bundled
     <application>Phonon</application> library. This package provides
     a better implementation.</para>
 
-    <note><para>If you have both Qt4 and Qt5 installed, be sure to run 
-    <userinput>source setqt4</userinput> before installing Phonon.
-    </para></note>
+    <note>
+      <para>
+        If you have both Qt4 and Qt5 installed, be sure to run 
+        <userinput>source setqt4</userinput> before installing Phonon.
+      </para>
+
+    </note>
   
     <para>Install <application>Phonon</application> by running the following
     commands:</para>
 
-<!-- CMAKE_INSTALL_LIBDIR is used so the package doesn't write over lib64 symlink on 64 bit system -->
-<screen><userinput>mkdir build &amp;&amp;
+<screen><userinput>sed -i "s:BSD_SOURCE:DEFAULT_SOURCE:g" cmake/FindPhononInternal.cmake &amp;&amp;
+
+mkdir build &amp;&amp;
 cd    build &amp;&amp;
 
@@ -116 +119 @@
 
     <para>
+      <command>sed ... cmake/FindPhononInternal.cmake</command>: Silence
+      a lot of warnings caused by the latest toolchain.
+    </para>
+
+    <para>
       <parameter>-DCMAKE_BUILD_TYPE=Release</parameter>: This switch is used
       to apply higher level of the compiler optimizations.
@@ -131 +139 @@
       <application>D-Bus</application> interfaces file.
     </para>
-
-<!--
-    <para>
-      <option>-DPHONON_BUILD_PHONON4QT5=ON</option>: Use this switch if you want to
-      build <application>Phonon</application> against <application>Qt5</application>.
-      Note that both <application>Qt4</application> and <application>Qt5</application>
-      versions can be installed at the same time without any conflicts.
-    </para>
--->
 
   </sect2>

kde/core/polkit-qt.xml

@@ -90 +90 @@
 
 cmake -DCMAKE_INSTALL_PREFIX=&kde-dir; \
-      -DCMAKE_BUILD_TYPE=Release       \
-      -DCMAKE_INSTALL_LIBDIR=lib       \
-      -DUSE_QT4=TRUE                   \
+      -DCMAKE_BUILD_TYPE=Release         \
+      -DCMAKE_INSTALL_LIBDIR=lib         \
+      -DUSE_QT4=TRUE                     \
       -Wno-dev .. &&
 make</userinput></screen>

kde/core/pre-install-config.xml

@@ -14 +14 @@
   </sect1info>
 
-  <title>KDE Pre-installation Configuration</title>
+  <title>KDE4 Pre-installation Configuration</title>
 
   <note><para>If you did not install <application>Xorg</application> in

kde/kde.xml

@@ -14 +14 @@
   <?dbhtml filename="kde.html" dir="kde"?>
 
-  <title>KDE</title>
+  <title>Introduction to KDE</title>
+<partintro>
+  <para><application>KDE</application> is a comprehensive desktop environment
+  with a huge number of applications written for it and a huge amount of users.
+  It is based on the <application>Qt</application> framework.</para>
 
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="intro/introduction.xml"/>
+  <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.
+  Both envionments can be installed, but Plasma is not yet considered 
+  stable.</para>
+
+  <para>For more information visit the official KDE project site at
+  <ulink url="http://www.kde.org/"/>.</para>
+</partintro>
+<!--  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="intro/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="kf5/kf5.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="kf5-apps/kf5-apps.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="plasma5/plasma5.xml"/>
 <!--
   Language packs!