Ignore:
Timestamp:
12/04/2021 08:32:42 AM (2 years ago)
Author:
Pierre Labastie <pierre.labastie@…>
Branches:
qt5new
Children:
104ff4e
Parents:
ce5723af (diff), edd2feb7 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.
Message:

Merge branch 'trunk' into qt5new

File:
1 edited

Legend:

Unmodified
Added
Removed
  • general/genutils/shared-mime-info.xml

    rce5723af r1daaab6d  
    1010  <!ENTITY shared-mime-info-md5sum        "8d059fb2d34062a67fd9ca63fab1fb91">
    1111  <!ENTITY shared-mime-info-size          "5.0 MB">
    12   <!ENTITY shared-mime-info-buildsize     "26 MB">
    13   <!ENTITY shared-mime-info-time          "less than 0.1 SBU">
     12  <!ENTITY shared-mime-info-buildsize     "30 MB (add 1MB if running the tests)">
     13  <!ENTITY shared-mime-info-time          "less than 0.1 SBU using parallelism=4">
     14
     15  <!ENTITY xdgmime-download-http "&sources-anduin-http;/xdgmime/xdgmime.tar.xz">
     16  <!ENTITY xdgmime-md5sum        "7dfb4446705d345d3acd672024049e86">
     17
    1418]>
    1519
     
    6973        <para>
    7074          Estimated build time: &shared-mime-info-time;
     75        </para>
     76      </listitem>
     77    </itemizedlist>
     78
     79    <bridgehead renderas="sect3">Additional Downloads</bridgehead>
     80    <itemizedlist spacing="compact">
     81      <listitem>
     82        <para>
     83          Required patch to allow building with meson-0.60 and later:
     84          <ulink url="&patch-root;/shared-mime-info-&shared-mime-info-version;-meson_0.60_fix-1.patch"/>
     85        </para>
     86      </listitem>
     87      <listitem>
     88        <para>
     89          Optional download, required to run the testsuite:
     90          <ulink url="&xdgmime-download-http;"/>
     91        </para>
     92        <para>
     93          xdgmime md5sum: &xdgmime-md5sum;
    7194        </para>
    7295      </listitem>
     
    96119    </para>
    97120
     121    <para>
     122      If you wish to run the test suite, you must first extract the
     123      <filename>xdgmime</filename> tarball into the current directory,
     124      and compile it so that <command>meson</command> can find it:
     125    </para>
     126
     127<screen remap="test"><userinput>tar -xf ../xdgmime.tar.xz &amp;&amp;
     128make -C xdgmime</userinput></screen>
     129
     130    <para>
     131      One of the changes in meson-0.60 broke this package. To fix that
     132      apply a patch:
     133    </para>
     134
     135<screen><userinput>patch -p1 -i ../shared-mime-info-&shared-mime-info-version;-meson_0.60_fix-1.patch</userinput></screen>
     136
     137    <para>
     138      Now build the package:
     139    </para>
     140
    98141<screen><userinput>mkdir build &amp;&amp;
    99142cd    build &amp;&amp;
     
    102145ninja</userinput></screen>
    103146
    104     <para>
    105       To test the result, issue <command>ninja test</command>.
     147    <para role="optional">
     148      If you have followed the instructions above to build
     149      <application>xdgmime</application>, to test the result issue
     150      <command>ninja test</command>.
    106151    </para>
    107152
Note: See TracChangeset for help on using the changeset viewer.