Author: bdubbs
Date: Wed Mar 23 17:23:12 2016
New Revision: 17157
Log:
Remove KDE4
Modified:
trunk/BOOK/general/prog/subversion.xml
trunk/BOOK/introduction/welcome/changelog.xml
trunk/BOOK/kde/kde-intro.xml
trunk/BOOK/kde/kde.xml
trunk/BOOK/kde/libdbusmenuqt.xml
trunk/BOOK/kde/phonon-backend-gstreamer.xml
trunk/BOOK/kde/phonon-backend-vlc.xml
trunk/BOOK/kde/phonon.xml
trunk/BOOK/kde/polkit-qt.xml
trunk/BOOK/lxqt/apps/qupzilla.xml
trunk/BOOK/multimedia/audioutils/audioutils.xml
trunk/BOOK/multimedia/cdwriteutils/cdwriteutils.xml
trunk/BOOK/xsoft/office/libreoffice.xml
Modified: trunk/BOOK/general/prog/subversion.xml
==============================================================================
--- trunk/BOOK/general/prog/subversion.xml Wed Mar 23 02:57:09 2016
(r17156)
+++ trunk/BOOK/general/prog/subversion.xml Wed Mar 23 17:23:12 2016
(r17157)
@@ -111,7 +111,7 @@
-->
<xref linkend="cyrus-sasl"/>,
<xref linkend="dbus"/>,
- <xref linkend="kdelibs"/> (for <ulink
url="http://utils.kde.org/projects/kwalletmanager/";>KWallet</ulink> support),
+<!-- <xref linkend="kdelibs"/> (for <ulink
url="http://utils.kde.org/projects/kwalletmanager/";>KWallet</ulink> support),
-->
<xref linkend="python2"/> (with sqlite support for the tests),
<xref linkend="ruby"/>, and
<xref linkend="swig"/> (for building Perl, Python and Ruby bindings)
Modified: trunk/BOOK/introduction/welcome/changelog.xml
==============================================================================
--- trunk/BOOK/introduction/welcome/changelog.xml Wed Mar 23 02:57:09
2016 (r17156)
+++ trunk/BOOK/introduction/welcome/changelog.xml Wed Mar 23 17:23:12
2016 (r17157)
@@ -48,6 +48,10 @@
<para>March 23rd, 2016</para>
<itemizedlist>
<listitem>
+ <para>[bdubbs] - Remove KDE4. Fixes
+ <ulink url="&blfs-ticket-root;7560">#760</ulink>.</para>
+ </listitem>
+ <listitem>
<para>[igor] - Update to mpg123-1.23.3. Fixes
<ulink url="&blfs-ticket-root;7638">#7638</ulink>.</para>
</listitem>
Modified: trunk/BOOK/kde/kde-intro.xml
==============================================================================
--- trunk/BOOK/kde/kde-intro.xml Wed Mar 23 02:57:09 2016 (r17156)
+++ trunk/BOOK/kde/kde-intro.xml Wed Mar 23 17:23:12 2016 (r17157)
@@ -19,26 +19,24 @@
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>
- <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>There are two versions of <application>KDE</application>. KDE4 is a
+ deprecated version that combines libraries and the desktop environment into
+ one set of packages. 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>
<para>There are several packages that are common to both versions of KDE.
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>
Modified: trunk/BOOK/kde/kde.xml
==============================================================================
--- trunk/BOOK/kde/kde.xml Wed Mar 23 02:57:09 2016 (r17156)
+++ trunk/BOOK/kde/kde.xml Wed Mar 23 17:23:12 2016 (r17157)
@@ -19,19 +19,20 @@
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>
- <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
<ulink url="http://www.kde.org/"/>.</para>
</partintro>
<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"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude";
href="plasma5/plasma5.xml"/>
Modified: trunk/BOOK/kde/libdbusmenuqt.xml
==============================================================================
--- trunk/BOOK/kde/libdbusmenuqt.xml Wed Mar 23 02:57:09 2016 (r17156)
+++ trunk/BOOK/kde/libdbusmenuqt.xml Wed Mar 23 17:23:12 2016 (r17157)
@@ -30,10 +30,10 @@
<title>Introduction to libdbusmenu-qt</title>
<para>This library provides a <application>Qt</application> implementation
- of the DBusMenu specification that exposes menus via DBus. Its
+ of the DBusMenu specification that exposes menus via DBus.<!-- Its
libraries are used by both KDE4 and KF5, but they must be linked to <xref
linkend='qt4'/> and <xref linkend='qt5'/> respectively. The two versions do
- not conflict with each other. </para>
+ not conflict with each other.--> </para>
&lfs79_checked;
@@ -63,7 +63,7 @@
<bridgehead renderas="sect4">Required</bridgehead>
<para role="required">
- <xref linkend="qt4"/> or <xref linkend="qt5"/>
+ <!--<xref linkend="qt4"/> or --><xref linkend="qt5"/>
</para>
<bridgehead renderas="sect4">Optional</bridgehead>
@@ -79,7 +79,7 @@
<sect2 role="installation">
<title>Installation of libdbusmenu-qt</title>
-
+<!--
<para>Install the qt4 based version of
<application>libdbusmenu-qt</application> by running the following
commands:</para>
@@ -101,15 +101,15 @@
<para>Now, as the <systemitem class="username">root</systemitem>
user:</para>
<screen role="root"><userinput>make install</userinput></screen>
-
- <para>Install the qt5 based version of
+-->
+ <para>Install <!--the qt5 based version of-->
<application>libdbusmenu-qt</application> by running the following
commands:</para>
-
+<!--
<note><para>If building both versions of this application, be sure
to remove the previous version of the source and reextract them from
the original tar file.</para></note>
-
+-->
<screen><userinput>mkdir build &&
cd build &&
@@ -136,10 +136,10 @@
<para><option>-DCMAKE_BUILD_TYPE=Release</option>: This switch is used to
build without debugging symbols and apply a higher level of compiler
optimizations.</para>
-
+<!--
<para><option>-DUSE_QT4=TRUE</option>: This switch is used to ensure that
Qt4 version of the library is built even if Qt5 is present.</para>
-
+-->
<para><option>-DWITH_DOC=OFF</option>: This option is set to avoid building
the API documentation. Omit it if you have
<application>doxygen</application>
installed and want the documentation.</para>
@@ -156,9 +156,8 @@
<seglistitem>
<seg>None</seg>
- <seg>libdbusmenu-qt.so and libdbusmenu-qt5.so</seg>
- <seg>/usr/lib/cmake/dbusmenu-qt5,
- /usr/include/dbusmenu-qt and
+ <seg>libdbusmenu-qt5.so</seg>
+ <seg>/usr/lib/cmake/dbusmenu-qt5 and
/usr/include/dbusmenu-qt5</seg>
</seglistitem>
</segmentedlist>
Modified: trunk/BOOK/kde/phonon-backend-gstreamer.xml
==============================================================================
--- trunk/BOOK/kde/phonon-backend-gstreamer.xml Wed Mar 23 02:57:09 2016
(r17156)
+++ trunk/BOOK/kde/phonon-backend-gstreamer.xml Wed Mar 23 17:23:12 2016
(r17157)
@@ -31,9 +31,9 @@
<para>This package provides a <application>Phonon</application> backend
which utilizes the <application>GStreamer</application> media framework.
- Its library is used by both KDE4 and KF5, but they must be linked to <xref
+<!-- Its library is used by both KDE4 and KF5, but they must be linked to
<xref
linkend="qt4"/> and <xref linkend="qt5"/> respectively. The two versions
- do not conflict with each other. </para>
+ do not conflict with each other.--> </para>
&lfs79_checked;
@@ -94,11 +94,10 @@
<sect2 role="installation">
<title>Installation of Phonon-backend-gstreamer</title>
- <para>For both build variants, fix the package to work with the
- latest gstreamer:</para>
+ <para>Fix the package to work with the latest gstreamer:</para>
<screen><userinput>patch -Np1 -i
../phonon-backend-gstreamer-&phonon-backend-gstreamer-version;-compatibility-1.patch</userinput></screen>
-
+<!--
<para>Install the qt4 based version of
<application>Phonon-backend-gstreamer</application> by running the
following commands:</para>
@@ -117,8 +116,8 @@
<para>Now, as the <systemitem class="username">root</systemitem>
user:</para>
<screen role="root"><userinput>make install</userinput></screen>
-
- <para>Install the qt5 based version of
+-->
+ <para>Install <!--the qt5 based version of-->
<application>Phonon-backend-gstreamer</application> by running the
following commands:</para>
@@ -169,10 +168,8 @@
<seglistitem>
<seg>none</seg>
- <seg>phonon_gstreamer.so (two versions in different directories)</seg>
- <seg>/usr/lib/kde4/plugins/phonon_backend,
- /usr/lib/qt5/plugins/phonon4qt5_backend, and
- /usr/share/kde4/services/phononbackends</seg>
+ <seg>phonon_gstreamer.so</seg>
+ <seg>/usr/lib/qt5/plugins/phonon4qt5_backend</seg>
</seglistitem>
</segmentedlist>
<!--
Modified: trunk/BOOK/kde/phonon-backend-vlc.xml
==============================================================================
--- trunk/BOOK/kde/phonon-backend-vlc.xml Wed Mar 23 02:57:09 2016
(r17156)
+++ trunk/BOOK/kde/phonon-backend-vlc.xml Wed Mar 23 17:23:12 2016
(r17157)
@@ -30,10 +30,10 @@
<title>Introduction to the Phonon-backend-vlc</title>
<para>This package provides a <application>Phonon</application> backend
- which utilizes the <application>VLC</application> media framework. Its
+ which utilizes the <application>VLC</application> media framework. <!--Its
library is used by both KDE4 and KF5, but they must be linked to <xref
linkend='qt4'/> and <xref linkend='qt5'/> respectively. The two versions do
- not conflict with each other.</para>
+ not conflict with each other.--></para>
&lfs79_checked;
@@ -74,7 +74,7 @@
<sect2 role="installation">
<title>Installation of Phonon-backend-vlc</title>
-
+<!--
<para>Install the qt4 based version of
<application>Phonon-backend-vlc</application> by running the following
commands:</para>
@@ -93,8 +93,8 @@
<para>Now, as the <systemitem class="username">root</systemitem>
user:</para>
<screen role="root"><userinput>make install</userinput></screen>
-
- <para>Install the qt5 based version of
+-->
+ <para>Install i<!--the qt5 based version of-->
<application>Phonon-backend-vlc</application> by running the following
commands:</para>
@@ -146,9 +146,7 @@
<seglistitem>
<seg>none</seg>
<seg>phonon_vlc.so</seg>
- <seg>/usr/lib/kde4/plugins/phonon_backend,
- /usr/lib/qt5/plugins/phonon4qt5_backend, and
- /usr/share/kde4/services/phononbackends</seg>
+ <seg>/usr/lib/qt5/plugins/phonon4qt5_backend</seg>
</seglistitem>
</segmentedlist>
<!--
Modified: trunk/BOOK/kde/phonon.xml
==============================================================================
--- trunk/BOOK/kde/phonon.xml Wed Mar 23 02:57:09 2016 (r17156)
+++ trunk/BOOK/kde/phonon.xml Wed Mar 23 17:23:12 2016 (r17157)
@@ -63,7 +63,7 @@
<para role="required">
<xref linkend="cmake"/>,
<xref linkend="glib2"/>, and
- <xref linkend="qt4"/> or <xref linkend="qt5"/>
+ <!--<xref linkend="qt4"/> or --><xref linkend="qt5"/>
</para>
<bridgehead renderas="sect4">Optional</bridgehead>
@@ -79,7 +79,7 @@
<sect2 role="installation">
<title>Installation of Phonon</title>
-
+<!--
<para>The <application>Phonon</application> libraries are used by both KDE4
and KF5, but they must be linked to <xref linkend="qt4"/> and <xref
linkend="qt5"/> respectively. The two versions do not conflict with each
@@ -117,6 +117,9 @@
<note><para>If the extracted files of the package are still present from a
qt4 version of the build, be sure to remove it and extract a fresh copy of
the source files.</para></note>
+-->
+ <para>Install <application>Phonon</application> by
+ running the following commands:</para>
<screen><userinput>source /usr/bin/setqt5 &&
@@ -151,7 +154,7 @@
<parameter>-DCMAKE_BUILD_TYPE=Release</parameter>: This switch is used
to apply higher level of the compiler optimizations.
</para>
-
+<!--
<para>
<parameter>-DPHONON_INSTALL_QT_EXTENSIONS_INTO_SYSTEM_QT=FALSE</parameter>:
This switch ensures that the plugins and mkspecs files get installed in
@@ -163,7 +166,7 @@
This switch sets the correct installation path for the
<application>D-Bus</application> interfaces file.
</para>
-
+-->
<para>
<parameter>-DPHONON_BUILD_PHONON4QT5=ON</parameter>: This switch is used
to
ensure that Qt5 version of the library is built even if Qt4 is present.
@@ -190,18 +193,12 @@
None
</seg>
<seg>
- libphonon.so,
libphonon4qt5.so
- libphononexperimental.so, and
libphonon4qt5experimental.so
</seg>
<seg>
- /usr/include/KDE/Phonon,
- /usr/include/phonon,
/usr/include/phonon4qt5,
- /usr/lib/cmake/phonon,
- /usr/lib/cmake/phonon4qt5,
- /usr/share/phonon. amd
+ /usr/lib/cmake/phonon4qt5, and
/usr/share/phonon4qt5
</seg>
</seglistitem>
Modified: trunk/BOOK/kde/polkit-qt.xml
==============================================================================
--- trunk/BOOK/kde/polkit-qt.xml Wed Mar 23 02:57:09 2016 (r17156)
+++ trunk/BOOK/kde/polkit-qt.xml Wed Mar 23 17:23:12 2016 (r17157)
@@ -30,9 +30,9 @@
<title>Introduction to Polkit-Qt</title>
<para><application>Polkit-Qt</application> provides an API to PolicyKit in
- the Qt environment. Its libraries are used by both KDE4 and KF5, but they
+ the Qt environment. <!--Its libraries are used by both KDE4 and KF5, but
they
must be linked to <xref linkend='qt4'/> and <xref linkend='qt5'/>
- respectively. The two versions do not conflict with each other. </para>
+ respectively. The two versions do not conflict with each other.--> </para>
&lfs79_checked;
@@ -73,7 +73,7 @@
<para role="required">
<xref linkend="cmake"/>,
<xref linkend="polkit"/>, and
- <xref linkend="qt4"/> or <xref linkend="qt5"/>
+ <!--<xref linkend="qt4"/>--> or <xref linkend="qt5"/>
</para>
<para condition="html" role="usernotes">User Notes:
@@ -83,7 +83,7 @@
<sect2 role="installation">
<title>Installation of Polkit-Qt</title>
-
+<!--
<para>Install the Qt4 based version of <application>Polkit-Qt</application>
by running the following commands:</para>
@@ -106,8 +106,8 @@
<para>Now, as the <systemitem class="username">root</systemitem>
user:</para>
<screen role="root"><userinput>make install</userinput></screen>
-
- <para>Install the Qt5 based version of <application>Polkit-Qt</application>
+-->
+ <para>Install <!--the Qt5 based version of
--><application>Polkit-Qt</application>
by running the following commands:</para>
<screen><userinput>source /usr/bin/setqt5 &&
@@ -145,13 +145,13 @@
class="directory">&kde-dir;/lib</filename> instead of <filename
class="directory">&kde-dir;/lib64</filename> on a 64 bit system.
</para>
-
+<!--
<para>
<parameter>-DUSE_QT4=TRUE</parameter>: This switch is used to ensure
that <application>Qt4</application> version of the library is
built even if <application>Qt5</application> is present.
</para>
-
+-->
</sect2>
<sect2 role="content">
@@ -164,17 +164,14 @@
<seglistitem>
<seg>none</seg>
- <seg>libpolkit-qt-agent-1.so,
+ <seg>
libpolkit-qt5-agent-1.so,
- libpolkit-qt-core-1.so,
- libpolkit-qt5-core-1.so,
- libpolkit-qt-gui-1.so, and
+ libpolkit-qt5-core-1.so, and
libpolkit-qt5-gui-1.so</seg>
- <seg>/usr/include/polkit-qt-1,
- /usr/include/polkit-qt5-1,
- /usr/lib/cmake/PolkitQt-1, and
+ <seg>
+ /usr/include/polkit-qt5-1 and
/usr/lib/cmake/PolkitQt5-1
- </seg>
+ </seg>
</seglistitem>
</segmentedlist>
<!--
Modified: trunk/BOOK/lxqt/apps/qupzilla.xml
==============================================================================
--- trunk/BOOK/lxqt/apps/qupzilla.xml Wed Mar 23 02:57:09 2016 (r17156)
+++ trunk/BOOK/lxqt/apps/qupzilla.xml Wed Mar 23 17:23:12 2016 (r17157)
@@ -85,7 +85,7 @@
<bridgehead renderas="sect4">Optional</bridgehead>
<para role="optional">
<xref linkend="gdb"/>,
- <xref linkend="kdelibs"/> (KWallet plugin),
+<!-- <xref linkend="kdelibs"/> (KWallet plugin), -->
<ulink url="http://hunspell.sourceforge.net/";>Hunspell</ulink>, and
<ulink
url="&gnome-download-ftp;/libgnome-keyring/">libgnome-keyring</ulink>
(Gnome-Keyring plugin)
</para>
Modified: trunk/BOOK/multimedia/audioutils/audioutils.xml
==============================================================================
--- trunk/BOOK/multimedia/audioutils/audioutils.xml Wed Mar 23 02:57:09
2016 (r17156)
+++ trunk/BOOK/multimedia/audioutils/audioutils.xml Wed Mar 23 17:23:12
2016 (r17157)
@@ -30,7 +30,7 @@
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude";
href="cdparanoia.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude"; href="freetts.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude"; href="audacious.xml"/>
- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"; href="amarok.xml"/>
+<!-- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude";
href="amarok.xml"/> -->
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude"; href="pnmixer.xml"/>
</chapter>
Modified: trunk/BOOK/multimedia/cdwriteutils/cdwriteutils.xml
==============================================================================
--- trunk/BOOK/multimedia/cdwriteutils/cdwriteutils.xml Wed Mar 23 02:57:09
2016 (r17156)
+++ trunk/BOOK/multimedia/cdwriteutils/cdwriteutils.xml Wed Mar 23 17:23:12
2016 (r17157)
@@ -38,7 +38,7 @@
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude"; href="cdrdao.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude";
href="dvd+rw-tools.xml"/>
- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"; href="k3b.xml"/>
+<!-- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"; href="k3b.xml"/>
-->
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude"; href="libburn.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude";
href="libisoburn.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude"; href="libisofs.xml"/>
Modified: trunk/BOOK/xsoft/office/libreoffice.xml
==============================================================================
--- trunk/BOOK/xsoft/office/libreoffice.xml Wed Mar 23 02:57:09 2016
(r17156)
+++ trunk/BOOK/xsoft/office/libreoffice.xml Wed Mar 23 17:23:12 2016
(r17157)
@@ -226,7 +226,7 @@
<xref linkend="desktop-file-utils"/>,
<xref linkend="doxygen"/> (not relevant if using --disable-odk),
<xref linkend="gdb"/>,
- <xref linkend="kdelibs"/>,
+<!-- <xref linkend="kdelibs"/>, -->
<xref linkend="mariadb"/> or <ulink
url="http://www.mysql.com/";>MySQL</ulink>,
<xref linkend="mitkrb"/>,
<xref linkend="nasm"/>,
--
http://lists.linuxfromscratch.org/listinfo/blfs-book
FAQ: http://www.linuxfromscratch.org/blfs/faq.html
Unsubscribe: See the above information page
