Changeset a3d36f2 for general


Ignore:
Timestamp:
10/09/2022 08:04:35 PM (2 years ago)
Author:
Pierre Labastie <pierre.labastie@…>
Branches:
11.3, 12.0, 12.1, 12.2, gimp3, kea, ken/TL2024, ken/inkscape-core-mods, ken/tuningfonts, lazarus, lxqt, plabs/newcss, plabs/python-mods, python3.11, qt5new, rahul/power-profiles-daemon, renodr/vulkan-addition, trunk, xry111/for-12.3, xry111/llvm18, xry111/spidermonkey128, xry111/xf86-video-removal
Children:
2a0f15bc
Parents:
b3e18015 (diff), 13d9cb6a (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 plabs/python-mods

Location:
general
Files:
11 edited

Legend:

Unmodified
Added
Removed

  • general/genlib/gspell.xml

    rb3e18015 ra3d36f2  
    77  <!ENTITY gspell-download-http "&gnome-download-http;/gspell/&gspell-minor;/gspell-&gspell-version;.tar.xz">
    88  <!ENTITY gspell-download-ftp  " ">
    9   <!ENTITY gspell-md5sum        "8c738e40e8b76ee7f614fff75d995ad4">
    10   <!ENTITY gspell-size          "424 KB">
    11   <!ENTITY gspell-buildsize     "11 MB (with tests)">
     9  <!ENTITY gspell-md5sum        "f8e39fc95d3f0651e943b5ccb95694b7">
     10  <!ENTITY gspell-size          "423 KB">
     11  <!ENTITY gspell-buildsize     "13 MB (with tests)">
    1212  <!ENTITY gspell-time          "0.2 SBU (with tests)">
    1313]>
    … …  
    7575    <para role="required">
    7676      <xref linkend="enchant"/>,
    77       <xref linkend="icu"/> and
     77      <xref linkend="icu"/>, and
    7878      <xref linkend="gtk3"/>
    7979    </para>
    … …  
    104104
    105105    <para>
    106       To test the results, issue: <command>make check</command>. One test,
    107       test-checker,
    108       is known to fail if the external package
    109       <ulink url="https://hunspell.github.io/">Hunspell</ulink> is not installed.
    110       The tests also must be run in an X session.
     106      To test the results, issue: <command>make check</command>.  The tests
     107      must be run in an X session. One test, test-checker, is known to fail if
     108      the external package
     109      <ulink url="https://hunspell.github.io/">Hunspell</ulink> is not
     110      installed.
    111111    </para>
    112112

  • general/genlib/libgusb.xml

    rb3e18015 ra3d36f2  
    77  <!ENTITY libgusb-download-http "https://people.freedesktop.org/~hughsient/releases/libgusb-&libgusb-version;.tar.xz">
    88  <!ENTITY libgusb-download-ftp  " ">
    9   <!ENTITY libgusb-md5sum        "0eedc08183367d8238b2d1fc39897913">
     9  <!ENTITY libgusb-md5sum        "8857f058a72d5a7ec1642a616ba34f2b">
    1010  <!ENTITY libgusb-size          "52 KB">
    1111  <!ENTITY libgusb-buildsize     "2.0 MB (with tests)">

  • general/genutils/highlight.xml

    rb3e18015 ra3d36f2  
    77  <!ENTITY highlight-download-http "http://www.andre-simon.de/zip/highlight-&highlight-version;.tar.bz2">
    88  <!ENTITY highlight-download-ftp  " ">
    9   <!ENTITY highlight-md5sum        "bb325c237ed1175e23acac55f2106a7c">
     9  <!ENTITY highlight-md5sum        "4c318f650c5f7447207ae7de7b9847c0">
    1010  <!ENTITY highlight-size          "1.4 MB">
    11   <!ENTITY highlight-buildsize     "23 MB (with gui)">
    12   <!ENTITY highlight-time          "0.3 SBU (Using paralllelism=4; with gui)">
     11  <!ENTITY highlight-buildsize     "31 MB (with gui)">
     12  <!ENTITY highlight-time          "0.4 SBU (Using paralllelism=4; with gui)">
    1313]>
    1414

  • general/graphlib/poppler.xml

    rb3e18015 ra3d36f2  
    77  <!ENTITY poppler-download-http "https://poppler.freedesktop.org/poppler-&poppler-version;.tar.xz">
    88  <!ENTITY poppler-download-ftp  " ">
    9   <!ENTITY poppler-md5sum        "20090652a3a78f7a2816db3bfcb383a3">
     9  <!ENTITY poppler-md5sum        "9f7d0b99989db6e1c78a678e7fe521c5">
    1010  <!ENTITY poppler-size          "1.8 MB">
    11   <!ENTITY poppler-buildsize     "87 MB (with Qt5 library and tests)">
    12   <!ENTITY poppler-time          "0.8 SBU (with parallelism=4, Qt5 library, and tests)">
     11  <!ENTITY poppler-buildsize     "89 MB (with Qt5 library and tests)">
     12  <!ENTITY poppler-time          "0.7 SBU (with parallelism=4, Qt5 library, and tests)">
    1313  <!-- Time increase might be due to git.freedesktop.org -->
    1414
    … …  
    180180      be obtained only from a git repository. The command to download
    181181      them is:
    182 <command>git clone --depth 1 git://git.freedesktop.org/git/poppler/test testfiles</command>.
     182<command>git clone --depth 1 https://gitlab.freedesktop.org/poppler/test.git testfiles</command>.
    183183      Then issue: <command>LC_ALL=en_US.UTF-8 make test</command>.
    184184    </para>

  • general/graphlib/qpdf.xml

    rb3e18015 ra3d36f2  
    77  <!ENTITY qpdf-download-http "https://github.com/qpdf/qpdf/releases/download/v&qpdf-version;/qpdf-&qpdf-version;.tar.gz">
    88  <!ENTITY qpdf-download-ftp  " ">
    9   <!ENTITY qpdf-md5sum        "312c0f65a5e2342efdb0a2691a65c542">
     9  <!ENTITY qpdf-md5sum        "5c52a77ffa95c9df4071272273acebca">
    1010  <!ENTITY qpdf-size          "18 MB">
    11   <!ENTITY qpdf-buildsize     "248 MB (add 2 MB for tests)">
    12   <!ENTITY qpdf-time          "0.5 SBU (using parallelism=4; add 0.6 SBU for tests)">
     11  <!ENTITY qpdf-buildsize     "249 MB (add 2 MB for tests)">
     12  <!ENTITY qpdf-time          "0.4 SBU (using parallelism=4; add 0.5 SBU for tests)">
    1313]>
    1414

  • general/prog/cmake.xml

    rb3e18015 ra3d36f2  
    8888    <bridgehead renderas="sect3">CMake Dependencies</bridgehead>
    8989
    90     <bridgehead renderas="sect4">Required</bridgehead>
    91     <para role="required">
    92       <xref linkend="libuv"/>
    93     </para>
    94 
    9590    <bridgehead renderas="sect4">Recommended</bridgehead>
    9691    <para role="recommended">
    9792      <xref linkend="curl"/>,
    98       <xref linkend="libarchive"/>, and
     93      <xref linkend="libarchive"/>,
     94      <xref linkend="libuv"/>, and
    9995      <xref linkend="nghttp2"/>
    10096    </para>
    … …  
    201197      <application>librhash</application> library from the list of system
    202198      libraries used. A bundled version of that library is used instead.
     199    </para>
     200
     201    <para>
     202      <option>--no-system-{curl,libarchive,libuv,nghttp2}</option>: Use
     203      the corresponding option in the list for the
     204      <command>bootstrap</command> if one recommended dependency is not
     205      installed.  A bundled version of the dependency will be used instead.
    203206    </para>
    204207

  • general/prog/gdb.xml

    rb3e18015 ra3d36f2  
    115115  <sect2 role="installation">
    116116    <title>Installation of GDB</title>
    117 <!--
    118     <para>
    119       First, apply some changes from upstream to fix issues with glibc-2.35:
    120     </para>
    121 
    122 <screen><userinput remap="pre">patch -Np1 -i ../gdb-&gdb-version;-upstream_fixes-1.patch</userinput></screen>
    123 -->
     117
     118    <!-- https://sourceware.org/git/?p=binutils-gdb.git;a=commit;h=1add37b
     119         Will be included in 13.1, but not 12.2 (if there will be 12.2). -->
     120    <para>
     121      First, apply a change from upstream to fix issues with readline-8.2
     122      or later:
     123    </para>
     124
     125<screen><userinput remap="pre">sed '/return/s/rl.*characters/(char *) &amp;/' -i gdb/completer.c</userinput></screen>
     126
     127
    124128    <para>
    125129      Install <application>GDB</application> by running the following

  • general/prog/git.xml

    rb3e18015 ra3d36f2  
    99  <!ENTITY git-download-http "&git-root;/git-&git-version;.tar.xz">
    1010  <!ENTITY git-download-ftp  " ">
    11   <!ENTITY git-md5sum        "dfefd2363f2d4f9cefd6e609e0c605fe">
    12 
    13   <!ENTITY git-size          "6.7 MB">
     11  <!ENTITY git-md5sum        "7d67a6c1ca1876aa8dd08951d0592a73">
     12
     13  <!ENTITY git-size          "6.8 MB">
    1414  <!-- but people keep forgetting that an install not only needs the net build
    1515       space, it also needs the install space (or DESTDIR) -->
    16   <!ENTITY git-buildsize     "231 MB (with downloaded documentation, add 17 MB to build documentation)">
     16  <!ENTITY git-buildsize     "245 MB (with downloaded documentation, add 17 MB to build documentation)">
    1717  <!-- With 2.23.0, there was a large increase in time for tests. Possibly disk related? -->
    1818  <!-- Confirmed that it is disk related.-->

  • general/prog/perl-modules/perl-net-dns.xml

    rb3e18015 ra3d36f2  
    66
    77  <!ENTITY my-download-http "&perl_authors;/id/N/NL/NLNETLABS/Net-DNS-&Net-DNS-version;.tar.gz">
    8   <!ENTITY my-md5sum "f10276a44ce157cd5f709be4c70c34a8">
     8  <!ENTITY my-md5sum "41e90c1f58e7beb587901b3b4338025c">
    99]>
    1010

  • general/prog/rust.xml

    rb3e18015 ra3d36f2  
    201201    <bridgehead renderas="sect4">Required</bridgehead>
    202202    <para role="required">
    203       <xref linkend="curl"/>,
    204       <xref linkend="cmake"/>, and
    205       <xref linkend="libssh2"/>
     203      <xref linkend="cmake"/>
    206204    </para>
    207205
    208206    <bridgehead renderas="sect4">Recommended</bridgehead>
    209207    <para role="recommended">
     208      <xref linkend="curl"/>,
     209      <xref linkend="libssh2"/>, and
    210210      <xref linkend="llvm"/>
    211211      (built with -DLLVM_LINK_LLVM_DYLIB=ON so that rust can link to
    … …  
    213213    </para>
    214214
     215    <note>
     216      <para>
     217        If a recommended dependency is not installed, a shipped copy in the
     218        Rustc source tarball will be built and used.
     219      </para>
     220    </note>
     221
    215222    <bridgehead renderas="sect4">Optional</bridgehead>
    216223    <para role="optional">
    217       <xref linkend="gdb"/> (used by the testsuite if it is present)
     224      <xref linkend="gdb"/> (used by the testsuite if it is present) and
     225      <ulink url='https://libgit2.org/'>libgit2</ulink>
    218226    </para>
    219227
    … …  
    337345
    338346<screen><userinput>export RUSTFLAGS="$RUSTFLAGS -C link-args=-lffi" &amp;&amp;
     347{ [ ! -e /usr/include/libssh2.h ] ||
     348  export LIBSSH2_SYS_USE_PKG_CONFIG=1; } &amp;&amp;
    339349python3 ./x.py build --exclude src/tools/miri</userinput></screen>
    340350
    … …  
    415425    </para>
    416426
    417 <screen><userinput>export LIBSSH2_SYS_USE_PKG_CONFIG=1 &amp;&amp;
    418 DESTDIR=${PWD}/install python3 ./x.py install &amp;&amp;
     427<screen><userinput>DESTDIR=${PWD}/install python3 ./x.py install &amp;&amp;
    419428unset LIBSSH2_SYS_USE_PKG_CONFIG</userinput></screen>
    420429
    … …  
    513522    </para>
    514523
    515     <para>
    516       <command>export LIBSSH2_SYS_USE_PKG_CONFIG=1</command>: On some systems,
    517       cairo fails to link during the install because it cannot find libssh2.
    518       This seems to fix it, but again the reason why the problem occurs is not
    519       understood.
     524    <!-- https://github.com/alexcrichton/ssh2-rs/issues/173 -->
     525    <para>
     526      <command>export LIBSSH2_SYS_USE_PKG_CONFIG=1</command>: Allow
     527      <command>cargo</command> to link to system libssh2.
    520528    </para>
    521529

  • general/sysutils/dbus.xml

    rb3e18015 ra3d36f2  
    77  <!ENTITY dbus-download-http "https://dbus.freedesktop.org/releases/dbus/dbus-&dbus-version;.tar.xz">
    88  <!ENTITY dbus-download-ftp  " ">
    9   <!ENTITY dbus-md5sum        "ddd5570aff05191dbee8e42d751f1b7d">
     9  <!ENTITY dbus-md5sum        "2d9a6b441e6f844d41c35a004f0ef50b">
    1010  <!ENTITY dbus-size          "1.3 MB">
    11   <!ENTITY dbus-buildsize     "21 MB (add 18 MB for the tests)">
    12   <!ENTITY dbus-time          "0.3 SBU (add 8.0 SBU for the tests)">
     11  <!ENTITY dbus-buildsize     "23 MB (add 4 MB for tests)">
     12  <!ENTITY dbus-time          "0.2 SBU (add 0.2 SBU for tests)">
    1313  <!-- The former value was 0.8 SBU, which was far more sensible. -->
     14  <!-- I got 'real  0m14.355s' for make check at -j1; bdubbs dbus-1.14.2 -->
    1415]>
    1516
Note: See TracChangeset for help on using the changeset viewer.