Author: renodr
Date: Tue May 10 10:26:28 2016
New Revision: 17347
Log:
Archived KDE4
Fixed Xorg-Server installation instructions
Added:
branches/systemd/archive/kde4/
branches/systemd/archive/kde4/add/
- copied from r17346, branches/systemd/kde/add/
branches/systemd/archive/kde4/core/
- copied from r17346, branches/systemd/kde/core/
Deleted:
branches/systemd/kde/add/
branches/systemd/kde/core/
Modified:
branches/systemd/general.ent
branches/systemd/general/prog/subversion.xml
branches/systemd/introduction/welcome/changelog.xml
branches/systemd/kde/kde-intro.xml
branches/systemd/kde/kde.xml
branches/systemd/kde/phonon-backend-gstreamer.xml
branches/systemd/kde/phonon-backend-vlc.xml
branches/systemd/kde/phonon.xml
branches/systemd/kde/polkit-qt.xml
branches/systemd/multimedia/audioutils/audioutils.xml
branches/systemd/multimedia/cdwriteutils/cdwriteutils.xml
branches/systemd/x/installing/xorg-server.xml
branches/systemd/xsoft/office/libreoffice.xml
Modified: branches/systemd/general.ent
==============================================================================
--- branches/systemd/general.ent Tue May 10 00:36:23 2016 (r17346)
+++ branches/systemd/general.ent Tue May 10 10:26:28 2016 (r17347)
@@ -1,12 +1,12 @@
<!-- $LastChangedBy$ $Date$ -->
-<!ENTITY day "07"> <!-- Always 2 digits -->
+<!ENTITY day "10"> <!-- Always 2 digits -->
<!ENTITY month "05"> <!-- Always 2 digits -->
<!ENTITY year "2016">
<!ENTITY copyrightdate "2001-&year;">
<!ENTITY copyholder "The BLFS systemd Development Team">
<!ENTITY version "&year;-&month;-&day;">
-<!ENTITY releasedate "May 7th, &year;">
+<!ENTITY releasedate "May 10th, &year;">
<!ENTITY pubdate "&year;-&month;-&day;"> <!-- metadata req. by TLDP -->
<!ENTITY blfs-version "systemd"> <!-- svn|[release #] -->
<!ENTITY lfs-version "systemd"> <!-- x.y|development] -->
Modified: branches/systemd/general/prog/subversion.xml
==============================================================================
--- branches/systemd/general/prog/subversion.xml Tue May 10 00:36:23
2016 (r17346)
+++ branches/systemd/general/prog/subversion.xml Tue May 10 10:26:28
2016 (r17347)
@@ -109,7 +109,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: branches/systemd/introduction/welcome/changelog.xml
==============================================================================
--- branches/systemd/introduction/welcome/changelog.xml Tue May 10 00:36:23
2016 (r17346)
+++ branches/systemd/introduction/welcome/changelog.xml Tue May 10 10:26:28
2016 (r17347)
@@ -45,6 +45,19 @@
-->
<listitem>
+ <para>May 10th, 2016</para>
+ <itemizedlist>
+ <listitem>
+ <para>[renodr] - Archived KDE4.</para>
+ </listitem>
+ <listitem>
+ <para>[renodr] - Fixed Xorg-Server to use the correct patch. Thanks
+ goes to Paul Hentschel for discovering this and reporting.</para>
+ </listitem>
+ </itemizedlist>
+ </listitem>
+
+ <listitem>
<para>May 7th, 2016</para>
<itemizedlist>
<listitem>
Modified: branches/systemd/kde/kde-intro.xml
==============================================================================
--- branches/systemd/kde/kde-intro.xml Tue May 10 00:36:23 2016 (r17346)
+++ branches/systemd/kde/kde-intro.xml Tue May 10 10:26:28 2016 (r17347)
@@ -20,25 +20,25 @@
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
+ 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>
<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: branches/systemd/kde/kde.xml
==============================================================================
--- branches/systemd/kde/kde.xml Tue May 10 00:36:23 2016 (r17346)
+++ branches/systemd/kde/kde.xml Tue May 10 10:26:28 2016 (r17347)
@@ -20,20 +20,21 @@
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: branches/systemd/kde/phonon-backend-gstreamer.xml
==============================================================================
--- branches/systemd/kde/phonon-backend-gstreamer.xml Tue May 10 00:36:23
2016 (r17346)
+++ branches/systemd/kde/phonon-backend-gstreamer.xml Tue May 10 10:26:28
2016 (r17347)
@@ -118,8 +118,7 @@
<seglistitem>
<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>
<!--
Modified: branches/systemd/kde/phonon-backend-vlc.xml
==============================================================================
--- branches/systemd/kde/phonon-backend-vlc.xml Tue May 10 00:36:23 2016
(r17346)
+++ branches/systemd/kde/phonon-backend-vlc.xml Tue May 10 10:26:28 2016
(r17347)
@@ -109,8 +109,7 @@
<seglistitem>
<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>
<!--
Modified: branches/systemd/kde/phonon.xml
==============================================================================
--- branches/systemd/kde/phonon.xml Tue May 10 00:36:23 2016 (r17346)
+++ branches/systemd/kde/phonon.xml Tue May 10 10:26:28 2016 (r17347)
@@ -63,7 +63,7 @@
<para role="required">
<xref linkend="cmake"/>,
<xref linkend="glib2"/> and
- <xref linkend="qt4"/>
+ <xref linkend="qt5"/>
</para>
<bridgehead renderas="sect4">Optional</bridgehead>
@@ -80,9 +80,9 @@
<sect2 role="installation">
<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>
First, silence a lot of warnings caused by using the latest toolchain
@@ -119,19 +119,20 @@
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
the correct location.
- </para>
-<!--
+ </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>
@@ -148,14 +149,13 @@
None
</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>
</segmentedlist>
Modified: branches/systemd/kde/polkit-qt.xml
==============================================================================
--- branches/systemd/kde/polkit-qt.xml Tue May 10 00:36:23 2016 (r17346)
+++ branches/systemd/kde/polkit-qt.xml Tue May 10 10:26:28 2016 (r17347)
@@ -111,11 +111,13 @@
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>
@@ -129,8 +131,15 @@
<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>
Modified: branches/systemd/multimedia/audioutils/audioutils.xml
==============================================================================
--- branches/systemd/multimedia/audioutils/audioutils.xml Tue May 10
00:36:23 2016 (r17346)
+++ branches/systemd/multimedia/audioutils/audioutils.xml Tue May 10
10:26:28 2016 (r17347)
@@ -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: branches/systemd/multimedia/cdwriteutils/cdwriteutils.xml
==============================================================================
--- branches/systemd/multimedia/cdwriteutils/cdwriteutils.xml Tue May 10
00:36:23 2016 (r17346)
+++ branches/systemd/multimedia/cdwriteutils/cdwriteutils.xml Tue May 10
10:26:28 2016 (r17347)
@@ -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: branches/systemd/x/installing/xorg-server.xml
==============================================================================
--- branches/systemd/x/installing/xorg-server.xml Tue May 10 00:36:23
2016 (r17346)
+++ branches/systemd/x/installing/xorg-server.xml Tue May 10 10:26:28
2016 (r17347)
@@ -142,7 +142,7 @@
following command:
</para>
-<screen><userinput>patch -Np1 -i
../xorg-server-&xorg-server-version;-wayland_190-1.patch</userinput></screen>
+<screen><userinput>patch -Np1 -i
../xorg-server-&xorg-server-version;-add_prime_support-1.patch</userinput></screen>
<para>
Install the server by running the following commands:
Modified: branches/systemd/xsoft/office/libreoffice.xml
==============================================================================
--- branches/systemd/xsoft/office/libreoffice.xml Tue May 10 00:36:23
2016 (r17346)
+++ branches/systemd/xsoft/office/libreoffice.xml Tue May 10 10:26:28
2016 (r17347)
@@ -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
