Changeset 9ae8a83e for general


Ignore:
Timestamp:
06/10/2023 06:07:36 AM (13 months ago)
Author:
Thomas Trepl <thomas@…>
Branches:
12.0, 12.1, kea, ken/TL2024, ken/tuningfonts, lazarus, plabs/newcss, python3.11, rahul/power-profiles-daemon, renodr/vulkan-addition, trunk, xry111/llvm18, xry111/xf86-video-removal
Children:
fbdc09b
Parents:
e8a4d3b1 (diff), 49827ffd (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 kea

Location:
general
Files:
5 edited

Legend:

Unmodified
Added
Removed

  • general/genlib/intel-gmmlib.xml

    re8a4d3b1 r9ae8a83e  
    77  <!ENTITY intel-gmmlib-download-http "https://github.com/intel/gmmlib/archive/refs/tags/intel-gmmlib-&intel-gmmlib-version;.tar.gz">
    88  <!ENTITY intel-gmmlib-download-ftp  " ">
    9   <!ENTITY intel-gmmlib-md5sum        "445981330e096f6bb843caf8c9700ec4">
    10   <!ENTITY intel-gmmlib-size          "824 KB">
     9  <!ENTITY intel-gmmlib-md5sum        "522c2db1615a08279b78889aa14af473">
     10  <!ENTITY intel-gmmlib-size          "828 KB">
    1111  <!ENTITY intel-gmmlib-buildsize     "59 MB">
    12   <!ENTITY intel-gmmlib-time          "0.7 SBU">
     12  <!ENTITY intel-gmmlib-time          "0.8 SBU">
    1313]>
    1414

  • general/genutils/desktop-file-utils.xml

    re8a4d3b1 r9ae8a83e  
    7373    </itemizedlist>
    7474
     75    <bridgehead renderas="sect3">Additional Downloads</bridgehead>
     76    <itemizedlist spacing="compact">
     77      <listitem>
     78        <para>
     79          Required patch:
     80          <ulink url="&patch-root;/desktop-file-utils-&desktop-file-utils-version;-update_standard-1.patch"/>
     81        </para>
     82      </listitem>
     83    </itemizedlist>
     84
    7585    <bridgehead renderas="sect3">Desktop File Utils Dependencies</bridgehead>
    7686
    … …  
    104114
    105115<screen role="root"><userinput>rm -fv /usr/bin/desktop-file-edit</userinput></screen>
     116
     117    <para>
     118      Next, update the version of the desktop file standard to accept the
     119      SingleMainWindow key:
     120    </para>
     121
     122<screen><userinput remap="pre">patch -Np1 -i ../desktop-file-utils-&desktop-file-utils-version;-update_standard-1.patch</userinput></screen>
    106123
    107124    <para>

  • general/graphlib/poppler.xml

    re8a4d3b1 r9ae8a83e  
    158158  <sect2 role="installation">
    159159    <title>Installation of Poppler</title>
     160
     161    <!-- remove when version is gtr 23.06.0 -->
     162    <!-- missing incl is fixed upstream already -->
     163    <para>
     164      First add a missing include statement which will break compilation
     165      on 32-bit systems:
     166    </para>
     167
     168<screen><userinput>sed -e '/#include "GPGMECryptoSignBackend.h"/i#include &lt;config.h&gt;' \
     169    -i poppler/GPGMECryptoSignBackend.cc</userinput></screen>
     170    <!-- /remove -->
    160171
    161172    <para>

  • general/prog/python3.xml

    re8a4d3b1 r9ae8a83e  
    88           "https://www.python.org/ftp/python/&python3-version;/Python-&python3-version;.tar.xz">
    99  <!ENTITY python3-download-ftp  " ">
    10   <!ENTITY python3-md5sum        "c8d52fc4fb8ad9932a11d86d142ee73a">
     10  <!ENTITY python3-md5sum        "fb7f7eae520285788449d569e45b6718">
    1111  <!ENTITY python3-size          "19 MB">
    12   <!ENTITY python3-buildsize     "282 MB (add 897 MB for tests)">
    13   <!ENTITY python3-time          "2.0 SBU (add 3.9 SBU for tests; both using parallelism=4)">
     12  <!ENTITY python3-buildsize     "282 MB (add 63 MB for tests)">
     13  <!ENTITY python3-time          "1.9 SBU (add 2.8 SBU for tests; both using parallelism=4)">
    1414  <!--
    1515  Note: Size does not reflect docs that were install in LFS.

  • general/sysutils/dbus.xml

    re8a4d3b1 r9ae8a83e  
    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        "e809d7aa905ad82adeaf1d59db5445b1">
     9  <!ENTITY dbus-md5sum        "da42f55aeec51b355587bc3062fc2d41">
    1010  <!ENTITY dbus-size          "1.3 MB">
    1111  <!ENTITY dbus-buildsize     "23 MB (add 20 MB for tests)">
    12   <!ENTITY dbus-time          "0.2 SBU (add 1.7 SBU for tests)">
     12  <!ENTITY dbus-time          "0.2 SBU (add 1.6 SBU for tests)">
    1313  <!-- The former value was 0.8 SBU, which was far more sensible. -->
    1414  <!-- I got 'real  0m14.355s' for make check at -j1; bdubbs dbus-1.14.2 -->
    … …  
    1616# TOTAL: 217
    1717# PASS:  217
     18
     19Sane test resuults for 1.14.8.  -bdubbs
    1820  -->
    1921]>
Note: See TracChangeset for help on using the changeset viewer.