linux-from-scratch/glfs
1
0
Fork 0
mirror of https://github.com/Zeckmathederg/glfs.git synced 2025-01-31 12:32:13 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix merge conflict

Browse Source
This commit is contained in:
Bruce Dubbs 2021-05-11 15:46:29 -05:00
commit 1be8fadda9
5 changed files with 25 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
general/genlib/glib2.xml
View File

@ -6,10 +6,10 @@
<!ENTITY glib2-download-http "&gnome-download-http;/glib/&glib2-minor;/glib-&glib2-version;.tar.xz"> <!ENTITY glib2-download-http "&gnome-download-http;/glib/&glib2-minor;/glib-&glib2-version;.tar.xz">
<!ENTITY glib2-download-ftp "&gnome-download-ftp;/glib/&glib2-minor;/glib-&glib2-version;.tar.xz"> <!ENTITY glib2-download-ftp "&gnome-download-ftp;/glib/&glib2-minor;/glib-&glib2-version;.tar.xz">
<!ENTITY glib2-md5sum "bc9f2250be1f773bb17747d3b2e6a3ae"> <!ENTITY glib2-md5sum "8d288416da38476c71998e5c2d3602ed">
<!ENTITY glib2-size "4.8 MB"> <!ENTITY glib2-size "4.7 MB">
<!ENTITY glib2-buildsize "178 MB (add 5 MB for tests)"> <!ENTITY glib2-buildsize "209 MB (add 6 MB for tests)">
<!ENTITY glib2-time "0.5 SBU (add 1.0 SBU for tests; both using parallelism=4)"> <!ENTITY glib2-time "0.5 SBU (add 0.5 SBU for tests; both using parallelism=4)">
]> ]>
<sect1 id="glib2" xreflabel="GLib-&glib2-version;"> <sect1 id="glib2" xreflabel="GLib-&glib2-version;">

12
introduction/welcome/changelog.xml
View File

@ -49,6 +49,18 @@
<para>[pierre] - Fix the pkgconfig file for lua-5.2: the library <para>[pierre] - Fix the pkgconfig file for lua-5.2: the library
was -llua instead of -llua5.2.</para> was -llua instead of -llua5.2.</para>
</listitem> </listitem>
<listitem>
<para>[bdubbs] - Update to btrfs-progs-5.12. Fixes
<ulink url="&blfs-ticket-root;15021">#15021</ulink>.</para>
</listitem>
<listitem>
<para>[bdubbs] - Update to gtk-4.2.1. Fixes
<ulink url="&blfs-ticket-root;15013">#15013</ulink>.</para>
</listitem>
<listitem>
<para>[bdubbs] - Update to glib-2.68.2. Fixes
<ulink url="&blfs-ticket-root;15027">#15027</ulink>.</para>
</listitem>
<listitem> <listitem>
<para>[bdubbs] - Update to hdparm-9.62. Fixes <para>[bdubbs] - Update to hdparm-9.62. Fixes
<ulink url="&blfs-ticket-root;15023">#15023</ulink>.</para> <ulink url="&blfs-ticket-root;15023">#15023</ulink>.</para>

6
packages.ent
View File

@ -43,7 +43,7 @@
<!ENTITY volume_key-version "0.3.12"> <!ENTITY volume_key-version "0.3.12">
<!-- Chapter 5 --> <!-- Chapter 5 -->
<!ENTITY btrfs-progs-version "5.11.1"> <!ENTITY btrfs-progs-version "5.12">
<!ENTITY dosfstools-version "4.2"> <!ENTITY dosfstools-version "4.2">
<!ENTITY fuse3-version "3.10.2"> <!ENTITY fuse3-version "3.10.2">
<!ENTITY jfsutils-version "1.1.15"> <!ENTITY jfsutils-version "1.1.15">
@ -98,7 +98,7 @@
<!ENTITY fftw-version "3.3.9"> <!ENTITY fftw-version "3.3.9">
<!ENTITY gcab-version "0.7"> <!ENTITY gcab-version "0.7">
<!ENTITY glib2-minor "2.68"> <!ENTITY glib2-minor "2.68">
<!ENTITY glib2-version "&glib2-minor;.1"> <!ENTITY glib2-version "&glib2-minor;.2">
<!ENTITY glibmm-version "2.66.0"> <!ENTITY glibmm-version "2.66.0">
<!ENTITY gmime-version "2.6.23"> <!ENTITY gmime-version "2.6.23">
<!ENTITY gmime3-version "3.2.7"> <!ENTITY gmime3-version "3.2.7">
@ -743,7 +743,7 @@ to avoid building libxml2 twice, which is slow with all deps -->
<!ENTITY graphene-version "1.10.6"> <!ENTITY graphene-version "1.10.6">
<!ENTITY gtk2-version "2.24.33"> <!ENTITY gtk2-version "2.24.33">
<!ENTITY gtk3-version "3.24.29"> <!ENTITY gtk3-version "3.24.29">
<!ENTITY gtk4-version "4.2.0"> <!ENTITY gtk4-version "4.2.1">
<!ENTITY gtk-engines-version "2.20.2"> <!ENTITY gtk-engines-version "2.20.2">
<!ENTITY gtkmm2-version "2.24.5"> <!ENTITY gtkmm2-version "2.24.5">
<!ENTITY gtkmm3-version "3.24.4"> <!ENTITY gtkmm3-version "3.24.4">

4
postlfs/filesystems/btrfs-progs.xml
View File

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

8
x/lib/gtk4.xml
View File

@ -6,10 +6,10 @@
<!ENTITY gtk4-download-http "&gnome-download-http;/gtk/4.2/gtk-&gtk4-version;.tar.xz"> <!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-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-size "25 MB">
<!ENTITY gtk4-buildsize "1.0 GB (138 MB installed, add 58 MB for tests)"> <!ENTITY gtk4-buildsize "892 MB (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-time "1.1 SBU (using parallelism=4, add 0.3 SBU for tests)">
]> ]>
<sect1 id="gtk4" xreflabel="GTK-&gtk4-version;"> <sect1 id="gtk4" xreflabel="GTK-&gtk4-version;">
@ -136,7 +136,7 @@ ninja</userinput></screen>
<para> <para>
Running the test suite is not recommended unless you are in a Wayland 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. 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: in a Wayland session and wish to run the tests, issue:
<command>ninja test</command>. <command>ninja test</command>.
</para> </para>