Changeset 5006a0a for general


Ignore:
Timestamp:
08/02/2014 01:31:26 PM (10 years ago)
Author:
Krejzi <krejzi@…>
Branches:
systemd-11177
Children:
c1405f2d
Parents:
e9f4805
Message:

Remove setqt hacks from packages.

git-svn-id: svn://svn.linuxfromscratch.org/BLFS/branches/systemd@13793 af4574ff-66df-0310-9fd7-8a98e5e911e0

Location:
general
Files:
3 edited
2 moved

Legend:

Unmodified
Added
Removed

  • general/graphlib/graphlib.xml

    re9f4805 r5006a0a  
    4747  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="openjpeg.xml"/>
    4848  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="pixman.xml"/>
    49   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="poppler.xml"/>
     49  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="poppler-systemd.xml"/>
    5050  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="qpdf.xml"/>
    5151

  • general/graphlib/poppler-systemd.xml

    re9f4805 r5006a0a  
    153153
    154154    <para>
    155       If you are not building both  <application>Qt</application> libraries,
    156       jump to the following paragraph. In order to build both
    157       <application>Qt4</application> and <application>Qt5</application>
    158       libraries, you need to run the install commands twice, because although
    159       both are detected, only wrapper for the first
    160       <application>Qt</application> version in PATH is built. Either can be
    161       built first, but to facilitate the explanation, we choose first the
    162       <application>Qt4</application> library. You can do this using
    163       <command>source setqt4</command> (script from <xref linkend="qt4"/>).
    164     </para>
    165 
    166     <para>
    167155      Install <application>Poppler</application> by running the following
    168156      commands:
    … …  
    185173
    186174<screen role="root"><userinput>make install</userinput></screen>
    187 
    188     <para>
    189       If you are not building both <application>Qt</application> libraries,
    190       jump to the following paragraph. If you want to build both
    191       <application>Qt</application> libraries, first switch back to
    192       unpriviledged user, run <command>source setqt5</command>, from
    193       <xref linkend="qt5"/>, and repeat the instructions from configuration
    194       until install. After that, proceed to install the documents until the end.
    195     </para>
    196175
    197176    <para>

  • general/prog/cmake-systemd.xml

    re9f4805 r5006a0a  
    9999    <title>Installation of CMake</title>
    100100
    101     <para>
     101    <!-- <para>
    102102       If <application>Qt4</application> and <application>Qt5</application> are
    103103       installed in <filename class="directory">/opt</filename>, use
    104104       <command>source setqt4</command> or <command>source setqt5</command> to
    105105       choose which one will be used to build the Qt-based GUI.
    106     </para>
     106    </para> -->
    107107
    108108    <para>
    … …  
    153153      <application>Qt</application>-based  GUI for
    154154      <application>CMake</application>.
     155    </para>
     156
     157    <para>
     158      <option>--qt-qmake=/usr/bin/qmake-qt5</option>: Use this switch if
     159      you have both <application>Qt4</application> and
     160      <application>Qt5</application> installed but wish to build the
     161      <application>Qt5</application> based GUI (it defaults to
     162      <application>Qt4</application> one).
    155163    </para>
    156164

  • general/prog/doxygen.xml

    re9f4805 r5006a0a  
    145145      <option>--with-doxywizard</option>: Use this parameter if
    146146      <application>Qt4</application> is installed and you wish to build the
    147       GUI front-end. If both <application>Qt4</application> and
    148       <application>Qt5</application> are installed, use
    149       <command>source setqt4</command>. If <application>Qt4</application> is
    150       installed in <filename class="directory">/opt</filename>, issue
    151       <command>export QTDIR=$QT4DIR</command>.
     147      GUI front-end.
    152148    </para>
    153149

  • general/prog/prog.xml

    re9f4805 r5006a0a  
    2525  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="bazaar.xml"/>
    2626  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="check.xml"/>
    27   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="cmake.xml"/>
     27  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="cmake-systemd.xml"/>
    2828  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="cvs.xml"/>
    2929  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="cvsserver.xml"/>
Note: See TracChangeset for help on using the changeset viewer.