Ignore:
Timestamp:
12/04/2021 03:28:15 PM (2 years ago)
Author:
Thomas Trepl (Moody) <thomas@…>
Branches:
lazarus
Children:
e6974d1
Parents:
b22e4ceb (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 lazarus

File:
1 edited

Legend:

Unmodified
Added
Removed
  • general/genlib/glib2.xml

    rb22e4ceb r8307474  
    77  <!ENTITY glib2-download-http "&gnome-download-http;/glib/&glib2-minor;/glib-&glib2-version;.tar.xz">
    88  <!ENTITY glib2-download-ftp  "&gnome-download-ftp;/glib/&glib2-minor;/glib-&glib2-version;.tar.xz">
    9   <!ENTITY glib2-md5sum        "4b08228707d28a9f23f7369902f4b166">
     9  <!ENTITY glib2-md5sum        "fb613d21fabce3d3d8520f37d12bd473">
    1010  <!ENTITY glib2-size          "4.6 MB">
    11   <!ENTITY glib2-buildsize     "130 MB (add 6 MB for tests)">
    12   <!ENTITY glib2-time          "0.5 SBU (add 0.5 SBU for tests; both using parallelism=4)">
     11  <!ENTITY glib2-buildsize     "131 MB (add 6 MB for tests)">
     12  <!ENTITY glib2-time          "0.5 SBU (add 0.6 SBU for tests; both using parallelism=4)">
    1313]>
    1414
     
    229229      <!-- with 2.60.4 on systemd, all tests pass. -->
    230230      <!-- with 2.64.1 on sysV, all tests pass. -->
    231       <!-- with 2.70.0 on sysV, all tests pass. -->
     231      <!-- with 2.70.1 on sysV, all tests pass. -->
    232232    </para>
    233233
     
    291291          /usr/share/glib-2.0,
    292292          /usr/share/doc/glib-&glib2-version;, and
    293           /usr/share/gtk-doc/html/{gio,glib,gobject}
     293          /usr/share/gtk-doc/html/{gio,glib,gobject} (optional)
    294294        </seg>
    295295      </seglistitem>
Note: See TracChangeset for help on using the changeset viewer.