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

Merge branch 'trunk' of git.linuxfromscratch.org:blfs into trunk

Browse Source
This commit is contained in:
Bruce Dubbs 2021-05-06 13:45:36 -05:00
commit ee5db058e5
9 changed files with 52 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
general/prog/cbindgen.xml
View File

@ -6,8 +6,8 @@
<!ENTITY cbindgen-download-http "https://github.com/eqrion/cbindgen/archive/v&cbindgen-version;/cbindgen-&cbindgen-version;.tar.gz">
<!ENTITY cbindgen-download-ftp " ">
<!ENTITY cbindgen-md5sum "9eb3e5c1c3adda2a8f1e3eee8d9700e3">
<!ENTITY cbindgen-size "188 KB">
<!ENTITY cbindgen-md5sum "b707b093702d4f1995f9a97f44ed081d">
<!ENTITY cbindgen-size "192 KB">
<!ENTITY cbindgen-buildsize "123 MB (add 533 MB for tests)">
<!ENTITY cbindgen-time "0.6 SBU (add 0.4 SBU for tests), both on a 4-core machine">
]>

4
gnome.ent
View File

@ -80,7 +80,7 @@
<!ENTITY eog-version "40.0">
<!ENTITY evince-version "40.1">
<!ENTITY evolution-version "3.40.0">
<!ENTITY file-roller-version "3.38.0">
<!ENTITY file-roller-version "3.40.0">
<!-- gedit moved to Editors, so it's now in packages.ent -->
<!ENTITY gnome-calculator-version "40.0">
<!ENTITY gnome-color-manager-version "3.36.0">
@ -96,6 +96,6 @@
<!ENTITY gnome-weather-version "40.0">
<!ENTITY gucharmap-version "12.0.1">
<!-- nm-applet moved to Networking Utilities, so it's now in packages.ent -->
<!ENTITY seahorse-version "3.38.1">
<!ENTITY seahorse-version "40.0">
<!ENTITY vinagre-version "3.22.0">
<!--<!ENTITY vino-version "3.22.0">-->

8
gnome/applications/file-roller.xml
View File

@ -5,11 +5,11 @@
%general-entities;
<!ENTITY file-roller-download-http
"&gnome-download-http;/file-roller/&gnome-minor-38;/file-roller-&file-roller-version;.tar.xz">
"&gnome-download-http;/file-roller/&gnome-minor-40;/file-roller-&file-roller-version;.tar.xz">
<!ENTITY file-roller-download-ftp
"&gnome-download-ftp;/file-roller/&gnome-minor-38;/file-roller-&file-roller-version;.tar.xz">
<!ENTITY file-roller-md5sum "41ee373818d577659980dcdaf57b772a">
<!ENTITY file-roller-size "860 KB">
"&gnome-download-ftp;/file-roller/&gnome-minor-40;/file-roller-&file-roller-version;.tar.xz">
<!ENTITY file-roller-md5sum "b38c3eaea9aba5f44d2701fa23a7a0ff">
<!ENTITY file-roller-size "856 KB">
<!ENTITY file-roller-buildsize "25 MB">
<!ENTITY file-roller-time "0.1 SBU (Using parallelism=4)">
]>

12
gnome/applications/seahorse.xml
View File

@ -5,11 +5,11 @@
%general-entities;
<!ENTITY seahorse-download-http
"&gnome-download-http;/seahorse/&gnome-minor-38;/seahorse-&seahorse-version;.tar.xz">
"&gnome-download-http;/seahorse/&gnome-40;/seahorse-&seahorse-version;.tar.xz">
<!ENTITY seahorse-download-ftp
"&gnome-download-ftp;/seahorse/&gnome-minor-38;/seahorse-&seahorse-version;.tar.xz">
<!ENTITY seahorse-md5sum "e9d710e7c0282e6680869f48bf0a71d2">
<!ENTITY seahorse-size "1.6 MB">
"&gnome-download-ftp;/seahorse/&gnome-40;/seahorse-&seahorse-version;.tar.xz">
<!ENTITY seahorse-md5sum "c6c11d77e64c4efc31f02c7127327be8">
<!ENTITY seahorse-size "1.3 MB">
<!ENTITY seahorse-buildsize "58 MB">
<!ENTITY seahorse-time "0.4 SBU">
]>
@ -147,7 +147,9 @@ ninja</userinput></screen>
<para>
<option>-Dldap-support=false</option>: Add this switch if you have not
installed openldap.
installed openldap. Note that you will have to use the following 'sed'
command to fix the build:
sed -i "448 s/g_list/if (ssrc) &amp;/" pgp/seahorse-pgp-backend.c
</para>
</sect2>

20
introduction/welcome/changelog.xml
View File

@ -67,6 +67,26 @@
<para>[bdubbs] - Update to jasper-2.0.32. Fixes
<ulink url="&blfs-ticket-root;14921">#14921</ulink>.</para>
</listitem>
<listitem>
<para>[renodr] - Update to cbindgen-0.19.0. Fixes
<ulink url="&blfs-ticket-root;14885">#14885</ulink>.</para>
</listitem>
<listitem>
<para>[renodr] - Update to postfix-3.6.0. Fixes
<ulink url="&blfs-ticket-root;14892">#14892</ulink>.</para>
</listitem>
<listitem>
<para>[renodr] - Update to gdk-pixbuf-2.42.6. Fixes
<ulink url="&blfs-ticket-root;14893">#14893</ulink>.</para>
</listitem>
<listitem>
<para>[renodr] - Update to file-roller-3.40.0. Fixes
<ulink url="&blfs-ticket-root;14894">#14894</ulink>.</para>
</listitem>
<listitem>
<para>[renodr] - Update to seahorse-40.0. Fixes
<ulink url="&blfs-ticket-root;14895">#14895</ulink>.</para>
</listitem>
<listitem>
<para>[renodr] - Update to ICU-69.1. Fixes
<ulink url="&blfs-ticket-root;14884">#14884</ulink>.</para>

6
packages.ent
View File

@ -330,7 +330,7 @@ to avoid building libxml2 twice, which is slow with all deps -->
<!-- Chapter 13 -->
<!ENTITY autoconf213-version "2.13">
<!ENTITY bazaar-version "2.5.1">
<!ENTITY cbindgen-version "0.18.0">
<!ENTITY cbindgen-version "0.19.0">
<!ENTITY check-version "0.12.0">
<!ENTITY clisp-version "2.49">
<!ENTITY cmake-major-version "3.20">
@ -667,7 +667,7 @@ to avoid building libxml2 twice, which is slow with all deps -->
<!ENTITY dovecot-version "&dovecot-major;.&dovecot-minor;.&dovecot-micro;">
<!ENTITY exim-version "4.94.2">
<!ENTITY postfix-version "3.5.9">
<!ENTITY postfix-version "3.6.0">
<!ENTITY sendmail-version "8.16.1">
<!-- Chapter 22 -->
@ -734,7 +734,7 @@ to avoid building libxml2 twice, which is slow with all deps -->
<!ENTITY colord-gtk-version "0.2.0">
<!ENTITY fltk-version "1.3.5">
<!ENTITY freeglut-version "3.2.1">
<!ENTITY gdk-pixbuf-version "2.42.4">
<!ENTITY gdk-pixbuf-version "2.42.6">
<!ENTITY gdk-pixbuf-xlib-version "2.40.2">
<!ENTITY gdl-version "3.34.0">
<!ENTITY glew-version "2.2.0">

8
server/mail/postfix.xml
View File

@ -6,9 +6,9 @@
<!ENTITY postfix-download-http " ">
<!ENTITY postfix-download-ftp "ftp://ftp.porcupine.org/mirrors/postfix-release/official/postfix-&postfix-version;.tar.gz">
<!ENTITY postfix-md5sum "a4d1b2df03a500cf8f9759d5fca1c1f6">
<!ENTITY postfix-size "4.4 MB">
<!ENTITY postfix-buildsize "220 MB">
<!ENTITY postfix-md5sum "75cfd03f0cf4c35876d630d2a04bd6f4">
<!ENTITY postfix-size "4.5 MB">
<!ENTITY postfix-buildsize "224 MB">
<!ENTITY postfix-time "0.2 SBU (Using parallelism=4)">
]>
@ -363,7 +363,7 @@ make</userinput></screen>
<para>
Create (or append to an existing) <filename>/etc/aliases</filename>
with the following command. Change
<replaceable>&lt;LOGIN&gt;</replaceable> for your non-root login
<replaceable>&lt;LOGIN&gt;</replaceable> to your non-root login
identity so mail addressed to
<systemitem class="username">root</systemitem> can be forwarded to you.
As the <systemitem class="username">root</systemitem> user:

6
x/installing/tuning-fontconfig.xml
View File

@ -328,11 +328,11 @@ EOF</userinput></screen>
<para>
For more examples see the blfs-support thread which started at <ulink
url="http://lists.linuxfromscratch.org/pipermail/blfs-support/2016-September/078422.html">/2016-September/078422</ulink>,
url="https://lists.linuxfromscratch.org/sympa/arc/blfs-support/2016-09/msg00128.html">2016-09/00128</ulink>,
particularly <ulink
url="http://lists.linuxfromscratch.org/pipermail/blfs-support/2016-September/078425.html">2016-September/078425</ulink>,
url="https://lists.linuxfromscratch.org/sympa/arc/blfs-support/2016-09/msg00137.html">2016-09/00137</ulink>,
and the original poster's preferred solution at <ulink
url="http://lists.linuxfromscratch.org/pipermail/blfs-support/2016-November/078658.html">2016-November/078658</ulink>.
url="https://lists.linuxfromscratch.org/sympa/arc/blfs-support/2016-09/msg00147.html">2016-09/00147</ulink>.
There are other examples in <xref linkend="arch-fontconfig"/> and <xref
linkend="gentoo-fontconfig"/>.
</para>

12
x/lib/gdk-pixbuf.xml
View File

@ -8,9 +8,9 @@
"&gnome-download-http;/gdk-pixbuf/2.42/gdk-pixbuf-&gdk-pixbuf-version;.tar.xz">
<!ENTITY gdk-pixbuf-download-ftp
"&gnome-download-ftp;/gdk-pixbuf/2.42/gdk-pixbuf-&gdk-pixbuf-version;.tar.xz">
<!ENTITY gdk-pixbuf-md5sum "628e4767d1636a06dea5b0fa4838f723">
<!ENTITY gdk-pixbuf-size "7.2 MB">
<!ENTITY gdk-pixbuf-buildsize "70 MB (with tests)">
<!ENTITY gdk-pixbuf-md5sum "7cd2fdaa3c55e2302316fe36968f7425">
<!ENTITY gdk-pixbuf-size "7.4 MB">
<!ENTITY gdk-pixbuf-buildsize "71 MB (with tests)">
<!ENTITY gdk-pixbuf-time "0.2 SBU (Using parallelism=4; with tests)">
]>
@ -100,7 +100,8 @@
<bridgehead renderas="sect4">Optional</bridgehead>
<para role="optional">
<!--<xref linkend="jasper"/> and-->
<xref linkend="gtk-doc"/>
<xref linkend="gtk-doc"/> and
<ulink url="https://gitlab.gnome.org/ebassi/gi-docgen">gi-docgen</ulink>
</para>
<para condition="html" role="usernotes">
@ -119,7 +120,7 @@
<screen><userinput>mkdir build &amp;&amp;
cd build &amp;&amp;
meson --prefix=/usr .. &amp;&amp;
meson --prefix=/usr -Dgtk_doc=false .. &amp;&amp;
ninja</userinput></screen>
<para>
@ -152,6 +153,7 @@ ninja</userinput></screen>
<option>-Dgtk_doc=true</option>: Use this parameter if
<application>GTK-Doc</application> is installed and you wish to rebuild
and install the API documentation.
<!-- -Dgtk_doc is set to "yield=true" in meson_options.txt -->
</para>
<!-- Removed in 2.42.0
<para>