Changeset 89a8d9a for general/genlib

Timestamp:

12/12/2022 10:34:38 PM (18 months ago)

Author:

Ken Moffat <ken@…>

Branches:

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, xry111/llvm18, xry111/xf86-video-removal

Children:

ab3ae35a

Parents:

cf905e0 (diff), bdf8481 (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:

Merge branch 'trunk' into plabs/python-mods

Location:

general/genlib

Files:

• apr-util.xml (modified) (1 diff)
• glib2.xml (modified) (6 diffs)
• pcre2.xml (modified) (1 diff)
• uchardet.xml (modified) (2 diffs)

general/genlib/apr-util.xml

@@ -31 +31 @@
       consistent interface to underlying client library interfaces. This
       application programming interface assures predictable if not identical
-      behaviour regardless of which libraries are available on a given platform.
+      behavior regardless of which libraries are available on a given platform.
     </para>
 

general/genlib/glib2.xml

@@ -7 +7 @@
   <!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-md5sum        "06745709784eddb4a3860e1814f795e8">
+  <!ENTITY glib2-md5sum        "fb204b89b0004110911dede3441597a1">
   <!ENTITY glib2-size          "4.9 MB">
-  <!ENTITY glib2-buildsize     "119 MB (add 7 MB for tests)">
-  <!ENTITY glib2-time          "0.4 SBU (add 0.5 SBU for tests; both using parallelism=4)">
+  <!ENTITY glib2-buildsize     "140 MB (add 8 MB for tests)">
+  <!ENTITY glib2-time          "0.5 SBU (add 0.6 SBU for tests; both using parallelism=4)">
 ]>
 
@@ -89 +89 @@
     <bridgehead renderas="sect4">Optional</bridgehead>
     <para role="optional">
-      <xref linkend="dbus"/> and
+      <xref linkend="dbus"/> (for some tests),
+      <xref linkend="fuse3"/> and
       <ulink url="https://bindfs.org/">bindfs</ulink>
-        (both may be used in some tests),
+        (both needed for one test),
       <xref linkend="gdb"/> (for bindings),
       <xref linkend="DocBook"/>,
@@ -124 +125 @@
   <sect2 role="installation">
     <title>Installation of GLib</title>
-    <!-- Remove the next para and screen for glib-2.72.3 or above
-    <para>
-      First, fix an issue in MIME file content lookup, which may prevent
-      displaying <command>file://</command> URL's in webkitgtk based browsers.
-    </para>
-
-<screen><userinput>patch -Np1 -i ../glib-&glib2-version;-fix_xdgmime-1.patch</userinput></screen>
--->
+
     <para>
       If desired, apply the optional patch. In many cases, applications that
@@ -237 +231 @@
 
       NOTE: systemd implements this as a hard requirement.  -->
-      <!-- with 2.60.4 on systemd, all tests pass. -->
+      <!-- one test, g-file-info-filesystem-readonly.c, needs both
+      bindfs and fusermount. With fuse3, you need to either create
+      a fusermount->fusermount3 symlink or alter the source of the
+      test so that fusermount3 is seeked and used. bindfs can be
+      built against fuse3. The test is skipped if the dependencies
+      are not found, and reported to pass.-->
       <!-- with 2.64.1 on sysV, all tests pass. -->
       <!-- with 2.70.1 on sysV, all tests pass. -->
@@ -243 +242 @@
       <!-- with 2.72.3 on sysV, all tests pass. [pierre, July 2022] -->
       <!-- with 2.74.0 on sysV, all tests pass. [bdubbs, Sep 2022] -->
-    </para>
-
+      <!-- with 2.74.3 on sysV, all tests pass. [pierre, Dec 2022] -->
+    </para>
+<!-- 2.64 is two years old
     <para>
       Finally, if this is a reinstall from glib2-2.64.x or earlier, remove
@@ -252 +252 @@
 
 <screen role="nodump"><userinput>rm -f /usr/include/glib-2.0/glib/gurifuncs.h</userinput></screen>
-
+-->
   </sect2>
 

general/genlib/pcre2.xml

@@ -7 +7 @@
   <!ENTITY pcre2-download-http "https://github.com/PCRE2Project/pcre2/releases/download/pcre2-&pcre2-version;/pcre2-&pcre2-version;.tar.bz2">
   <!ENTITY pcre2-download-ftp  " ">
-  <!ENTITY pcre2-md5sum        "a5cc4e276129c177d4fffb40601019a4">
+  <!ENTITY pcre2-md5sum        "5ee8e1d11557b677e1b159657e2aaf3c">
   <!ENTITY pcre2-size          "1.7 MB">
-  <!ENTITY pcre2-buildsize     "18 MB (with tests)">
+  <!ENTITY pcre2-buildsize     "19 MB (with tests)">
   <!ENTITY pcre2-time          "0.4 SBU (with tests)">
 ]>

general/genlib/uchardet.xml

@@ -7 +7 @@
   <!ENTITY uchardet-download-http "https://www.freedesktop.org/software/uchardet/releases/uchardet-&uchardet-version;.tar.xz">
   <!ENTITY uchardet-download-ftp  " ">
-  <!ENTITY uchardet-md5sum        "623406dac5c5ad89e40eedd7f279efae">
-  <!ENTITY uchardet-size          "212 KB">
-  <!ENTITY uchardet-buildsize     "4.2 MB">
-  <!ENTITY uchardet-time          "less than 0.1 SBU">
+  <!ENTITY uchardet-md5sum        "9e267be7aee81417e5875086dd9d44fd">
+  <!ENTITY uchardet-size          "217 KB">
+  <!ENTITY uchardet-buildsize     "4.6 MB (with test)">
+  <!ENTITY uchardet-time          "less than 0.1 SBU (with test)">
 
 ]>
@@ -144 +144 @@
       <?dbhtml list-presentation="table"?>
 
-      <!-- If the program or library name conflicts (is the same) as the
-      package name, add -prog or -lib to the varlistentry entity id
-      and the 2nd entry of the indexterm zone entity -->
-
       <varlistentry id="uchardet-prog">
         <term><command>uchardet</command></term>