Changeset 1be8fad


Ignore:
Timestamp:
05/11/2021 08:46:29 PM (3 years ago)
Author:
Bruce Dubbs <bdubbs@…>
Branches:
11.0, 11.1, 11.2, 11.3, 12.0, 12.1, 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, upgradedb, xry111/intltool, xry111/llvm18, xry111/soup3, xry111/test-20220226, xry111/xf86-video-removal
Children:
2eb6c62
Parents:
4b1b4784 (diff), 7c934e69 (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:

Fix merge conflict

Files:
5 edited

Legend:

Unmodified
Added
Removed

  • general/genlib/glib2.xml

    r4b1b4784 r1be8fad  
    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        "bc9f2250be1f773bb17747d3b2e6a3ae">
    10   <!ENTITY glib2-size          "4.8 MB">
    11   <!ENTITY glib2-buildsize     "178 MB (add 5 MB for tests)">
    12   <!ENTITY glib2-time          "0.5 SBU (add 1.0 SBU for tests; both using parallelism=4)">
     9  <!ENTITY glib2-md5sum        "8d288416da38476c71998e5c2d3602ed">
     10  <!ENTITY glib2-size          "4.7 MB">
     11  <!ENTITY glib2-buildsize     "209 MB (add 6 MB for tests)">
     12  <!ENTITY glib2-time          "0.5 SBU (add 0.5 SBU for tests; both using parallelism=4)">
    1313]>
    1414

  • introduction/welcome/changelog.xml

    r4b1b4784 r1be8fad  
    4949         <para>[pierre] - Fix the pkgconfig file for lua-5.2: the library
    5050         was -llua instead of -llua5.2.</para>
     51       </listitem>
     52       <listitem>
     53         <para>[bdubbs] - Update to btrfs-progs-5.12. Fixes
     54         <ulink url="&blfs-ticket-root;15021">#15021</ulink>.</para>
     55       </listitem>
     56       <listitem>
     57         <para>[bdubbs] - Update to gtk-4.2.1. Fixes
     58         <ulink url="&blfs-ticket-root;15013">#15013</ulink>.</para>
     59       </listitem>
     60       <listitem>
     61         <para>[bdubbs] - Update to glib-2.68.2. Fixes
     62         <ulink url="&blfs-ticket-root;15027">#15027</ulink>.</para>
    5163       </listitem>
    5264       <listitem>

  • packages.ent

    r4b1b4784 r1be8fad  
    4444
    4545<!-- Chapter 5 -->
    46 <!ENTITY btrfs-progs-version          "5.11.1">
     46<!ENTITY btrfs-progs-version          "5.12">
    4747<!ENTITY dosfstools-version           "4.2">
    4848<!ENTITY fuse3-version                "3.10.2">
    … …  
    9999<!ENTITY gcab-version                 "0.7">
    100100<!ENTITY glib2-minor                  "2.68">
    101 <!ENTITY glib2-version                "&glib2-minor;.1">
     101<!ENTITY glib2-version                "&glib2-minor;.2">
    102102<!ENTITY glibmm-version               "2.66.0">
    103103<!ENTITY gmime-version                "2.6.23">
    … …  
    744744<!ENTITY gtk2-version                 "2.24.33">
    745745<!ENTITY gtk3-version                 "3.24.29">
    746 <!ENTITY gtk4-version                 "4.2.0">
     746<!ENTITY gtk4-version                 "4.2.1">
    747747<!ENTITY gtk-engines-version          "2.20.2">
    748748<!ENTITY gtkmm2-version               "2.24.5">

  • postlfs/filesystems/btrfs-progs.xml

    r4b1b4784 r1be8fad  
    77  <!ENTITY btrfs-progs-download-http "&kernel-dl;/linux/kernel/people/kdave/btrfs-progs/btrfs-progs-v&btrfs-progs-version;.tar.xz">
    88  <!ENTITY btrfs-progs-download-ftp  " ">
    9   <!ENTITY btrfs-progs-md5sum        "7a8d0201da222c838a89fb31511f8d86">
     9  <!ENTITY btrfs-progs-md5sum        "e3de33b782142dd21a74e6adfb17627a">
    1010  <!ENTITY btrfs-progs-size          "2.1 MB">
    11   <!ENTITY btrfs-progs-buildsize     "93 MB (up to 2.7 GB are used during tests)">
     11  <!ENTITY btrfs-progs-buildsize     "63 MB (up to 2.7 GB are used during tests)">
    1212  <!ENTITY btrfs-progs-time          "0.2 SBU (add 50-100 SBU for tests, depending on disk speed)">
    1313]>

  • x/lib/gtk4.xml

    r4b1b4784 r1be8fad  
    77  <!ENTITY gtk4-download-http "&gnome-download-http;/gtk/4.2/gtk-&gtk4-version;.tar.xz">
    88  <!ENTITY gtk4-download-ftp  "&gnome-download-ftp;/gtk/4.2/gtk-&gtk4-version;.tar.xz">
    9   <!ENTITY gtk4-md5sum        "656c54a43b252ef1955d0787bab1a7aa">
     9  <!ENTITY gtk4-md5sum        "7854bd017e0016db76d17be9d4deb02e">
    1010  <!ENTITY gtk4-size          "25 MB">
    11   <!ENTITY gtk4-buildsize     "1.0 GB (138 MB installed, add 58 MB for tests)">
    12   <!ENTITY gtk4-time          "1.2 SBU (using parallelism=4, add 0.3 SBU for tests)">
     11  <!ENTITY gtk4-buildsize     "892 MB (138 MB installed, add 58 MB for tests)">
     12  <!ENTITY gtk4-time          "1.1 SBU (using parallelism=4, add 0.3 SBU for tests)">
    1313]>
    1414
    … …  
    137137      Running the test suite is not recommended unless you are in a Wayland
    138138      session. If you are not in a Wayland session, around 625 tests will fail.
    139       Under a Wayland session, the number decreases to around 25. If you are
     139      Under a Wayland session, the number decreases to around 70. If you are
    140140      in a Wayland session and wish to run the tests, issue:
    141141      <command>ninja test</command>.
Note: See TracChangeset for help on using the changeset viewer.