Changeset cac7f93


Ignore:
Timestamp:
09/20/2019 02:15:17 PM (3 years ago)
Author:
Pierre Labastie <pieere@…>
Branches:
10.0, 10.1, 11.0, 11.1, 9.1, lazarus, qt5new, trunk, upgradedb, xry111/intltool, xry111/test-20220226
Children:
3f6286f
Parents:
5f308941
Message:

Add some "nodep" role to alternative dependencies. Mostly does not change
the rendered book, but allows to simplify the dependency chain for jhalfs

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

Files:
28 edited

Legend:

Unmodified
Added
Removed
  • general/genutils/imagemagick.xml

    r5f308941 rcac7f93  
    155155    <para role="optional">
    156156      <xref linkend="jasper"/>,
    157       <xref linkend="lcms"/> or
     157      <xref role="nodep" linkend="lcms"/> or
    158158      <xref linkend="lcms2"/>,
    159159      <xref linkend="libexif"/>,
  • general/genutils/imagemagick6.xml

    r5f308941 rcac7f93  
    182182    <para role="optional">
    183183      <xref linkend="jasper"/>,
    184       <xref linkend="lcms"/> or
     184      <xref role="nodep" linkend="lcms"/> or
    185185      <xref linkend="lcms2"/>,
    186186      <xref linkend="libexif"/>,
  • general/prog/git.xml

    r5f308941 rcac7f93  
    116116    <para role="optional">
    117117      <xref linkend="pcre2"/> (<emphasis>or</emphasis> the deprecated <xref
    118       linkend="pcre"/>), in either case configured with
     118      role="nodep" linkend="pcre"/>), in either case configured with
    119119      <literal>--enable-jit</literal>,
    120120      <xref linkend="python2"/>,
  • general/prog/python2.xml

    r5f308941 rcac7f93  
    121121      <xref linkend="tk"/>
    122122    </para>
    123 <!--
    124     <note>
    125       <para>
    126         If you are building <xref linkend="thunderbird"/> or
    127         <xref linkend="firefox"/>
    128         you must install <application>openssl</application> before you build
    129         <application>Python 2</application>.
    130       </para>
    131     </note>
    132 -->
     123
    133124    <para condition="html" role="usernotes">
    134125      User Notes: <ulink url="&blfs-wiki;/Python"/>
  • general/sysutils/pciutils.xml

    r5f308941 rcac7f93  
    8080    <para role="recommended">
    8181       <xref linkend="curl"/>,
    82        <xref linkend="wget"/>,
    83        OR <xref linkend="lynx"/>
     82       <xref linkend="wget"/>, or
     83       <xref linkend="lynx"/>
    8484       (for the update-pciids script to function correctly).
    8585    </para>
  • lxde/desktop/libfm.xml

    r5f308941 rcac7f93  
    7676    <para role="required">
    7777      <xref linkend="gtk3"/> or
    78       <xref linkend="gtk2"/> and
     78      <xref role="nodep" linkend="gtk2"/>, and
    7979      <xref linkend="menu-cache"/>
    8080    </para>
  • lxde/desktop/lxde-common.xml

    r5f308941 rcac7f93  
    8989    </para>
    9090
    91     <bridgehead renderas="sect4">Recommended Runtime Dependencies</bridgehead>
    92     <para role="recommended">
    93       <xref linkend="lxsession"/> (for <application>lxpolkit</application>) or
    94       <xref linkend="polkit-gnome"/>
    95     </para>
    96 
    9791    <bridgehead renderas="sect4">Optional Runtime Dependencies</bridgehead>
    9892    <para role="optional">
     93      <xref role="runtime" linkend="polkit-gnome"/>,
    9994      A notification daemon such as
    10095      <xref role="runtime" linkend="notification-daemon"/> or
  • lxde/desktop/pcmanfm.xml

    r5f308941 rcac7f93  
    8181    <para role="recommended">
    8282      <xref linkend="adwaita-icon-theme"/> or
    83       <xref linkend="oxygen-icons5"/> or
     83      <xref role="nodep" linkend="oxygen-icons5"/> or
    8484      <xref linkend="lxde-icon-theme"/>, and
    8585      <xref linkend="fribidi"/>
  • multimedia/audioutils/audacious.xml

    r5f308941 rcac7f93  
    113113    <para role="required">
    114114      <xref linkend="gtk2"/> or
    115       <xref linkend="qt5"/> (or both),
     115      <xref role="nodep" linkend="qt5"/> (or both),
    116116      <xref linkend="libxml2"/> (plugins),
    117117      <xref linkend="xorg-env"/> (plugins), and
  • multimedia/libdriv/libvpx.xml

    r5f308941 rcac7f93  
    6262    <bridgehead renderas="sect4">Required</bridgehead>
    6363    <para role="required">
    64       <xref linkend="yasm"/> or <xref linkend="nasm"/>, and
     64      <xref linkend="yasm"/> or <xref role="nodep" linkend="nasm"/>, and
     65<!-- see
     66http://lists.linuxfromscratch.org/pipermail/blfs-book/2019-August/083164.html
     67and references therein -->
    6568      <xref linkend="which"/> (so <command>configure</command> can find yasm)
    6669    </para>
  • multimedia/libdriv/xine-lib.xml

    r5f308941 rcac7f93  
    6969      <xref linkend="ffmpeg"/>, and at least one of:
    7070        <xref linkend="alsa"/>,
    71         <xref linkend='pulseaudio'/> or
     71        <xref linkend='pulseaudio'/>, or
    7272        <ulink url="http://jackaudio.org/">JACK</ulink>
    7373    </para>
  • networking/netlibs/neon.xml

    r5f308941 rcac7f93  
    7373
    7474    <bridgehead renderas="sect3">neon Dependencies</bridgehead>
    75 <!--
    76     <bridgehead renderas="sect4">Recommended</bridgehead>
    77     <para role="recommended">
    78       <xref linkend="openssl"/> or
    79       <xref linkend="gnutls"/>
    80     </para>
    81 -->
     75
    8276    <bridgehead renderas="sect4">Optional</bridgehead>
    8377    <para role="optional">
  • networking/netutils/networkmanager.xml

    r5f308941 rcac7f93  
    9797      <xref linkend="curl"/>,
    9898      <xref linkend="dhcpcd"/> or
    99       <xref linkend="dhcp"/> (client only),
     99      <xref role="nodep" linkend="dhcp"/> (client only),
    100100      <xref linkend="gobject-introspection"/>,
    101101      <xref linkend="iptables"/>,
  • postlfs/editors/bluefish.xml

    r5f308941 rcac7f93  
    7979    <bridgehead renderas="sect4">Required</bridgehead>
    8080    <para role="required">
    81       <xref linkend="gtk2"/> or <xref linkend="gtk3"/>
     81      <xref role="nodep" linkend="gtk2"/> or <xref linkend="gtk3"/>
    8282      (If both are installed, <command>configure</command> defaults to using
    8383      <application>GTK+ 3</application>)
  • postlfs/editors/emacs.xml

    r5f308941 rcac7f93  
    7676      <xref linkend="gsettings-desktop-schemas"/>,
    7777      <xref linkend="gpm"/>,
    78       <xref linkend="gtk2"/> or <xref linkend="gtk3"/>,
     78      <xref role="nodep" linkend="gtk2"/> or <xref linkend="gtk3"/>,
    7979      <xref linkend="imagemagick6"/> (see command explanations),
    8080      <xref linkend="libjpeg"/>,
  • postlfs/security/shadow.xml

    r5f308941 rcac7f93  
    112112      </para>
    113113
    114 <screen><userinput>sed -i 's@DICTPATH.*@DICTPATH\t/lib/cracklib/pw_dict@' etc/login.defs</userinput></screen>
     114<screen role="nodump"><userinput>sed -i 's@DICTPATH.*@DICTPATH\t/lib/cracklib/pw_dict@' etc/login.defs</userinput></screen>
    115115    </important>
    116116
  • postlfs/virtualization/qemu.xml

    r5f308941 rcac7f93  
    9090      <xref linkend="mesa"/>,
    9191      <xref linkend="sdl"/>,
    92       <xref linkend="vte"/> or <xref linkend="vte2"/>, and
     92      <xref role="nodep" linkend="vte"/> or <xref linkend="vte2"/>, and
    9393<!-- libcacard has been a standalone project since qemu-2.5.-->
    9494      <ulink url="https://www.spice-space.org/page/Libcacard">libcacard</ulink>
  • x/dm/lxdm.xml

    r5f308941 rcac7f93  
    8787    <para role="recommended">
    8888     <xref linkend="lxsession"/> (for <application>lxpolkit</application>) or
    89      <xref linkend="polkit-gnome"/>
     89     <xref role="nodep" linkend="polkit-gnome"/>
    9090    </para>
    9191
  • x/icons/gnome-icon-theme.xml

    r5f308941 rcac7f93  
    7878    <para role="required">
    7979      <xref linkend="gtk3"/> or
    80       <xref linkend="gtk2"/>,
     80      <xref role="nodep" linkend="gtk2"/>,
    8181      <xref linkend="hicolor-icon-theme"/>, and
    8282      <xref linkend="icon-naming-utils"/>
  • x/icons/gnome-themes-extra.xml

    r5f308941 rcac7f93  
    7878    <bridgehead renderas="sect4">Required</bridgehead>
    7979    <para role="required">
    80       <xref linkend="gtk2"/> or
     80      <xref role="nodep" linkend="gtk2"/> or
    8181      <xref linkend="gtk3"/> with
    8282      <xref linkend="librsvg"/> or both
  • x/installing/libevdev.xml

    r5f308941 rcac7f93  
    7474
    7575      <bridgehead renderas="sect4">libevdev Dependencies</bridgehead>
    76 <!--
    77       <bridgehead renderas="sect5">Required</bridgehead>
    78       <para role="required">
    79         <xref linkend="python2"/> or <xref linkend="python3"/>
    80       </para>
    81 -->
     76
    8277      <bridgehead renderas="sect5">Optional</bridgehead>
    8378      <para role="optional">
  • x/installing/libinput.xml

    r5f308941 rcac7f93  
    195195
    196196    <para>
    197       <option>-Dudev-dir=/lib/udev</option>: This switch
     197      <parameter>-Dudev-dir=/lib/udev</parameter>: This switch
    198198      specifies where UDev rules and hwdb files will be installed.
    199199    </para>
    200200
    201201    <para>
    202       <option>-Ddebug-gui=false</option>: This switch
     202      <parameter>-Ddebug-gui=false</parameter>: This switch
    203203      disables creation of a visual debug helper for libinput. Remove
    204204      if you want it, and you have <xref linkend="gtk3"/> installed.
     
    206206
    207207    <para>
    208       <option>-Dtests=false</option>: This switch disables compilation of the
    209       main tests.  Even with the tests defined as false, you can still run the
    210       first four minor tests, as a regular user, but one will be skipped if
    211       <ulink url="https://pypi.org/project/pyparsing">PyParsing</ulink> is not installed.
    212     </para>
    213 
    214     <para>
    215       <option>-Ddocumentation=false</option>: This switch disables
     208      <parameter>-Dtests=false</parameter>: This switch disables compilation of
     209      the main tests.  Even with the tests defined as false, you can still run
     210      the first four minor tests, as a regular user, but one will be skipped if
     211      <ulink url="https://pypi.org/project/pyparsing">PyParsing</ulink> is not
     212      installed.
     213    </para>
     214
     215    <para>
     216      <parameter>-Ddocumentation=false</parameter>: This switch disables
    216217      generation of the documentation. Remove if you want to generate it, and
    217218      you have <xref linkend="doxygen"/> and <xref linkend="graphviz"/>
     
    219220    </para>
    220221
    221     <para revision="sysv">
    222       <option>-Dlibwacom=false</option>: Remove this
    223       option if you have the external library libwacom installed.
    224     </para>
    225 
    226     <para revision="systemd">
    227       <option>-Dlibwacom=false</option>: Remove this option if you
     222    <para>
     223      <parameter>-Dlibwacom=false</parameter>: Remove this option if you
    228224      have <xref linkend="libwacom"/> installed, or if you are installing
    229225      GNOME.
  • x/lib/libnotify.xml

    r5f308941 rcac7f93  
    9494    <para role="required">
    9595      <xref role="runtime" linkend="notification-daemon"/> or
    96       <xref role="runtime" linkend="xfce4-notifyd"/>
     96      <xref role="nodep" linkend="xfce4-notifyd"/>
    9797    </para>
    9898
  • xsoft/office/gnumeric.xml

    r5f308941 rcac7f93  
    8484      an icon theme such as
    8585      <xref role="runtime" linkend="adwaita-icon-theme"/>,
    86       <xref role="runtime" linkend="oxygen-icons5"/> or
     86      <xref role="nodep" linkend="oxygen-icons5"/>, or
    8787      <xref role="runtime" linkend="gnome-icon-theme"/>,
    8888      <xref role="runtime" linkend="x-window-system"/>, and
  • xsoft/other/inkscape.xml

    r5f308941 rcac7f93  
    102102      <xref linkend="imagemagick6"/>,
    103103      <xref linkend="lcms2"/> or
    104       <xref linkend="lcms"/>,
     104      <xref role="nodep" linkend="lcms"/>,
    105105      <xref linkend="libcanberra"/> (to eliminate plugin warnings),
    106106      <xref linkend="potrace"/> (for the bucket-fill tool),
  • xsoft/other/pidgin.xml

    r5f308941 rcac7f93  
    8484      <xref linkend="gstreamer10"/> (required for audio support), and
    8585      <xref linkend="gnutls"/> or
    86       <xref linkend="nss"/>
     86      <xref role="nodep" linkend="nss"/>
    8787    </para>
    8888
  • xsoft/other/xarchiver.xml

    r5f308941 rcac7f93  
    9595    <bridgehead renderas="sect4">Required</bridgehead>
    9696    <para role="required">
    97       <xref linkend="gtk2"/> or
     97      <xref role="nodep" linkend="gtk2"/> or
    9898      <xref linkend="gtk3"/>
    9999    </para>
  • xsoft/other/xdg-utils.xml

    r5f308941 rcac7f93  
    7979      <xref linkend="xmlto"/> with one of
    8080      <xref linkend="lynx"/>,
    81       <xref linkend="Links"/>, or
     81      <xref role="nodep" linkend="Links"/>, or
    8282      <ulink url="&w3m-url;">W3m</ulink>
    8383    </para>
Note: See TracChangeset for help on using the changeset viewer.