Changeset eb3dbe3


Ignore:
Timestamp:
06/05/2016 04:17:47 AM (5 years ago)
Author:
Bruce Dubbs <bdubbs@…>
Branches:
10.0, 10.1, 11.0, 7.10, 8.0, 8.1, 8.2, 8.3, 8.4, 9.0, 9.1, basic, bdubbs/svn, elogind, ken/refactor-virt, lazarus, nosym, perl-modules, qt5new, trunk, xry111/git-date, xry111/git-date-for-trunk, xry111/git-date-test
Children:
f586237
Parents:
67b1a0a
Message:

Remove references to qt4 from obconf-qt, qscintilla, qtermwidget,
gst10-plugins-base, v4l-utils, wpa_supplicant, wireshark,
and transmission.

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

Files:
10 edited

Legend:

Unmodified
Added
Removed
  • introduction/welcome/changelog.xml

    r67b1a0a reb3dbe3  
    4949        <listitem>
    5050          <para>[bdubbs] - Remove references to qt4 in poppler, cmake,
    51           doxygen, qca, and pinentry.</para>
     51          doxygen, qca, pinentry, obconf-qt, qscintilla, qtermwidget,
     52          gst10-plugins-base, v4l-utils, wpa_supplicant, wireshark,
     53          and transmission.</para>
    5254        </listitem>
    5355        <listitem>
  • kde/libdbusmenuqt.xml

    r67b1a0a reb3dbe3  
    3131
    3232    <para>This library provides a <application>Qt</application> implementation
    33     of the DBusMenu specification that exposes menus via DBus.<!--  Its
    34     libraries are used by both KDE4 and KF5, but they must be linked to <xref
    35     linkend='qt4'/> and <xref linkend='qt5'/> respectively. The two versions do
    36     not conflict with each other.--> </para>
     33    of the DBusMenu specification that exposes menus via DBus.</para>
    3734
    3835    &lfs79_checked;&gcc6_checked;
  • lxqt/apps/obconf-qt.xml

    r67b1a0a reb3dbe3  
    3434      <application>OpenBox</application> Qt based configuration tool.</para>
    3535
    36     &lfs79_checked;
     36    &lfs79_checked;&gcc6_checked;
    3737
    3838    <bridgehead renderas="sect3">Package Information</bridgehead>
     
    8282    <para role="required">
    8383      <xref linkend="cmake"/>,
    84       <xref linkend="openbox"/> and
    85       <xref linkend="qt5"/> or
    86       <xref linkend="qt4"/>
     84      <xref linkend="openbox"/>, and
     85      <xref linkend="qt5"/>
    8786    </para>
    8887
     
    108107      -DCMAKE_INSTALL_PREFIX=/usr \
    109108      ..       &amp;&amp;
    110 
    111109make</userinput></screen>
    112110
  • lxqt/apps/qscintilla.xml

    r67b1a0a reb3dbe3  
    4242    </para>
    4343
    44     &lfs79_checked;
     44    &lfs79_checked;&gcc6_checked;
    4545
    4646    <bridgehead renderas="sect3">Package Information</bridgehead>
     
    8484    <para role="required">
    8585      <xref linkend="chrpath"/> and
    86       <xref linkend="qt5"/> (recommended) or
    87       <xref linkend="qt4"/>
     86      <xref linkend="qt5"/>
    8887    </para>
    8988
     
    103102  <sect2 role="installation">
    104103    <title>Installation of QScintilla</title>
    105 
    106     <para>
    107       If <application>Qt4</application> and <application>Qt5</application> are
    108       installed, choose which one you prefer, by running <command>source
    109       setqt4</command> or <command>source setqt5</command>, respectivelly.
    110     </para>
    111104
    112105    <note>
     
    150143                    $QT5DIR/share/doc/QScintilla-&qscintilla-version;/html</userinput></screen>
    151144
    152     <para>
    153        When building with
    154        <application>Qt4</application>, replace <envar>QT5DIR</envar> with
    155        <envar>QT4DIR</envar>.
    156     </para>
    157 
    158145  </sect2>
    159146  <sect2 role="commands">
     
    180167        </seg>
    181168        <seg>
    182           $QT5DIR/lib/libqt5scintilla2.so or $QT4DIR/lib/libqtscintilla2.so
     169          $QT5DIR/lib/libqt5scintilla2.so
    183170        </seg>
    184171        <seg>
    185172          $QT5DIR/{include/Qsci,qsci,share/doc/QScintilla-&qscintilla-version;}/html
    186           or
    187           $QT4DIR/{include/Qsci,qsci,share/doc/QScintilla-&qscintilla-version;}/html
    188173        </seg>
    189174      </seglistitem>
  • lxqt/apps/qtermwidget.xml

    r67b1a0a reb3dbe3  
    3535    </para>
    3636
    37     &lfs79_checked;
     37    &lfs79_checked;&gcc6_checked;
    3838
    3939    <bridgehead renderas="sect3">Package Information</bridgehead>
     
    7575    <bridgehead renderas="sect4">Required</bridgehead>
    7676    <para role="required">
    77       <xref linkend="cmake"/> and
    78       <xref linkend="qt5"/> or
    79       <xref linkend="qt4"/>
     77      <xref linkend="cmake"/>, and
     78      <xref linkend="qt5"/>
    8079
    8180    </para>
     
    9089
    9190    <para>
    92       If you have <application>Qt4</application> and
    93       <application>Qt5</application> installed, run <command>source
    94       setqt4</command> or <command>source setqt5</command>, respectively, in
    95       order to link <application>qtermwidget</application> to the one of your
    96       choice. Following instructions are for <application>Qt5</application>
    97       linking. For compilation with <application>Qt4</application>, see
    98       <quote>Command Explanations</quote>, below. Install
    99       <application>qtermwidget</application> by running the following
    100       commands:
     91      Install <application>qtermwidget</application> by running the
     92      following commands:
    10193    </para>
    10294
     
    137129      <parameter>-DBUILD_DESIGNER_PLUGIN=0</parameter>: This switch is
    138130      necessary, because building the Qt designer plugin is not supported for
    139       <application>Qt5</application> yet. Toggle to 1 or remove, if you prefer
    140       to use <application>Qt4</application>.
     131      <application>Qt5</application> yet.
    141132    </para>
    142133
    143134    <para>
    144135      <parameter>-DUSE_QT5=true</parameter>: This switch is used in order to
    145       build this application linked to <application>Qt5</application>. Toggle
    146       to <quote>false</quote>, if you prefer to use
    147       <application>Qt4</application>.
     136      build this application linked to <application>Qt5</application>.
    148137    </para>
    149138
     
    163152        </seg>
    164153        <seg>
    165           libqtermwidget5.so or
    166           libqtermwidget4.so and
    167           /usr/lib/qt4/plugins/designer/libqtermwidget4plugin.so
     154          libqtermwidget5.so
    168155        </seg>
    169156        <seg>
    170           /usr/{include,share{/cmake,}}/qtermwidget5 or
    171           /usr/{include,share{/cmake,}}/qtermwidget4
     157          /usr/{include,share{/cmake,}}/qtermwidget5
    172158        </seg>
    173159      </seglistitem>
     
    190176        </listitem>
    191177      </varlistentry>
    192 
    193       <varlistentry id="libqtermwidget4-lib">
    194         <term><filename class="libraryfile">libqtermwidget4.so</filename></term>
    195         <listitem>
    196           <para>
    197             contains the <application>libqtermwidget4</application> API functions.
    198           </para>
    199           <indexterm zone="qtermwidget libqtermwidget4-lib">
    200             <primary sortas="c-libqtermwidget4">libqtermwidget4.so</primary>
    201           </indexterm>
    202         </listitem>
    203       </varlistentry>
    204 
     178<!--
    205179      <varlistentry id="libqtermwidget4plugin-lib">
    206180        <term><filename class="libraryfile">libqtermwidget4plugin.so</filename></term>
     
    214188        </listitem>
    215189      </varlistentry>
    216 
     190-->
    217191    </variablelist>
    218192
  • multimedia/libdriv/gst10-plugins-base.xml

    r67b1a0a reb3dbe3  
    105105      <xref linkend="gtk3"/>,
    106106      <xref linkend="gtk-doc"/>,
    107       <xref linkend="qt4"/>,
     107      <xref linkend="qt5"/>,
    108108      <xref linkend="valgrind"/>,
    109109      <ulink url="http://sourceforge.net/projects/libvisual/">libvisual</ulink>,
  • multimedia/libdriv/v4l-utils.xml

    r67b1a0a reb3dbe3  
    3636    </para>
    3737
    38     &lfs79_checked;
     38    &lfs79_checked;&gcc6_checked;
    3939
    4040    <bridgehead renderas="sect3">Package Information</bridgehead>
     
    8484    <para role="optional">
    8585      <xref linkend="alsa-lib"/> and
    86       <xref linkend="qt4"/> or
    8786      <xref linkend="qt5"/>
    8887    </para>
     
    10099  <sect2 role="installation">
    101100    <title>Installation of v4l-utils</title>
    102 
    103     <para>
    104       If both Qt4 and Qt5 are installed, Qt5 will be used. If you choose to
    105       build against Qt4, temporarily hide it from
    106       <envar>PKG_CONFIG_PATH</envar>, issuing:
    107     </para>
    108 
    109 <screen><userinput>SAVEPATH=$PKG_CONFIG_PATH &amp;&amp;
    110 PKG_CONFIG_PATH="\
    111 `echo $PKG_CONFIG_PATH | sed 's@:/opt/qt5/lib/pkgconfig@@'`"</userinput></screen>
    112101
    113102    <para>
     
    120109            --disable-static  &amp;&amp;
    121110make</userinput></screen>
    122 
    123     <para>
    124       Again, if both Qt4 and 5 are installed and you chose to build against Qt4,
    125       restore <envar>PKG_CONFIG_PATH</envar>:
    126     </para>
    127 
    128 <screen><userinput>PKG_CONFIG_PATH=$SAVEPATH &amp;&amp;
    129 unset SAVEPATH</userinput></screen>
    130111
    131112    <para>
  • networking/netprogs/wpa_supplicant.xml

    r67b1a0a reb3dbe3  
    4141    </para>
    4242
    43     &lfs79_checked;
     43    &lfs79_checked;&gcc6_checked;
    4444
    4545    <bridgehead renderas="sect3">Package Information</bridgehead>
     
    8989      <xref linkend="dbus"/>,
    9090      <xref linkend="libxml2"/>, and
    91       <xref linkend="qt4"/>
     91      <xref linkend="qt5"/>
    9292    </para>
    9393
     
    190190
    191191    <para>
    192       If you have installed <xref linkend="qt4"/> and wish to build
     192      If you have installed <xref linkend="qt5"/> and wish to build
    193193      the <application>WPA Supplicant</application> GUI program, run
    194194      the following commands:
    195195    </para>
     196
     197    <note><para>The following directory name is labelled qt4, but
     198    is compatible with <xref linkend="qt5"/>.</para></note>
    196199
    197200<screen><userinput>pushd wpa_gui-qt4 &amp;&amp;
  • networking/netutils/wireshark.xml

    r67b1a0a reb3dbe3  
    4444    </para>
    4545
    46     &lfs79_checked;
     46    &lfs79_checked;&gcc6_checked;
    4747
    4848    <bridgehead renderas="sect3">Package Information</bridgehead>
     
    123123    </bridgehead>
    124124    <para role="optional">
    125       <xref linkend="gtk2"/>, or
    126       <xref linkend="qt4"/>,
     125      <xref linkend="gtk2"/>
    127126    </para>
    128127
     
    135134
    136135      <para>
    137         The <application>Qt</application> GUI needs one of <xref linkend=
    138         "qt4"/> or <xref linkend="qt5"/>. If both are installed, Qt5
    139         is used by default.
     136        The <application>Qt</application> GUI needs <xref linkend="qt5"/>.
    140137      </para>
    141138
     
    273270    <para>
    274271      <option>--with-qt=[yes/no/4/5]</option>: For the Qt GUI. Default is yes.
    275       If both Qt4 and 5 are installed, Qt5 is chosen by default. Notice that the
    276       GUI for only one Qt version (either 4 or 5) can be built.
    277272    </para>
    278273
  • xsoft/other/transmission.xml

    r67b1a0a reb3dbe3  
    3737    </para>
    3838
    39     &lfs79_checked;
     39    &lfs79_checked;&gcc6_checked;
    4040
    4141    <bridgehead renderas="sect3">Package Information</bridgehead>
     
    8484    <bridgehead renderas="sect4">Recommended (to build a GUI)</bridgehead>
    8585    <para role="recommended">
    86       <xref linkend="gtk3"/> and either
    87       <xref linkend="qt4"/> or
     86      <xref linkend="gtk3"/> and
    8887      <xref linkend="qt5"/>
    8988    </para>
     
    109108<screen><userinput>./configure --prefix=/usr &amp;&amp;
    110109make</userinput></screen>
    111 
    112     <para>
    113        The following commands are used if you have installed Qt and would like
    114        to compile the Qt GUI. If <application>Qt4</application> and
    115        <application>Qt5</application> are installed in
    116        <filename class="directory">/opt</filename>, use
    117        <command>source setqt4</command> or <command>source setqt5</command> to
    118        choose which one will be used to build the Qt GUI.
    119     </para>
    120110
    121111    <para>
Note: See TracChangeset for help on using the changeset viewer.