Changeset ad41452 for kde4


Ignore:
Timestamp:
04/15/2012 05:19:58 PM (12 years ago)
Author:
Ragnar Thomsen <rthomsen@…>
Branches:
10.0, 10.1, 11.0, 11.1, 11.2, 11.3, 12.0, 12.1, 7.10, 7.4, 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:
1bc70b56
Parents:
86f9469
Message:

Fix Qca compile with GCC4.7. QTDIR variable.

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

Location:
kde4
Files:
7 edited

Legend:

Unmodified
Added
Removed

  • kde4/core/akonadi.xml

    r86f9469 rad41452  
    9393<screen><userinput>mkdir build &amp;&amp;
    9494cd build &amp;&amp;
    95 CMAKE_PREFIX_PATH=$QT4DIR \
     95CMAKE_PREFIX_PATH=&qt-dir; \
    9696      cmake -DCMAKE_INSTALL_PREFIX=&kde-dir; .. &amp;&amp;
    9797make</userinput></screen>
    … …  
    106106    <title>Command Explanations</title>
    107107
    108     <para><option>CMAKE_PREFIX_PATH=$QT4DIR</option>: This option is set to find automoc4.</para>
     108    <para><option>CMAKE_PREFIX_PATH=&qt-dir;</option>: This option is set to find automoc4.</para>
    109109
    110110  </sect2>

  • kde4/core/automoc4.xml

    r86f9469 rad41452  
    3131
    3232    <para><application>Automoc4</application> is a tool to add rules for generating
    33     <application>Qt4</application> moc files automatically to projects that use
     33    <application>Qt</application> moc files automatically to projects that use
    3434    <application>CMake</application> as the buildsystem.</para>
    3535
    … …  
    8989<screen><userinput>mkdir build &amp;&amp;
    9090cd build &amp;&amp;
    91 cmake -DCMAKE_INSTALL_PREFIX=$QT4DIR \
     91cmake -DCMAKE_INSTALL_PREFIX=&qt-dir; \
    9292      .. &amp;&amp;
    9393make</userinput></screen>
    … …  
    129129        <term><command>automoc4</command></term>
    130130        <listitem>
    131           <para>is a utility generating <application>Qt4</application> moc
     131          <para>is a utility generating <application>Qt</application> moc
    132132          files.</para>
    133133          <indexterm zone="a-automoc4 automoc4">

  • kde4/core/config.xml

    r86f9469 rad41452  
    7070    <title>Installing further KDE packages</title>
    7171    <para>Every subsequent package can be built while having <application>KDE</application> up and
    72     running, but remember to keep <envar>&kde-dir;</envar> and <envar>$QT4DIR</envar> set.</para>
     72    running, but remember to keep <envar>&kde-dir;</envar> and <envar>&qt-dir;</envar> set.</para>
    7373  </sect2>
    7474   

  • kde4/core/phonon.xml

    r86f9469 rad41452  
    9999<screen><userinput>mkdir build &amp;&amp;
    100100cd build &amp;&amp;
    101 cmake -DCMAKE_INSTALL_PREFIX=$QT4DIR \
     101cmake -DCMAKE_INSTALL_PREFIX=&qt-dir; \
    102102      -DPHONON_INSTALL_QT_EXTENSIONS_INTO_SYSTEM_QT=TRUE \
    103103      .. &amp;&amp;
    … …  
    113113    <title>Command Explanations</title>
    114114
    115     <para><option>-DPHONON_INSTALL_QT_EXTENSIONS_INTO_SYSTEM_QT=TRUE</option>: This option ensures that the plugins and mkspecs files get installed in the correct location.</para>
     115    <para><option>-DPHONON_INSTALL_QT_EXTENSIONS_INTO_SYSTEM_QT=TRUE</option>:
     116    This option ensures that the plugins and mkspecs files get installed in
     117    the correct location.</para>
    116118
    117119  </sect2>
    … …  
    122124       
    123125<screen><userinput>sed -i -e 's#{includedir}$#&amp; -I\${includedir}/phonon#' \
    124           $QT4DIR/lib/pkgconfig/phonon.pc</userinput></screen>
     126          &qt-dir;/lib/pkgconfig/phonon.pc</userinput></screen>
    125127-->
    126128
    … …  
    137139
    138140    <segmentedlist>
    139       <segtitle>Installed Program</segtitle>
     141      <segtitle>Installed Programs</segtitle>
    140142      <segtitle>Installed Libraries</segtitle>
    141       <segtitle>Installed Directory</segtitle>
     143      <segtitle>Installed Directories</segtitle>
    142144
    143145      <seglistitem>
    144146        <seg>none</seg>
    145         <seg>libphonon.so, libphononexperimental.so</seg>
     147        <seg>libphonon.so and libphononexperimental.so</seg>
    146148        <seg>none</seg>
    147149      </seglistitem>

  • kde4/core/polkit-qt.xml

    r86f9469 rad41452  
    8888<screen><userinput>mkdir build &amp;&amp;
    8989cd build &amp;&amp;
    90 CMAKE_PREFIX_PATH=$QT4DIR \
     90CMAKE_PREFIX_PATH=&qt-dir; \
    9191      cmake -DCMAKE_INSTALL_PREFIX=&kde-dir; .. &amp;&amp;
    9292make</userinput></screen>
    … …  
    101101    <title>Command Explanations</title>
    102102
    103     <para><option>CMAKE_PREFIX_PATH=$QT4DIR</option>: This option is set to find automoc4</para>
     103    <para><option>CMAKE_PREFIX_PATH=&qt-dir;</option>: This option is set to find automoc4</para>
    104104
    105105  </sect2>

  • kde4/intro/kde4-intro.xml

    r86f9469 rad41452  
    1818  <para><application>KDE</application> version 4 is a comprehensive desktop
    1919  environment with a huge number of applications written for it and a huge
    20   amount of users. It is based on the <application>Qt4</application> framework.</para>
     20  amount of users. It is based on the <application>Qt</application> framework.</para>
    2121  <para>For more information visit the official KDE project site at <ulink
    2222  url="http://www.kde.org/"/>.</para>

  • kde4/intro/pre-install-config.xml

    r86f9469 rad41452  
    132132    </tip>
    133133
    134   <!-- Moved to QT4
    135   <sect2><title>The QT4DIR variable</title>
    136  
    137   <para>Some additional packages which are based on
    138   <application>Qt4</application> will be installed. One of them is
    139   <application>Phonon</application>, a direct replacement of the implementation
    140   which comes with <application>Qt4</application>.  It's recommended placing
    141   such libraries in the same hierarchy where <application>Qt4</application>
    142   itself resides. Later on, it is refered to as <envar>QT4DIR</envar>. If you have
    143   placed <application>Qt4</application> in <filename
    144   class='directory'>/usr</filename>, set <envar>QT4DIR</envar>:</para>
    145  
    146 <screen><userinput>export QT4DIR=/usr</userinput></screen>
    147 
    148   <para>Alternativly, <application>Qt4</application> is often placed in the
    149   <filename class='directory'>/opt</filename> hierarchy:</para>
    150  
    151 <screen><userinput>export QT4DIR=/opt/qt-&qt4-version;
    152 export PATH=$QT4DIR/bin:$PATH</userinput></screen>
    153 -->
    154134  </sect2>
    155135</sect1>
Note: See TracChangeset for help on using the changeset viewer.