Changeset 8e6f4f8 for kde/core


Ignore:
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, 12.2, 7.10, 7.8, 7.9, 8.0, 8.1, 8.2, 8.3, 8.4, 9.0, 9.1, basic, bdubbs/svn, elogind, gimp3, 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/for-12.3, xry111/intltool, xry111/llvm18, xry111/soup3, xry111/spidermonkey128, 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

Location:
kde/core
Files:
7 edited
1 moved

Legend:

Unmodified
Added
Removed

  • kde/core/attica.xml

    r1b0d0188 r8e6f4f8  
    6565    </para>
    6666
    67     <bridgehead renderas="sect4">Optional</bridgehead>
    68     <para role="optional">
    69       <xref linkend="qt5"/> (requires
    70       <ulink url="http://quickgit.kde.org/index.php?p=extra-cmake-modules.git">
    71       extra-cmake-modules</ulink>)
    72     </para>
    73 
    7467    <para condition="html" role="usernotes">User Notes:
    7568    <ulink url="&blfs-wiki;/attica"/></para>
    … …  
    111104      <parameter>-DQT4_BUILD=ON</parameter>: This switch forces the package
    112105      to build against <application>Qt4</application> even if
    113       <application>Qt5</application> is present on the system. Remove it if
    114        you want to build the package against <application>Qt5</application>.
     106      <application>Qt5</application> is present on the system.
    115107    </para>
    116108

  • kde/core/config.xml

    r1b0d0188 r8e6f4f8  
    66]>
    77
    8 <sect1 id="kde-core-config" xreflabel="Starting KDE">
     8<sect1 id="kde-core-config" xreflabel="Starting KDE4">
    99  <?dbhtml filename="config.html"?>
    1010
    … …  
    1414  </sect1info>
    1515
    16   <title>Starting KDE</title>
     16  <title>Starting KDE4</title>
    1717
    18   <bridgehead renderas="sect3">KDE Startup Dependencies</bridgehead>
     18  <bridgehead renderas="sect3">KDE4 Startup Dependencies</bridgehead>
    1919
    2020  <bridgehead renderas="sect4">Optional</bridgehead>
    … …  
    2525  <para>After <application>Kde-workspace</application> has been installed, the
    2626  first important milestone has been reached. Now you need to configure your
    27   system to start KDE.</para>
     27  system to start KDE4.</para>
    2828
    2929  <sect2 role="content">
    30   <title>Starting KDE from the command prompt</title>
     30  <title>Starting KDE4 from the command prompt</title>
    3131
    32  <para>To start <application>KDE</application> from the command prompt, you
     32 <para>To start <application>KDE4</application> from the command prompt, you
    3333 first need to modify your <filename>.xinitrc</filename> file:</para>
    3434
    … …  
    4444    <userinput>ck-launch-session</userinput>.</para></note>
    4545
    46     <para>You can now start KDE using the <command>startx</command> command.</para>
     46    <para>You can now start KDE4 using the <command>startx</command> command.</para>
    4747
    4848    </sect2>
    4949
    5050    <sect2 role="content">
    51     <title>Starting KDE at boot</title>
     51    <title>Starting KDE4 at boot</title>
    5252
    53     <para>KDE comes with a graphical login interface called KDM (the KDE Display
     53    <para>KDE4 comes with a graphical login interface called KDM (the KDE4 Display
    5454    Manager), which provides a customizable graphical login at boot. To use KDM,
    5555    you need to edit your <filename>/etc/inittab</filename> file (as the
    … …  
    6666<screen><userinput>sed -i 's#id:3:initdefault:#id:5:initdefault:#' /etc/inittab</userinput></screen>
    6767
    68     <para>You can now restart your system and see the KDE login
     68    <para>You can now restart your system and see the KDE4 login
    6969    screen.</para>
    7070
    … …  
    7979         &kde-download-http;applications/&kde-apps-version;/src/kde-l10n/</ulink>.
    8080    See <xref linkend="kde-add-pkgs"/> for build instructions. If you are in a
    81     KDE session when installing a new language and configure KDE to use it, the
     81    KDE4 session when installing a new language and configure KDE4 to use it, the
    8282    session needs to be restarted, in order to see the effects.</para>
    8383
    … …  
    8585
    8686  <sect2 role="content">
    87     <title>Installing further KDE packages</title>
     87    <title>Installing further KDE4 packages</title>
    8888
    8989    <para>Every subsequent package can be built while having
    90     <application>KDE</application> up and running, but remember to keep
     90    <application>KDE4</application> up and running, but remember to keep
    9191    <envar>&kde-dir;</envar> and <envar>&qt4-dir;</envar> set.</para>
    9292

  • kde/core/core.xml

    r1b0d0188 r8e6f4f8  
    1414  <?dbhtml filename="core.html"?>
    1515
    16   <title>The KDE Core</title>
     16  <title>The KDE4 Core</title>
    1717
     18  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="pre-install-config.xml"/>
    1819  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="automoc4.xml"/>
    1920  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="phonon.xml"/>
    … …  
    2324  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="attica.xml"/>
    2425  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="qimageblitz.xml"/>
    25 <!-- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="shrdesktopontologies.xml"/>-->
    2626  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="polkit-qt.xml"/>
    2727  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="oxygen-icons.xml"/>
    … …  
    3232  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="baloo-widgets.xml"/>
    3333  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="polkit-kde-agent.xml"/>
    34 <!--  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="nepomuk-core.xml"/>
    35   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="nepomuk-widgets.xml"/> -->
    3634  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="kactivities.xml"/>
    3735  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="kde-runtime.xml"/>

  • kde/core/oxygen-icons.xml

    r1b0d0188 r8e6f4f8  
    7575    the following commands:</para>
    7676
     77    <note><para>Unlike most packages in this section, the icons are placed
     78    in /usr so other applications can find them.</para></note>
     79
    7780<screen><userinput>mkdir build &amp;&amp;
    7881cd    build &amp;&amp;
    7982
    80 cmake -DCMAKE_INSTALL_PREFIX=&kde-dir; -Wno-dev ..</userinput></screen>
     83cmake -DCMAKE_INSTALL_PREFIX=/usr -Wno-dev ..</userinput></screen>
    8184
    8285    <para>

  • kde/core/phonon-backend-gstreamer.xml

    r1b0d0188 r8e6f4f8  
    6262    <para role="required">
    6363    <xref linkend="gstreamer10"/>,
    64     <xref linkend="libxml2"/> and
     64    <xref linkend="libxml2"/>, and
    6565    <xref linkend="phonon"/>
    6666    </para>
    … …  
    7070    <xref linkend="gst10-plugins-base"/> (needed for output to ALSA),
    7171    <xref linkend="gst10-plugins-good"/> (needed for output to PulseAudio),
    72     <xref linkend="gst10-plugins-bad"/> (needed for AAC/M4A support), and
     72    <xref linkend="gst10-plugins-bad"/>  (needed for AAC/M4A support), and
    7373    <xref linkend="gst10-plugins-ugly"/> (needed for MP3 support)
    74     </para>
    75 
    76     <bridgehead renderas="sect4">Optional</bridgehead>
    77     <para role="optional">
    78     <xref linkend="qt5"/>
    7974    </para>
    8075
    … …  
    8782    <title>Installation of Phonon-backend-gstreamer</title>
    8883
    89     <para>Install <application>Phonon-backend-gstreamer</application> by running the following
    90     commands:</para>
     84    <para>Install <application>Phonon-backend-gstreamer</application> by
     85    running the following commands:</para>
     86
     87    <note>
     88      <para>
     89        If you have both Qt4 and Qt5 installed, be sure to run
     90        <userinput>source setqt4</userinput> before installing this package.
     91      </para>
     92    </note>
    9193
    9294<screen><userinput>mkdir build &amp;&amp;
    … …  
    108110    <title>Command Explanations</title>
    109111
    110     <para><option>-DCMAKE_BUILD_TYPE=Release</option>: This switch is used to apply
    111     higher level of compiler optimizations.</para>
     112    <para><option>-DCMAKE_BUILD_TYPE=Release</option>: This switch is used to
     113    apply higher level of compiler optimizations.</para>
    112114
    113115  </sect2>
    … …  
    124126        <seg>none</seg>
    125127        <seg>phonon_gstreamer.so</seg>
    126         <seg>&kde-dir;/lib/kde4/plugins/phonon_backend and
    127         &kde-dir;/share/kde4/services/phononbackends</seg>
     128        <seg>/usr/lib/kde4/plugins/phonon_backend and
     129             /usr/share/kde4/services/phononbackends</seg>
    128130      </seglistitem>
    129131    </segmentedlist>

  • kde/core/phonon.xml

    r1b0d0188 r8e6f4f8  
    3131
    3232    <para><application>Phonon</application> is the multimedia API for KDE4.
    33     It replaces the old <application>aRts</application>, that is no longer
    34     supported by KDE. Phonon needs either the GStreamer or VLC backend.</para>
     33    It replaces the old <application>aRts</application> package.
     34    Phonon needs either the GStreamer or VLC backend.</para>
    3535
    3636    &lfs77_checked; &gcc5_checked;
    … …  
    6262    <bridgehead renderas="sect4">Required</bridgehead>
    6363    <para role="required">
    64       <!--<xref linkend="automoc4"/> and-->
    6564      <xref linkend="cmake"/>,
    66       <xref linkend="glib2"/> and
    67       <xref linkend="qt4"/>
     65      <xref linkend="glib2"/>, and
     66      <xref linkend="qt4"/> 
    6867    </para>
    6968
    7069    <bridgehead renderas="sect4">Optional</bridgehead>
    7170    <para role="optional">
    72       <xref linkend="pulseaudio"/>,
    73       <xref linkend="qt5"/> and
     71      <xref linkend="pulseaudio"/> and
    7472      <ulink url="http://projects.kde.org/projects/kdesupport/libqzeitgeist/">QZeitgeist</ulink>
    7573    </para>
    … …  
    8381    <title>Installation of Phonon</title>
    8482
    85     <para>Make sure that <xref linkend="qt4"/> is compiled without the bundled
     83    <para>Make sure <xref linkend="qt4"/> has been built without the bundled
    8684    <application>Phonon</application> library. This package provides
    8785    a better implementation.</para>
    8886
    89     <note><para>If you have both Qt4 and Qt5 installed, be sure to run
    90     <userinput>source setqt4</userinput> before installing Phonon.
    91     </para></note>
     87    <note>
     88      <para>
     89        If you have both Qt4 and Qt5 installed, be sure to run
     90        <userinput>source setqt4</userinput> before installing Phonon.
     91      </para>
     92
     93    </note>
    9294 
    9395    <para>Install <application>Phonon</application> by running the following
    9496    commands:</para>
    9597
    96 <!-- CMAKE_INSTALL_LIBDIR is used so the package doesn't write over lib64 symlink on 64 bit system -->
    97 <screen><userinput>mkdir build &amp;&amp;
     98<screen><userinput>sed -i "s:BSD_SOURCE:DEFAULT_SOURCE:g" cmake/FindPhononInternal.cmake &amp;&amp;
     99
     100mkdir build &amp;&amp;
    98101cd    build &amp;&amp;
    99102
    … …  
    116119
    117120    <para>
     121      <command>sed ... cmake/FindPhononInternal.cmake</command>: Silence
     122      a lot of warnings caused by the latest toolchain.
     123    </para>
     124
     125    <para>
    118126      <parameter>-DCMAKE_BUILD_TYPE=Release</parameter>: This switch is used
    119127      to apply higher level of the compiler optimizations.
    … …  
    131139      <application>D-Bus</application> interfaces file.
    132140    </para>
    133 
    134 <!--
    135     <para>
    136       <option>-DPHONON_BUILD_PHONON4QT5=ON</option>: Use this switch if you want to
    137       build <application>Phonon</application> against <application>Qt5</application>.
    138       Note that both <application>Qt4</application> and <application>Qt5</application>
    139       versions can be installed at the same time without any conflicts.
    140     </para>
    141 -->
    142141
    143142  </sect2>

  • kde/core/polkit-qt.xml

    r1b0d0188 r8e6f4f8  
    9090
    9191cmake -DCMAKE_INSTALL_PREFIX=&kde-dir; \
    92       -DCMAKE_BUILD_TYPE=Release       \
    93       -DCMAKE_INSTALL_LIBDIR=lib       \
    94       -DUSE_QT4=TRUE                   \
     92      -DCMAKE_BUILD_TYPE=Release         \
     93      -DCMAKE_INSTALL_LIBDIR=lib         \
     94      -DUSE_QT4=TRUE                     \
    9595      -Wno-dev .. &amp;&amp;
    9696make</userinput></screen>

  • kde/core/pre-install-config.xml

    r1b0d0188 r8e6f4f8  
    1414  </sect1info>
    1515
    16   <title>KDE Pre-installation Configuration</title>
     16  <title>KDE4 Pre-installation Configuration</title>
    1717
    1818  <note><para>If you did not install <application>Xorg</application> in
Note: See TracChangeset for help on using the changeset viewer.