Changeset ba1e8dd


Ignore:
Timestamp:
01/03/2014 02:45:45 PM (10 years ago)
Author:
Fernando de Oliveira <fernando@…>
Branches:
10.0, 10.1, 11.0, 11.1, 11.2, 11.3, 12.0, 12.1, 7.10, 7.5, 7.6, 7.6-blfs, 7.6-systemd, 7.7, 7.8, 7.9, 8.0, 8.1, 8.2, 8.3, 8.4, 9.0, 9.1, basic, bdubbs/svn, elogind, gnome, kde5-13430, kde5-14269, kde5-14686, kea, ken/TL2024, ken/inkscape-core-mods, ken/tuningfonts, krejzi/svn, lazarus, lxqt, nosym, perl-modules, plabs/newcss, plabs/python-mods, python3.11, qt5new, rahul/power-profiles-daemon, renodr/vulkan-addition, systemd-11177, systemd-13485, trunk, upgradedb, xry111/intltool, xry111/llvm18, xry111/soup3, xry111/test-20220226, xry111/xf86-video-removal
Children:
68bd004
Parents:
739148a
Message:

KDE related fixes (patch received, thanks).

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

Files:
7 edited

Legend:

Unmodified
Added
Removed

  • general/sysutils/strigi.xml

    r739148a rba1e8dd  
    8989    commands:</para>
    9090
    91 <screen><userinput>mkdir build &amp;&amp;
     91<!-- CMAKE_INSTALL_LIBDIR is used so the package doesn't write over lib64 symlink on 64 bit system -->
     92<screen><userinput>sed -i "s|BufferedStream :|STREAMS_EXPORT &amp;|" libstreams/include/strigi/bufferedstream.h &amp;&amp;
     93mkdir build &amp;&amp;
    9294cd build &amp;&amp;
    93 cmake -DCMAKE_INSTALL_PREFIX=/usr .. &amp;&amp;
     95cmake -DCMAKE_INSTALL_PREFIX=/usr \
     96      -DCMAKE_INSTALL_LIBDIR=lib  \
     97      -DCMAKE_BUILD_TYPE=Release  \
     98      .. &amp;&amp;
    9499make</userinput></screen>
    95100
    … …  
    106111
    107112    <para>
     113      <command>sed -i "..."</command>: This command fixes the build with recent
     114      <application>GCC</application> versions.
     115    </para>
     116
     117    <para>
     118      <parameter>-DCMAKE_BUILD_TYPE=Release</parameter>: This switch is used to
     119      apply higher level of the compiler optimizations.
     120    </para>
     121
     122    <para>
    108123      <option>-DENABLE_DBUS=OFF</option>: Use this <command>cmake</command>
    109124      variable if you don't have <application>D-Bus</application> installed.
    … …  
    116131      <application>D-Bus</application> support.
    117132    </para>
     133
    118134  </sect2>
    119135

  • introduction/welcome/changelog.xml

    r739148a rba1e8dd  
    4848      <itemizedlist>
    4949        <listitem>
     50          <para>[fernando] - KDE related fixes (patch received, thanks). Fixes
     51          <ulink url="&blfs-ticket-root;4517">#4517</ulink>.</para>
     52        </listitem>
     53        <listitem>
    5054          <para>[igor] - Patch libcap to fix the uapi/linux include scheme, reported
    5155          by Armin K. Fixes <ulink url="&blfs-ticket-root;4508">#4508</ulink>.</para>

  • kde/core/attica.xml

    r739148a rba1e8dd  
    6161    <bridgehead renderas="sect4">Required</bridgehead>
    6262    <para role="required">
    63     <xref linkend="qt4"/> and
    64     <xref linkend="cmake"/>
     63      <xref linkend="cmake"/> and
     64      <xref linkend="qt4"/>
     65    </para>
     66
     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>)
    6572    </para>
    6673
    … …  
    8188cmake -DCMAKE_INSTALL_PREFIX=&kde-dir; \
    8289      -DCMAKE_BUILD_TYPE=Release         \
     90      -DQT4_BUILD=ON                     \
    8391      .. &amp;&amp;
    8492make</userinput></screen>
    … …  
    95103    <title>Command Explanations</title>
    96104
    97     <para><option>-DCMAKE_BUILD_TYPE=Release</option>: This switch is used to apply
    98     a higher level of compiler optimizations.</para>
     105    <para>
     106      <parameter>-DCMAKE_BUILD_TYPE=Release</parameter>: This switch is used
     107      to apply a higher level of compiler the optimizations.
     108    </para>
     109
     110    <para>
     111      <parameter>-DQT4_BUILD=ON</parameter>: This switch forces the package
     112      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>.
     115    </para>
    99116
    100117  </sect2>

  • kde/core/kde-runtime.xml

    r739148a rba1e8dd  
    113113cd    build &amp;&amp;
    114114
    115 cmake -DCMAKE_INSTALL_PREFIX=&kde-dir; \
    116       -DSYSCONF_INSTALL_DIR=/etc         \
    117       -DCMAKE_BUILD_TYPE=Release         \
     115cmake -DCMAKE_INSTALL_PREFIX=&kde-dir;         \
     116      -DSYSCONF_INSTALL_DIR=/etc                 \
     117      -DCMAKE_BUILD_TYPE=Release                 \
     118      -DSAMBA_INCLUDE_DIR=/usr/include/samba-4.0 \
    118119      .. &amp;&amp;
    119120make</userinput></screen>
    … …  
    124125
    125126<screen role="root"><userinput>make install &amp;&amp;
    126 ln -s -v ../lib/kde4/libexec/kdesu &kde-dir;/bin/kdesu</userinput></screen>
     127ln -sfv ../lib/kde4/libexec/kdesu &kde-dir;/bin/kdesu</userinput></screen>
     128
     129  </sect2>
     130
     131  <sect2 role="commands">
     132    <title>Command Explanations</title>
     133
     134    <para>
     135      <parameter>-DSAMBA_INCLUDE_DIR=/usr/include/samba-4.0</parameter>:
     136      This switch is used so that <application>CMake</application> can
     137      properly find <application>Samba</application> headers which got
     138      moved in version 4.
     139    </para>
    127140
    128141  </sect2>

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

    r739148a rba1e8dd  
    8888
    8989cmake -DCMAKE_INSTALL_PREFIX=&kde-dir; \
     90      -DCMAKE_INSTALL_LIBDIR=lib         \
    9091      -DCMAKE_BUILD_TYPE=Release         \
    9192      .. &amp;&amp;

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

    r739148a rba1e8dd  
    8080
    8181cmake -DCMAKE_INSTALL_PREFIX=&kde-dir; \
     82      -DCMAKE_INSTALL_LIBDIR=lib         \
    8283      -DCMAKE_BUILD_TYPE=Release         \
    8384      .. &amp;&amp;

  • kde/core/phonon.xml

    r739148a rba1e8dd  
    6262    <bridgehead renderas="sect4">Required</bridgehead>
    6363    <para role="required">
    64     <xref linkend="automoc4"/> and
    65     <xref linkend="glib2"/>
     64      <xref linkend="automoc4"/> and
     65      <xref linkend="glib2"/>
    6666    </para>
    6767
    6868    <bridgehead renderas="sect4">Optional</bridgehead>
    6969    <para role="optional">
    70     <xref linkend='pulseaudio'/> and
    71     <ulink url="http://projects.kde.org/projects/kdesupport/libqzeitgeist/">QZeitgeist</ulink>
     70      <xref linkend="pulseaudio"/>,
     71      <xref linkend="qt5"/> and
     72      <ulink url="http://projects.kde.org/projects/kdesupport/libqzeitgeist/">QZeitgeist</ulink>
    7273    </para>
    7374
    … …  
    8788    commands:</para>
    8889
     90<!-- CMAKE_INSTALL_LIBDIR is used so the package doesn't write over lib64 symlink on 64 bit system -->
    8991<screen><userinput>mkdir build &amp;&amp;
    9092cd    build &amp;&amp;
    … …  
    9294cmake -DCMAKE_INSTALL_PREFIX=&qt4-dir; \
    9395      -DCMAKE_BUILD_TYPE=Release \
     96      -DCMAKE_INSTALL_LIBDIR=lib \
    9497      -DPHONON_INSTALL_QT_EXTENSIONS_INTO_SYSTEM_QT=TRUE \
    9598      -DDBUS_INTERFACES_INSTALL_DIR=/usr/share/dbus-1/interfaces \
    … …  
    106109    <title>Command Explanations</title>
    107110
    108     <para><option>-DCMAKE_BUILD_TYPE=Release</option>: This switch is used to apply
    109     higher level of compiler optimizations.</para>
     111    <para>
     112      <parameter>-DCMAKE_BUILD_TYPE=Release</parameter>: This switch is used
     113      to apply higher level of the compiler optimizations.
     114    </para>
    110115
    111     <para><option>-DPHONON_INSTALL_QT_EXTENSIONS_INTO_SYSTEM_QT=TRUE</option>:
    112     This option ensures that the plugins and mkspecs files get installed in
    113     the correct location.</para>
     116    <para>
     117      <parameter>-DPHONON_INSTALL_QT_EXTENSIONS_INTO_SYSTEM_QT=TRUE</parameter>:
     118      This switch ensures that the plugins and mkspecs files get installed in
     119      the correct location.
     120    </para>
    114121
    115     <para><option>-DDBUS_INTERFACES_INSTALL_DIR=/usr/share/dbus-1/interfaces</option>:
    116     This option sets the correct installation path for a D-Bus interfaces file.
     122    <para>
     123     <parameter>-DDBUS_INTERFACES_INSTALL_DIR=/usr/share/dbus-1/interfaces</parameter>:
     124      This switch sets the correct installation path for the
     125      <application>D-Bus</application> interfaces file.
     126    </para>
     127
     128    <para>
     129      <option>-DPHONON_BUILD_PHONON4QT5=ON</option>: Use this switch if you want to
     130      build <application>Phonon</application> against <application>Qt5</application>.
     131      Note that both <application>Qt4</application> and <application>Qt5</application>
     132      versions can be installed at the same time without any conflicts.
    117133    </para>
    118134
    … …  
    128144
    129145      <seglistitem>
    130         <seg>none</seg>
    131         <seg>libphonon.so and libphononexperimental.so</seg>
    132         <seg>none</seg>
     146        <seg>
     147          None
     148        </seg>
     149        <seg>
     150          libphonon.so and
     151          libphononexperimental.so
     152        </seg>
     153        <seg>
     154          &qt4-dir;/include/KDE/Phonon,
     155          &qt4-dir;/include/phonon, and
     156          &qt4-dir;/share/phonon
     157        </seg>
    133158      </seglistitem>
    134159    </segmentedlist>
Note: See TracChangeset for help on using the changeset viewer.