Changeset 37191af for xsoft


Ignore:
Timestamp:
05/07/2016 04:37:10 AM (8 years ago)
Author:
Douglas R. Reno <renodr@…>
Branches:
systemd-13485
Children:
d7bee48
Parents:
54aaa89
Message:

Sync to trunk r17270. Last round for the night.

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

Location:
xsoft
Files:
5 edited

Legend:

Unmodified
Added
Removed

  • xsoft/office/gnumeric.xml

    r54aaa89 r37191af  
    77  <!ENTITY gnumeric-download-http "&gnome-download-http;/gnumeric/1.12/gnumeric-&gnumeric-version;.tar.xz">
    88  <!ENTITY gnumeric-download-ftp  "&gnome-download-ftp;/gnumeric/1.12/gnumeric-&gnumeric-version;.tar.xz">
    9   <!ENTITY gnumeric-md5sum        "bb417125db591261d5aa75b11bfa50de">
     9  <!ENTITY gnumeric-md5sum        "147ddb28b9ec7106d36f4ff82f66f840">
    1010  <!ENTITY gnumeric-size          "18 MB">
    11   <!ENTITY gnumeric-buildsize     "329 MB (with tests)">
    12   <!ENTITY gnumeric-time          "1.9 SBU (additional 6.7 SBU for tests)">
     11  <!ENTITY gnumeric-buildsize     "313 MB (with tests)">
     12  <!ENTITY gnumeric-time          "1.6 SBU (additional 8.6 SBU for tests)">
    1313]>
    1414
    … …  
    141141
    142142    <para>
    143       If you wish to test the results, first disable three tests which fail:
     143      If you wish to test the results, first disable one test which fails:
    144144
    145145<screen><userinput>sed \
    146   -e '/\tt6500-strings.*/d;/\tt6506-cell-comments.*/d;/\tt6509-validation.*/d' \
     146  -e '/\tt1013-crlibm.*/d' \
    147147  -i test/Makefile</userinput></screen>
    148148

  • xsoft/office/libreoffice.xml

    r54aaa89 r37191af  
    88
    99  <!ENTITY libreoffice-core-download-http "&libreoffice-dl;/libreoffice-&libreoffice-dlversion;.tar.xz">
    10   <!ENTITY libreoffice-core-md5sum        "a0cbe7fe9368e35068bd619281380379">
    11   <!ENTITY libreoffice-core-size          "168 MB">
     10  <!ENTITY libreoffice-core-md5sum        "6145510261094a85a6cecaecefa10c94">
     11  <!ENTITY libreoffice-core-size          "166 MB">
    1212
    1313  <!ENTITY libreoffice-dict-download-http "&libreoffice-dl;/libreoffice-dictionaries-&libreoffice-dlversion;.tar.xz">
    14   <!ENTITY libreoffice-dict-md5sum        "1daa2553486a991f4a19d3fd8f9ecc6a">
    15   <!ENTITY libreoffice-dict-size          "37 MB">
     14  <!ENTITY libreoffice-dict-md5sum        "05188274ca5b5aac92f0321e4cf153d7">
     15  <!ENTITY libreoffice-dict-size          "36 MB">
    1616
    1717  <!ENTITY libreoffice-help-download-http "&libreoffice-dl;/libreoffice-help-&libreoffice-dlversion;.tar.xz">
    18   <!ENTITY libreoffice-help-md5sum        "e24d7920ef9fc36f977ebb954173fd43">
    19   <!ENTITY libreoffice-help-size          "1.9 MB">
     18  <!ENTITY libreoffice-help-md5sum        "0ff7ef91f9f84d5a9a21e3bee72bdae7">
     19  <!ENTITY libreoffice-help-size          "1.8 MB">
    2020
    2121  <!ENTITY libreoffice-translations-download-http "&libreoffice-dl;/libreoffice-translations-&libreoffice-dlversion;.tar.xz">
    22   <!ENTITY libreoffice-translations-md5sum        "76495173c3e7a74f4aa53198d8bb99e5">
     22  <!ENTITY libreoffice-translations-md5sum        "4075e99e6075fb7bd163a5f66e24c0f3">
    2323  <!ENTITY libreoffice-translations-size          "126 MB">
    2424
    2525
    2626  <!ENTITY libreoffice-buildsize          "9.9 GB (643 MB installed)">
    27   <!ENTITY libreoffice-time               "55 SBU with parallelism = 4 (reputedly 202+ SBU with one core)">
     27  <!ENTITY libreoffice-time               "54 SBU with parallelism = 4 + download time">
    2828
    2929  <!-- This package has some peculiarities, some discussed in the text.
    … …  
    394394sed -e "/distro-install-file-lists/d" -i Makefile.in &amp;&amp;
    395395
    396 sed -i "s#isnan#std::&amp;#g" xmloff/source/draw/ximp3dscene.cxx &amp;&amp;
     396<!-- Seems to be fixed in 5.1.2.2
     397sed -i "s#isnan#std::&amp;#g" xmloff/source/draw/ximp3dscene.cxx &amp;&amp; -->
    397398
    398399chmod -v +x bin/unpack-sources &amp;&amp;
    … …  
    519520    <para>
    520521      <command>sed -e ...</command>: The first sed prevents compression of the
    521       manual pages, the second one prevents install from failing and the third
     522      manual pages andthe second one prevents the install from failing.
     523      <!-- and the third
    522524      one fixes a build failure caused by a <application>glibc-2.23</application>
    523       change.
     525      change. -->
    524526    </para>
    525527

  • xsoft/other/fontforge.xml

    r54aaa89 r37191af  
    55  %general-entities;
    66
    7   <!ENTITY fontforge-download-http "https://github.com/fontforge/fontforge/releases/download/&fontforge-version;/fontforge-&fontforge-version;.tar.gz">
     7  <!ENTITY fontforge-download-http "https://github.com/fontforge/fontforge/releases/download/&fontforge-version;/fontforge-dist-&fontforge-version;.tar.gz">
    88  <!ENTITY fontforge-download-ftp  " ">
    9   <!ENTITY fontforge-md5sum        "74c49c73822d642b0511718d8eeb2210">
     9  <!ENTITY fontforge-md5sum        "db98d07cfee624c21d7d6ca37fe0ca14">
    1010  <!ENTITY fontforge-size          "20 MB">
    11   <!ENTITY fontforge-buildsize     "243 MB (without tests)">
    12   <!ENTITY fontforge-time          "1.5 SBU (without tests)">
     11  <!ENTITY fontforge-buildsize     "243 MB (plus an additional 1 MB for the tests)">
     12  <!ENTITY fontforge-time          "1.7 SBU (plus an additional 0.2 SBU for the tests)">
    1313]>
    1414
    … …  
    119119    <title>Installation of FontForge</title>
    120120
     121    <note>
     122      <para>
     123        For this version there is a separate and much larger fontforge tarball
     124        without the -dist- in its name, do not try to use that. The -dist-
     125        version was created a few minutes later, but the version was typo'd
     126        and it will untar to fontforge-2.0-20140101.
     127      </para>
     128    </note>
     129
    121130    <para>
    122131      Install <application>FontForge</application> by running the following
    … …  
    124133    </para>
    125134
    126 <screen><userinput>sed -i 's%naist.jp/pub/NetBSD/packages%netbsd.org/pub/pkgsrc%' \
    127   tests/Makefile.in &amp;&amp;
     135<screen><userinput>sed -i 's/20140101/20160404/g' configure inc/fontforge-config.h \
     136  tests/package.m4 tests/testsuite &amp;&amp;
    128137./configure --prefix=/usr     \
    129138            --enable-gtk2-use \
    … …  
    134143    <para>
    135144      To test the results, issue: <command>make check</command>.
     145      This will download two ttf files.
    136146    </para>
    137147
    … …  
    142152<screen role="root"><userinput>make install</userinput></screen>
    143153
     154<!--
    144155    <note>
    145156      <para>
    … …  
    155166    -i /usr/share/applications/fontforge.desktop</userinput></screen>
    156167    </note>
     168-->
    157169
    158170  </sect2>
    … …  
    162174
    163175    <para>
    164       <parameter>sed -i 's%naist.jp/pub/NetBSD/packages%netbsd.org/pub/pkgsrc%'</parameter>
    165       The tests get the MunhwaGothic-Bold font - it is no longer at that mirror,
    166       so use the primary NetBSD source.
    167     </para>
    168 
    169     <para>
    170       <parameter>--enable-gtk2-use</parameter>: allows to use the GTK+2 graphics
     176      <parameter>sed -i 's/20140101/20160404/g' ...</parameter>:
     177      This changes the typo'd date, particularly in the pkgconfig files
     178      and the log from the tests.
     179    </para>
     180
     181    <para>
     182      <parameter>--enable-gtk2-use</parameter>: uses the GTK+2 graphics
    171183      instead of basic Xorg graphics.
    172184    </para>

  • xsoft/other/gimp.xml

    r54aaa89 r37191af  
    187187    </para>
    188188
    189 <screen><userinput>./configure --prefix=/usr \
     189<screen><userinput>sed -i '/gegl/s/2/3/' configure.ac &amp;&amp;
     190autoreconf -fiv                    &amp;&amp;
     191./configure --prefix=/usr \
    190192            --sysconfdir=/etc \
    191193            --without-gvfs &amp;&amp;
    … …  
    215217    <para>
    216218      The <filename>gimp-help</filename> tarball contains images and English
    217       text help for help files, together with translations.<!-- It is
    218       &quot;work in progress&quot;.-->
     219      text help for help files, together with translations.
    219220    </para>
    220221
    … …  
    268269  <sect2 role="commands" id="gimp-cmd-explanations">
    269270    <title>Command Explanations</title>
     271
     272    <para>
     273      <command>sed ... configure.ac</command>: This command allows
     274      building with the current version of gegl.
     275    </para>
    270276
    271277    <para>

  • xsoft/other/thunderbird.xml

    r54aaa89 r37191af  
    55  %general-entities;
    66
    7   <!ENTITY thunderbird-download-http "&mozilla-http;/thunderbird/releases/&thunderbird-version;/source/thunderbird-&thunderbird-version;.source.tar.bz2">
    8 <!--  <!ENTITY thunderbird-download-ftp "&mozilla-ftp;/thunderbird/releases/&thunderbird-version;/source/thunderbird-&thunderbird-version;.source.tar.bz2">-->
     7  <!ENTITY thunderbird-download-http "&mozilla-http;/thunderbird/releases/&thunderbird-version;/source/thunderbird-&thunderbird-version;.source.tar.xz">
     8<!--  <!ENTITY thunderbird-download-ftp "&mozilla-ftp;/thunderbird/releases/&thunderbird-version;/source/thunderbird-&thunderbird-version;.source.tar.xz">-->
    99  <!ENTITY thunderbird-download-ftp " ">
    10   <!ENTITY thunderbird-md5sum            "110a1a31bb4fe7d50cfbfbfd65e5968b">
    11   <!ENTITY thunderbird-size              "195 MB">
     10  <!ENTITY thunderbird-md5sum            "7f0071afbcd2be0933f34d12122ca162">
     11  <!ENTITY thunderbird-size              "191 MB">
    1212  <!ENTITY thunderbird-buildsize         "3.8 GB (73 MB installed)">
    1313  <!ENTITY thunderbird-time              "9.3 SBU (with -j4, estimated 30 SBU with -j1)">
Note: See TracChangeset for help on using the changeset viewer.