Changeset 54ed60b


Ignore:
Timestamp:
12/18/2018 06:52:07 AM (6 years ago)
Author:
DJ Lucas <dj@…>
Branches:
elogind
Children:
6b5b519d
Parents:
db38f7b
Message:

Merge to HEAD 20836

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

Files:
10 edited

Legend:

Unmodified
Added
Removed

  • general.ent

    rdb38f7b r54ed60b  
    11<!-- $LastChangedBy$ $Date$ -->
    22
    3 <!ENTITY day          "15">                   <!-- Always 2 digits -->
     3<!ENTITY day          "17">                   <!-- Always 2 digits -->
    44<!ENTITY month        "12">                   <!-- Always 2 digits -->
    55<!ENTITY year         "2018">

  • general/genlib/glib2.xml

    rdb38f7b r54ed60b  
    9797        (both may be used in some tests),
    9898      <xref linkend="DocBook"/>,
    99       <xref linkend="docbook-xsl"/>,
    100       <xref linkend="gtk-doc"/>, and
     99      <xref linkend="docbook-xsl"/>, and
     100      <xref linkend="gtk-doc"/>
    101101        (to build api documentation)
    102102    </para>

  • general/prog/mako.xml

    rdb38f7b r54ed60b  
    7171      <bridgehead renderas="sect5">Required</bridgehead>
    7272      <para role="required">
    73         <xref linkend="Beaker"/> and
     73<!--        <xref linkend="Beaker"/> and -->
    7474        <xref linkend="MarkupSafe"/>
    7575      </para>
    … …  
    8282    <sect3 role="installation">
    8383      <title>Installation of Mako</title>
    84 
     84<!--
    8585      <note>
    8686        <para>
    … …  
    9090        </para>
    9191      </note>
    92 
     92-->
    9393<!-- Editors note: Use - -root= instead of DESTDIR= when updating. -->
    94 
     94<!--
    9595      <para>
    9696        To install the <application>Python 2</application> module,
    … …  
    9999      </para>
    100100
    101 <screen role="root"><userinput>python setup.py install --optimize=1</userinput></screen>
    102 
     101<screen role="root"><userinput>python setup.py install - -optimize=1</userinput></screen>
     102-->
    103103      <para>
    104104        To install the <application>Python 3</application> module,
    … …  
    107107      </para>
    108108
    109 <screen role="root"><userinput>sed -i "s:mako-render:&amp;3:g" setup.py &amp;&amp;
    110 python3 setup.py install --optimize=1</userinput></screen>
    111 
     109<!--sed -i "s:mako-render:&amp;3:g" setup.py &amp;&amp;-->
     110<screen role="root"><userinput>python3 setup.py install --optimize=1</userinput></screen>
    112111    </sect3>
    113 
     112<!--
    114113    <sect3 role="commands">
    115114      <title>Command Explanations</title>
    … …  
    124123
    125124    </sect3>
    126 
     125-->
    127126    <sect3 role="content">
    128127      <title>Contents</title>
    … …  
    135134        <seglistitem>
    136135          <seg>
    137             mako-render and/or mako-render3
     136            <!--mako-render and/or--> mako-render3
    138137          </seg>
    139138          <seg>
    … …  
    141140          </seg>
    142141          <seg>
    143             /usr/lib/python&python2-majorver;/site-packages/mako,
    144             /usr/lib/python&python2-majorver;/site-packages/Mako-&mako-version;-py&python2-majorver;.egg-info and/or
    145             /usr/lib/python&python3-majorver;/site-packages/mako,
     142<!--            /usr/lib/python&python2-majorver;/site-packages/mako,
     143            /usr/lib/python&python2-majorver;/site-packages/Mako-&mako-version;-py&python2-majorver;.egg-info and/or-->
     144            /usr/lib/python&python3-majorver;/site-packages/mako and
    146145            /usr/lib/python&python3-majorver;/site-packages/Mako-&mako-version;-py&python3-majorver;.egg-info
    147146          </seg>

  • general/prog/markupsafe.xml

    rdb38f7b r54ed60b  
    8282    <sect3 role="installation">
    8383      <title>Installation of MarkupSafe</title>
    84 
     84<!--
    8585      <note>
    8686        <para>
    … …  
    9090        </para>
    9191      </note>
    92 
     92-->
    9393<!-- Editors note: Use - -root= instead of DESTDIR= when updating. -->
    94 
     94<!--
    9595      <para>
    9696        To build the <application>Python 2</application> module,
    … …  
    106106      </para>
    107107
    108 <screen role="root"><userinput>python setup.py install --optimize=1</userinput></screen>
    109 
     108<screen role="root"><userinput>python setup.py install - -optimize=1</userinput></screen>
     109-->
    110110      <para>
    111111        To build the <application>Python 3</application> module,
    … …  
    141141          </seg>
    142142          <seg>
    143             /usr/lib/python&python2-majorver;/site-packages/markupsafe,
    144             /usr/lib/python&python2-majorver;/site-packages/MarkupSafe-&MarkupSafe-version;-py&python2-majorver;.egg-info and/or
    145             /usr/lib/python&python3-majorver;/site-packages/markupsafe,
     143i<!--            /usr/lib/python&python2-majorver;/site-packages/markupsafe,
     144            /usr/lib/python&python2-majorver;/site-packages/MarkupSafe-&MarkupSafe-version;-py&python2-majorver;.egg-info and/or-->
     145            /usr/lib/python&python3-majorver;/site-packages/markupsafe and
    146146            /usr/lib/python&python3-majorver;/site-packages/MarkupSafe-&MarkupSafe-version;-py&python3-majorver;.egg-info
    147147          </seg>

  • general/prog/python-modules.xml

    rdb38f7b r54ed60b  
    7575        </para>
    7676      </listitem>
    77       <listitem>
     77<!--      <listitem>
    7878        <para>
    7979          <xref linkend="funcsigs"/>
    … …  
    8484          <xref linkend="Beaker"/>
    8585        </para>
    86       </listitem>
     86      </listitem> -->
    8787      <listitem>
    8888        <para>
    … …  
    166166    href="funcsigs.xml"/>
    167167
    168   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    169     href="beaker.xml"/>
     168<!--  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     169    href="beaker.xml"/>-->
    170170
    171171  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"

  • introduction/welcome/changelog.xml

    rdb38f7b r54ed60b  
    4747      <itemizedlist>
    4848        <listitem>
     49          <para>[bdubbs] - Clean up python modules. Remove unneeded
     50          funcsigs and beaker. Remove unneeded python2 builds of markupsafe
     51          and mako.</para>
     52        </listitem>
     53        <listitem>
     54          <para>[bdubbs] - Update to xterm-340. Fixes
     55          <ulink url="&blfs-ticket-root;11456">#11456</ulink>.</para>
     56        </listitem>
     57        <listitem>
     58          <para>[bdubbs] - Update to intel-vaapi-driver-2.3.0. Fixes
     59          <ulink url="&blfs-ticket-root;11430">#11430</ulink>.</para>
     60        </listitem>
     61        <listitem>
    4962          <para>[dj] - Add periodic cron configuration for fcron.</para>
    5063        </listitem>

  • packages.ent

    rdb38f7b r54ed60b  
    662662<!ENTITY xorg-server-version          "1.20.3">
    663663<!ENTITY twm-version                  "1.0.10">
    664 <!ENTITY xterm-version                "339">
     664<!ENTITY xterm-version                "340">
    665665<!ENTITY xclock-version               "1.0.7">
    666666<!ENTITY xinit-version                "1.4.0">
    667667
    668668<!ENTITY libva-version                "2.3.0">
    669 <!ENTITY libva-intel-driver-version   "2.2.0"> <!-- intel-vaapi-driver -->
     669<!ENTITY libva-intel-driver-version   "2.3.0"> <!-- intel-vaapi-driver -->
    670670<!ENTITY libvdpau-version             "1.1.1">
    671671<!ENTITY libvdpau-va-gl-version       "0.4.0">

  • x/installing/libva.xml

    rdb38f7b r54ed60b  
    1515  <!ENTITY libva-intel-driver-download-http "https://github.com/intel/intel-vaapi-driver/releases/download/&libva-intel-driver-version;/intel-vaapi-driver-&libva-intel-driver-version;.tar.bz2">
    1616  <!ENTITY libva-intel-driver-download-ftp  " ">
    17   <!ENTITY libva-intel-driver-md5sum        "e296c52fa1cb5c3d53a6cc994ce0a66c">
     17  <!ENTITY libva-intel-driver-md5sum        "9d835d1a3f7a9ef394f0f4c348cd4b3e">
    1818  <!ENTITY libva-intel-driver-size          "2.8 MB">
    19   <!ENTITY libva-intel-driver-buildsize     "99 MB">
     19  <!ENTITY libva-intel-driver-buildsize     "97 MB">
    2020  <!ENTITY libva-intel-driver-time          "0.3 SBU">
    2121]>

  • x/installing/mesa.xml

    rdb38f7b r54ed60b  
    9797    <para role="required">
    9898      <xref linkend="xorg7-lib"/>,
    99       <xref linkend="libdrm"/>,
    100       <xref linkend="Mako"/>, and
    101       <xref linkend="python2"/>
     99      <xref linkend="libdrm"/>, and
     100      <xref linkend="Mako"/>
    102101    </para>
    103102
    … …  
    126125      <xref linkend="libgcrypt"/>,
    127126      <xref linkend="nettle"/>,
     127      <xref linkend="python2"/> (not used if Python3 is present),
    128128      <ulink url="ftp://ftp.freedesktop.org/pub/mesa/demos/">mesa-demos</ulink>
    129129      (provides more than 300 extra demos to test

  • x/installing/xterm.xml

    rdb38f7b r54ed60b  
    88  <!--<!ENTITY xterm-download-ftp  "ftp://invisible-island.net/xterm/xterm-&xterm-version;.tgz">-->
    99  <!ENTITY xterm-download-ftp  " ">
    10   <!ENTITY xterm-md5sum        "d5b78976a11295ec088a076c5af1a4d3">
     10  <!ENTITY xterm-md5sum        "770e081e44d6b14c6485fa30d84a7427">
    1111  <!ENTITY xterm-size          "1.3 MB">
    1212  <!ENTITY xterm-buildsize     "13 MB">
Note: See TracChangeset for help on using the changeset viewer.