Changeset 65d85668

Timestamp:

08/01/2021 12:51:38 AM (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:

e495bda

Parents:

ca31bd3

Message:

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.

Files:

• general/prog/cbindgen.xml (modified) (1 diff)
• general/prog/php.xml (modified) (2 diffs)
• general/sysutils/elogind.xml (modified) (3 diffs)
• gnome/platform/gcr.xml (modified) (2 diffs)
• introduction/welcome/changelog.xml (modified) (1 diff)
• packages.ent (modified) (2 diffs)
• postlfs/security/polkit.xml (modified) (1 diff)

general/prog/cbindgen.xml

@@ -7 +7 @@
   <!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">
 ]>
 

general/prog/php.xml

@@ -7 +7 @@
   <!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
@@ -16 +16 @@
        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
+       -->
 ]>
 

general/sysutils/elogind.xml

@@ -88 +88 @@
       <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>
 
@@ -154 +153 @@
     </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;
 
@@ -183 +184 @@
   <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>

gnome/platform/gcr.xml

@@ -121 +121 @@
 <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;
@@ -149 +153 @@
       <command>sed ... schema/*.xml</command>:  This command fixes a
       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>
 

introduction/welcome/changelog.xml

@@ -45 +45 @@
       <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

packages.ent

@@ -331 +331 @@
 <!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">
@@ -356 +356 @@
 <!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">

postlfs/security/polkit.xml

@@ -94 +94 @@
       <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>