Changeset 1be8fad for x/lib/gtk4.xml

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

File:

• x/lib/gtk4.xml (modified) (2 diffs)

x/lib/gtk4.xml

@@ -7 +7 @@
   <!ENTITY gtk4-download-http "&gnome-download-http;/gtk/4.2/gtk-&gtk4-version;.tar.xz">
   <!ENTITY gtk4-download-ftp  "&gnome-download-ftp;/gtk/4.2/gtk-&gtk4-version;.tar.xz">
-  <!ENTITY gtk4-md5sum        "656c54a43b252ef1955d0787bab1a7aa">
+  <!ENTITY gtk4-md5sum        "7854bd017e0016db76d17be9d4deb02e">
   <!ENTITY gtk4-size          "25 MB">
-  <!ENTITY gtk4-buildsize     "1.0 GB (138 MB installed, add 58 MB for tests)">
-  <!ENTITY gtk4-time          "1.2 SBU (using parallelism=4, add 0.3 SBU for tests)">
+  <!ENTITY gtk4-buildsize     "892 MB (138 MB installed, add 58 MB for tests)">
+  <!ENTITY gtk4-time          "1.1 SBU (using parallelism=4, add 0.3 SBU for tests)">
 ]>
 
@@ -137 +137 @@
       Running the test suite is not recommended unless you are in a Wayland
       session. If you are not in a Wayland session, around 625 tests will fail.
-      Under a Wayland session, the number decreases to around 25. If you are
+      Under a Wayland session, the number decreases to around 70. If you are
       in a Wayland session and wish to run the tests, issue:
       <command>ninja test</command>.