Changeset 9a3e4ba for general


Ignore:
Timestamp:
02/24/2016 07:31:59 AM (8 years ago)
Author:
DJ Lucas <dj@…>
Branches:
systemd-13485
Children:
996dfc4a
Parents:
a91856d1
Message:

Merge changes from trunk to r17005.

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

Location:
general
Files:
11 edited

Legend:

Unmodified
Added
Removed

  • general/genlib/libgsf.xml

    ra91856d1 r9a3e4ba  
    77  <!ENTITY libgsf-download-http "&gnome-download-http;/libgsf/1.14/libgsf-&libgsf-version;.tar.xz">
    88  <!ENTITY libgsf-download-ftp  "&gnome-download-ftp;/libgsf/1.14/libgsf-&libgsf-version;.tar.xz">
    9   <!ENTITY libgsf-md5sum        "a3e9622b31ab88422d519da72e6f0fa4">
     9  <!ENTITY libgsf-md5sum        "fcd6a9c2b1d939ca57823eb9c0bfa5cd">
    1010  <!ENTITY libgsf-size          "596 KB">
    1111  <!ENTITY libgsf-buildsize     "18 MB (with tests)">

  • general/genlib/libinput.xml

    ra91856d1 r9a3e4ba  
    55  %general-entities;
    66
    7   <!ENTITY libinput-version "1.1.7">
    8 
    97  <!ENTITY libinput-download-http "http://www.freedesktop.org/software/libinput/libinput-&libinput-version;.tar.xz">
    108  <!ENTITY libinput-download-ftp  " ">
    11   <!ENTITY libinput-md5sum        "a501715a6135ac1f772bb5f3e3183481">
    12   <!ENTITY libinput-size          "808 KB">
    13   <!ENTITY libinput-buildsize     "32 MB">
    14   <!ENTITY libinput-time          "0.2 SBU">
     9  <!ENTITY libinput-md5sum        "3dda3e6dd7d0e865896dfe67f4fa0346">
     10  <!ENTITY libinput-size          "792 KB">
     11  <!ENTITY libinput-buildsize     "14 MB">
     12  <!ENTITY libinput-time          "0.1 SBU">
    1513]>
    1614

  • general/genlib/nspr.xml

    ra91856d1 r9a3e4ba  
    88<!--  <!ENTITY nspr-download-ftp "ftp://ftp.mozilla.org/pub/mozilla.org/nspr/releases/v&nspr-version;/src/nspr-&nspr-version;.tar.gz">-->
    99  <!ENTITY nspr-download-ftp " ">
    10   <!ENTITY nspr-md5sum        "4f24b2fb88ca03b5d6d6931d6a67ef9a">
     10  <!ENTITY nspr-md5sum        "0de760c1e00a92e180e611cf06ce9589">
    1111  <!ENTITY nspr-size          "1.1 MB">
    1212  <!ENTITY nspr-buildsize     "12 MB">

  • general/genlib/wayland.xml

    ra91856d1 r9a3e4ba  
    77  <!ENTITY wayland-download-http "http://wayland.freedesktop.org/releases/wayland-&wayland-version;.tar.xz">
    88  <!ENTITY wayland-download-ftp  " ">
    9   <!ENTITY wayland-md5sum        "5e141b3f2a7005d6c89d6f233c87c317">
    10   <!ENTITY wayland-size          "344 KB">
    11   <!ENTITY wayland-buildsize     "10.1 MB">
     9  <!ENTITY wayland-md5sum        "e7751c38807c231afaba9d6b68f2a2b7">
     10  <!ENTITY wayland-size          "361 KB">
     11  <!ENTITY wayland-buildsize     "7.4 MB (plus 3.7 MB if tests are run)">
    1212  <!ENTITY wayland-time          "0.1 SBU">
    1313]>

  • general/genutils/imagemagick.xml

    ra91856d1 r9a3e4ba  
    55  %general-entities;
    66
    7   <!ENTITY imagemagick-patch-version "0">
     7  <!ENTITY imagemagick-patch-version "5">
    88
    99  <!ENTITY imagemagick-download-http " ">
    1010  <!ENTITY imagemagick-download-ftp "ftp://ftp.imagemagick.org/pub/ImageMagick/releases/ImageMagick-&imagemagick-version;-&imagemagick-patch-version;.tar.xz">
    11   <!ENTITY imagemagick-md5sum        "87939f4f82d6f24a28d3106a58d523d8">
     11  <!ENTITY imagemagick-md5sum        "af1c85b8b8f817e919f9ca4408d86782">
    1212  <!ENTITY imagemagick-size          "8.4 MB">
    13   <!ENTITY imagemagick-buildsize     "192 MB, with typical dependencies (226 MB with the test suite, reputedly 450 MB with all dependencies)">
    14   <!ENTITY imagemagick-time          "2.2 SBU - typical build (additional 3.5 SBU to run the test suite and 3.4 SBU to run the validation suite)">
     13  <!ENTITY imagemagick-buildsize     "193 MB, with typical dependencies (222 MB with the test suite, reputedly 450 MB with all dependencies)">
     14  <!ENTITY imagemagick-time          "2.0 SBU - typical build (additional 1.6 SBU to run the test suite and 1.4 SBU to run the validation suite)">
    1515]>
    1616
    … …  
    2727     Also, please look over the output from the configure command for any
    2828     additional dependencies that need to be listed, as ImageMagick is
    29      constantly adding additional features and dependencies. -->
     29     constantly adding additional features and dependencies.
     30
     31     For those of us who touch this infrequently:
     32     DPS/dpsXclient is from apple so not relevant to linux builds
     33     GVC is part of Graphviz and documented in the explanations
     34     LQR is Liquid Rescale  -->
    3035
    3136<sect1 id="imagemagick" xreflabel="ImageMagick-&imagemagick-version;-&imagemagick-patch-version;">
    … …  
    5358    </para>
    5459
    55     &lfs78_checked;
     60<!--&lfs78_checked;-->
    5661
    5762    <bridgehead renderas="sect3">Package Information</bridgehead>
    … …  
    155160      <ulink url="http://www.cl.cam.ac.uk/~mgk25/jbigkit/">JBIG-KIT</ulink>,
    156161      <ulink url="&gnome-download-http;/libgxps/">libgxps</ulink>,
     162      <ulink url="https://github.com/HOST-Oman/libraqm/">libraqm</ulink>,
    157163      <ulink url="http://liblqr.wikidot.com/en:download-page">Liquid Rescale</ulink>,
    158164      <ulink url="http://www.openexr.com/">OpenEXR</ulink>, and
    … …  
    228234      "validation suite" validate.log</command>. Note that the EPS, PS, and PDF
    229235      tests require a working <application>Ghostscript</application>. One test
    230       needs <quote>Helvetica</quote> from <quote>Ghostscript Standard
    231       Fonts</quote>, which are optionally installed in <xref linkend="gs"/>.
     236      in 'make check' needs <quote>Helvetica</quote> from <quote>Ghostscript
     237      Standard Fonts</quote>, which are optionally installed in
     238      <xref linkend="gs"/> - that test, and one other, might fail, but all the
     239      validation can still pass.
    232240    </para>
    233241

  • general/graphlib/freetype2.xml

    ra91856d1 r9a3e4ba  
    138138    -i modules.cfg              &amp;&amp;
    139139
    140 sed -e 's:.*\(#.*SUBPIXEL.*\) .*:\1:' \
     140sed -r -e 's:.*(#.*SUBPIXEL.*) .*:\1:' \
    141141    -i include/freetype/config/ftoption.h  &amp;&amp;
    142142

  • general/graphlib/poppler.xml

    ra91856d1 r9a3e4ba  
    77  <!ENTITY poppler-download-http "http://poppler.freedesktop.org/poppler-&poppler-version;.tar.xz">
    88  <!ENTITY poppler-download-ftp       " ">
    9   <!ENTITY poppler-md5sum             "2fec3b2401a1722418b1f5bf64cd00cd">
    10   <!ENTITY poppler-size               "1.6 MB (additional 9 MB for the test suite)">
    11   <!ENTITY poppler-buildsize          "65 MB (with Qt4 and Qt5 libraries, and tests)">
    12   <!ENTITY poppler-time               "1.6 SBU (with Qt4 and Qt5 libraries, and tests)">
     9  <!ENTITY poppler-md5sum             "849a8bd6af5794efb961b70418414e5a">
     10  <!ENTITY poppler-size               "1.6 MB">
     11  <!ENTITY poppler-buildsize          "42 MB (with Qt4 and Qt5 libraries)">
     12  <!ENTITY poppler-time               "0.7 SBU (with Qt4 and Qt5 libraries)">
    1313
    1414
    … …  
    4545    </para>
    4646
    47     &lfs78_checked;
     47<!--&lfs78_checked;-->
    4848
    4949    <bridgehead renderas="sect3">Package Information</bridgehead>
    … …  
    158158    <title>Installation of Poppler</title>
    159159
     160<!-- as of 0.41.0, nothing to be done for check
    160161    <para>
    161162      In order to optionally run the test suite, an additional download using
    … …  
    165166<screen><userinput>rm -rf testfiles &amp;&amp;
    166167git clone git://git.freedesktop.org/git/poppler/test testfiles</userinput></screen>
     168-->
    167169
    168170    <note>
    … …  
    188190make</userinput></screen>
    189191
    190     <para>
     192<!--<para>
    191193      To test the results, issue: <command>LC_ALL=en_US.UTF-8 make check</command>.
    192     </para>
     194    </para>-->
    193195
    194196    <para>

  • general/prog/git.xml

    ra91856d1 r9a3e4ba  
    99  <!ENTITY git-download-http "&git-root;/git-&git-version;.tar.xz">
    1010  <!ENTITY git-download-ftp  "ftp://ftp.kernel.org/pub/software/scm/git/git-&git-version;.tar.xz">
    11   <!ENTITY git-md5sum        "0214e04f7041f835c5c38f2b78eccced">
    12   <!ENTITY git-size          "3.7 MB">
    13   <!ENTITY git-buildsize     "349 MB (add 28 MB for building documentation)">
    14   <!ENTITY git-time          "0.7 SBU (add 12 SBU for tests and 2.4 SBU for building documentation)">
     11  <!ENTITY git-md5sum        "eece7b1e87983271621a0cb6aab37a25">
     12  <!ENTITY git-size          "3.8 MB">
     13  <!ENTITY git-buildsize     "364 MB (including the pre-built documentation)">
     14  <!ENTITY git-time          "0.8 SBU (add 2.4 SBU for building documentation)">
     15  <!-- tests used to take 12 SBU, grep-2.23 causes them to fail after 4.0 SBU -->
    1516]>
    1617
    … …  
    170171
    171172    <para>
    172       The test suite can be run in parallel mode. To run the test suite, issue:
    173       <command>make test</command>.
     173<!--  The test suite can be run in parallel mode. To run the test suite, issue: -->
     174      The test suite fails early, in 'blame respects encoding', because grep-2.23
     175      treats data in the locale tests as binary.  To run the tests up to that
     176      point issue:
     177      <command>make test</command>. -->
    174178    </para>
    175179

  • general/prog/lua.xml

    ra91856d1 r9a3e4ba  
    120120    <title>Installation of Lua</title>
    121121
    122     <para>
    123       Install <application>Lua</application> by running the following
    124       commands:
    125     </para>
    126 
    127 <screen><userinput>patch -Np1 -i ../lua-&lua-version;-shared_library-1.patch &amp;&amp;
    128 
    129 sed -i '/#define LUA_ROOT/s:/usr/local/:/usr/:' src/luaconf.h &amp;&amp;
    130 
    131 make linux</userinput></screen>
    132 
    133     <para>
    134       To test the results, issue: <command>make test</command>.
    135       <quote>This will run the interpreter and print its version.</quote>.
    136       More comprehensive tests can be performed if you downloaded the "Test
    137       suite" tarball. Those tests need to be executed after the package is
    138       installed, thus we defer to describe then below.
    139     </para>
    140 
    141     <para>
    142       Now, as the <systemitem class="username">root</systemitem> user:
    143     </para>
    144 
    145 <screen role="root"><userinput>make INSTALL_TOP=/usr TO_LIB="liblua.so liblua.so.5.3 liblua.so.&lua-version;" \
    146      INSTALL_DATA="cp -d" INSTALL_MAN=/usr/share/man/man1 install &amp;&amp;
    147 
    148 mkdir -pv /usr/share/doc/lua-&lua-version; &amp;&amp;
    149 cp -v doc/*.{html,css,gif,png} /usr/share/doc/lua-&lua-version;</userinput></screen>
    150 
    151122    <para>Some packages check for the <application>pkg-config</application> file
    152     for <application>Lua</application>. As the
    153     <systemitem class="username">root</systemitem> user:</para>
    154 
    155 <screen role="root"><userinput>cat &gt; /usr/lib/pkgconfig/lua.pc &lt;&lt; "EOF"
     123    for <application>Lua</application>, wich is created with:</para>
     124
     125<screen role="root"><userinput>cat &gt; lua.pc &lt;&lt; "EOF"
    156126<literal>V=5.3
    157127R=&lua-version;
    … …  
    177147
    178148    <para>
     149      Install <application>Lua</application> by running the following
     150      commands:
     151    </para>
     152
     153<screen><userinput>patch -Np1 -i ../lua-&lua-version;-shared_library-1.patch &amp;&amp;
     154
     155sed -i '/#define LUA_ROOT/s:/usr/local/:/usr/:' src/luaconf.h &amp;&amp;
     156
     157make MYCFLAGS="-DLUA_COMPAT_5_2 -DLUA_COMPAT_5_1" linux</userinput></screen>
     158
     159    <para>
     160      To test the results, issue: <command>make test</command>.
     161      <quote>This will run the interpreter and print its version.</quote>.
     162      More comprehensive tests can be performed if you downloaded the "Test
     163      suite" tarball. Those tests need to be executed after the package is
     164      installed, thus we defer to describe then below.
     165    </para>
     166
     167    <para>
     168      Now, as the <systemitem class="username">root</systemitem> user:
     169    </para>
     170
     171<screen role="root"><userinput>make INSTALL_TOP=/usr TO_LIB="liblua.so liblua.so.5.3 liblua.so.&lua-version;" \
     172     INSTALL_DATA="cp -d" INSTALL_MAN=/usr/share/man/man1 install &amp;&amp;
     173
     174mkdir -pv /usr/share/doc/lua-&lua-version; &amp;&amp;
     175cp -v doc/*.{html,css,gif,png} /usr/share/doc/lua-&lua-version; &amp;&amp;
     176
     177install -v -m644 -D lua.pc /usr/lib/pkgconfig/lua.pc</userinput></screen>
     178
     179    <para>
    179180      We are going to describe only the "Basic tests". Untar the tarball and
    180181      change to the
    … …  
    194195      <command>sed -i ... src/luaconf.h</command>: This command changes
    195196      <application>Lua</application> search path to match the install paths.
     197    </para>
     198
     199    <para>
     200      <envar>MYCFLAGS="-DLUA_COMPAT_5_2 -DLUA_COMPAT_5_1"</envar>: This
     201      environment variable includes compatibility layers with Lua 5.1 and 5.2
     202      in the build.
    196203    </para>
    197204

  • general/sysutils/sg3_utils.xml

    ra91856d1 r9a3e4ba  
    77  <!ENTITY sg3_utils-download-http "http://sg.danny.cz/sg/p/sg3_utils-&sg3_utils-version;.tar.xz">
    88  <!ENTITY sg3_utils-download-ftp  " ">
    9   <!ENTITY sg3_utils-md5sum        "79c8e3c0b2e4bad7dcba3e1ab090f3b4">
    10   <!ENTITY sg3_utils-size          "736 KB">
    11   <!ENTITY sg3_utils-buildsize     "18 MB">
     9  <!ENTITY sg3_utils-md5sum        "913ac2c9069d2ba44e05565a445810ab">
     10  <!ENTITY sg3_utils-size          "752 KB">
     11  <!ENTITY sg3_utils-buildsize     "23 MB">
    1212  <!ENTITY sg3_utils-time          "0.2 SBU">
    1313]>

  • general/sysutils/usbutils.xml

    ra91856d1 r9a3e4ba  
    149149    </para>
    150150
    151 <screen role="root"><userinput>wget http://www.linux-usb.org/usb.ids -O /usr/share/hwdata/usb.ids</userinput></screen>
     151<screen role="root"><userinput>wget http://www.linux-usb.org/usb.ids -O /usr/share/misc/usb.ids</userinput></screen>
    152152
    153153    <para>
Note: See TracChangeset for help on using the changeset viewer.