9ckage updates and fixes.

Update to php-8.0.9.
Update to cbindgen-0.20.0.
Fix dependencies for elogind and p11kit.
Fix gcr-3.40.0 to build properly with meson-0.59.
This commit is contained in:
Bruce Dubbs 2021-07-31 19:51:38 -05:00
parent ca31bd3888
commit 65d8566876
7 changed files with 49 additions and 15 deletions

View File

@ -6,10 +6,10 @@
<!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 "b707b093702d4f1995f9a97f44ed081d">
<!ENTITY cbindgen-md5sum "19e6e9bc319f689ef433eb59090e3f3c">
<!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">
<!ENTITY cbindgen-buildsize "124 MB (add 568 MB for tests)">
<!ENTITY cbindgen-time "0.8 SBU (add 0.4 SBU for tests), both on a 4-core machine">
]>
<sect1 id="cbindgen" xreflabel="Cbindgen-&cbindgen-version;">

View File

@ -6,16 +6,18 @@
<!ENTITY php-download-http "https://www.php.net/distributions/php-&php-version;.tar.xz">
<!ENTITY php-download-ftp " ">
<!ENTITY php-md5sum "ff8897b914cb8de9d218bbae877decc7">
<!ENTITY php-md5sum "68a8cae879bb66425f6cfb11d94ceb02">
<!ENTITY php-size "10 MB">
<!ENTITY php-buildsize "693 MB (with tests, add 182 MB for documentation)">
<!ENTITY php-time "1.8 SBU (with parallelism=4; add 2.1 SBU for tests)">
<!ENTITY php-buildsize "446 MB (with tests, add 182 MB for documentation)">
<!ENTITY php-time "1.6 SBU (with parallelism=4; add 2.1 SBU for tests)">
<!-- Tests were run for 8.0.1 at -j4, had two timeouts as well.
Results were otherwise normal though, so I'm unsure of what caused the
increase in time. -renodr
No timeout for 8.0.2. Tests run at -j4 too. -pierre
No timeouts on 8.0.3 for me this time. -renodr
No timeouts on 8.0.5 -bdubbs -->
No timeouts on 8.0.5 -bdubbs
No timeouts, one failure on 8.0.9 -bdubbs
-->
]>
<sect1 id="php" xreflabel="PHP-&php-version;">

View File

@ -87,10 +87,9 @@
<para role="recommended">
<xref linkend="DocBook"/>,
<xref linkend="docbook-xsl"/>, and
<xref linkend="libxslt"/> (all three to build the man pages),
<xref linkend="libxslt"/> (all three to build the man pages),
<xref linkend="linux-pam"/>, and
<xref linkend="polkit"/> (circular, build elogind first, then polkit,
then elogind again)
<xref linkend="polkit"/> (runtime)
</para>
<bridgehead renderas="sect4">Optional</bridgehead>
@ -153,7 +152,9 @@ File systems ---&gt;
commands:
</para>
<screen><userinput>mkdir build &amp;&amp;
<screen><userinput>sed -i '/Disable polkit/,+8 d' meson.build &amp;&amp;
mkdir build &amp;&amp;
cd build &amp;&amp;
meson --prefix=/usr \
@ -183,6 +184,13 @@ ln -sfvn elogind /usr/include/systemd</userinput></screen>
<sect2 role="commands">
<title>Command Explanations</title>
<para>
<command>sed ... meson.build</command>: This change allows the
package to be built without polkit being installed (it is still a
runtime dependency) but able to use polkit after that package is
installed.
</para>
<para>
<parameter>-Dcgroup-controller=elogind</parameter>: This switch ensures
that <application>elogind</application> is selected as the cgroup

View File

@ -120,6 +120,10 @@
<screen><userinput>sed -i 's:"/desktop:"/org:' schema/*.xml &amp;&amp;
sed -e '208 s/@BASENAME@/gcr-viewer.desktop/' \
-e '231 s/@BASENAME@/gcr-prompter.desktop/' \
-i ui/meson.build &amp;&amp;
mkdir build &amp;&amp;
cd build &amp;&amp;
@ -150,6 +154,11 @@ ninja</userinput></screen>
deprecated entry in the schema template.
</para>
<para>
<command>sed ... ui/meson.build</command>: This command fixes a
problem when building with meson-0.59.0.
</para>
<!--
<para>
<!- - https://gitlab.gnome.org/GNOME/gcr/-/merge_requests/52/ - ->

View File

@ -44,6 +44,22 @@
<listitem>
<para>July 30th, 2021</para>
<itemizedlist>
<listitem>
<para>[bdubbs] - Update to php-8.0.9. Fixes
<ulink url="&blfs-ticket-root;15332">#15332</ulink>.</para>
</listitem>
<listitem>
<para>[bdubbs] - Update to cbindgen-0.20.0. Fixes
<ulink url="&blfs-ticket-root;15331">#15331</ulink>.</para>
</listitem>
<listitem>
<para>[bdubbs] - Fix dependencies for elogind and p11kit. Fixes
<ulink url="&blfs-ticket-root;15333">#15333</ulink>.</para>
</listitem>
<listitem>
<para>[bdubbs] - Fix gcr-3.40.0 to build properly with meson-0.59. Fixes
<ulink url="&blfs-ticket-root;15329">#15329</ulink>.</para>
</listitem>
<listitem>
<para>[bdubbs] - Update to xorg-server-1.20.13. Fixes
<ulink url="&blfs-ticket-root;15328">#15328</ulink>.</para>

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.19.0">
<!ENTITY cbindgen-version "0.20.0">
<!ENTITY check-version "0.12.0">
<!ENTITY clisp-version "2.49">
<!ENTITY cmake-major-version "3.21">
@ -355,7 +355,7 @@ to avoid building libxml2 twice, which is slow with all deps -->
<!ENTITY nasm-version "2.15.05">
<!ENTITY ninja-version "1.9.0">
<!ENTITY npapi-sdk-version "0.27.2">
<!ENTITY php-version "8.0.8">
<!ENTITY php-version "8.0.9">
<!ENTITY python2-majorver "2.7">
<!ENTITY python2-patch "18">

View File

@ -93,8 +93,7 @@
<para role="recommended">
<xref linkend="linux-pam"/>
<phrase revision="sysv">
and <xref role="first" linkend="elogind"/> (circular, build
elogind first, then polkit, then elogind again).
and <xref role="first" linkend="elogind"/>
</phrase>
</para>