Changeset 89a8d9a for general

Timestamp:

12/12/2022 10:34:38 PM (19 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

Files:

• genlib/apr-util.xml (modified) (1 diff)
• genlib/glib2.xml (modified) (6 diffs)
• genlib/pcre2.xml (modified) (1 diff)
• genlib/uchardet.xml (modified) (2 diffs)
• genutils/graphviz.xml (modified) (1 diff)
• graphlib/poppler.xml (modified) (1 diff)
• prog/cmake.xml (modified) (1 diff)
• prog/gitserver.xml (modified) (2 diffs)
• prog/ojdk-conf.xml (modified) (1 diff)
• prog/perl-modules/perl-text-bibtex.xml (modified) (1 diff)
• prog/php.xml (modified) (1 diff)
• prog/svnserver.xml (modified) (2 diffs)
• prog/swig.xml (modified) (1 diff)
• sysutils/fcron.xml (modified) (1 diff)
• sysutils/usbutils.xml (modified) (1 diff)

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>

general/genutils/graphviz.xml

@@ -7 +7 @@
   <!ENTITY graphviz-download-http "https://gitlab.com/graphviz/graphviz/-/archive/&graphviz-version;/graphviz-&graphviz-version;.tar.bz2">
   <!ENTITY graphviz-download-ftp  " ">
-  <!ENTITY graphviz-md5sum        "7f241a7ee09294accc6c75643a7cd9be">
+  <!ENTITY graphviz-md5sum        "75189b0b56b7795a7d665c420a4af99f">
   <!ENTITY graphviz-size          "26 MB">
   <!ENTITY graphviz-buildsize     "211 MB">

general/graphlib/poppler.xml

@@ -7 +7 @@
   <!ENTITY poppler-download-http "https://poppler.freedesktop.org/poppler-&poppler-version;.tar.xz">
   <!ENTITY poppler-download-ftp  " ">
-  <!ENTITY poppler-md5sum        "4a7adb52dcf9a37f9655a240d1e2cc97">
+  <!ENTITY poppler-md5sum        "39b6a69eceba6adb8afbcee8d47385fd">
   <!ENTITY poppler-size          "1.8 MB">
   <!ENTITY poppler-buildsize     "88 MB (with Qt5 library and tests)">

general/prog/cmake.xml

@@ -7 +7 @@
   <!ENTITY cmake-download-http "https://cmake.org/files/v&cmake-major-version;/cmake-&cmake-version;.tar.gz">
   <!ENTITY cmake-download-ftp  " ">
-  <!ENTITY cmake-md5sum        "a9d079eaf3f91ed9898834afb24e2b17">
+  <!ENTITY cmake-md5sum        "521a03b1c36412463eda0348bebf4765">
   <!ENTITY cmake-size          "10 MB">
   <!ENTITY cmake-buildsize     "432 MB (add 1.1 GB for tests)">

general/prog/gitserver.xml

@@ -49 +49 @@
 
     <sect3>
-      <title>1. Setup Users, Groups, and Permissions</title>
+      <title>1. Set Up Users, Groups, and Permissions</title>
 
       <para>
@@ -162 +162 @@
 
       <para>
-        On the developer's machine, setup some files to be pushed
+        On the developer's machine, set up some files to be pushed
         to the repository as the initial content:
       </para>

general/prog/ojdk-conf.xml

@@ -98 +98 @@
       on the <xref linkend="make-ca"/> page previously created the file
       located in <filename class="directory">/etc/ssl/java</filename>.
-      Setup a symlink in the default location as the
+      Set up a symlink in the default location as the
       <systemitem class="username">root</systemitem> user:
     </para>

general/prog/perl-modules/perl-text-bibtex.xml

@@ -101 +101 @@
             <para>
               parses a series of BibTeX files with command line options to
-              control the string post-processing behaviour
+              control the string post-processing behavior
             </para>
             <indexterm zone="perl-text-bibtex bibparse-prog">

general/prog/php.xml

@@ -609 +609 @@
         Additionally, it may be useful to add an entry for
         <filename>index.php</filename> to the DirectoryIndex directive of the
-        <filename>httpd.conf</filename> file. Lastly, adding a line to setup the
+        <filename>httpd.conf</filename> file. Lastly, adding a line to set up the
         <filename class='extension'>.phps</filename> extension to show
         highlighted <application>PHP</application> source may be

general/prog/svnserver.xml

@@ -47 +47 @@
 
     <sect3>
-      <title>1. Setup Users, Groups, and Permissions</title>
+      <title>1. Set Uup Users, Groups, and Permissions</title>
 
       <para>
@@ -129 +129 @@
         layout set up exactly as you want your repository to look. For
         example, here is a sample BLFS layout setup with a root of
-        <filename>svntest/</filename>. You'll need to setup a directory
+        <filename>svntest/</filename>. You'll need to set up a directory
         tree similar to the following:
       </para>

general/prog/swig.xml

@@ -7 +7 @@
   <!ENTITY swig-download-http "&sourceforge-dl;/swig/swig-&swig-version;.tar.gz">
   <!ENTITY swig-download-ftp  " ">
-  <!ENTITY swig-md5sum        "baac03a66f3194e5399d4c71d34df1e2">
+  <!ENTITY swig-md5sum        "c7d55a1bca26752f3846c85b43c1a69c">
   <!ENTITY swig-size          "8.2 MB">
   <!ENTITY swig-buildsize     "82 MB (2.1 GB with tests)">

general/sysutils/fcron.xml

@@ -295 +295 @@
 
       <para>
-        If you would like to setup a periodic hierarchy for the root user,
+        If you would like to set up a periodic hierarchy for the root user,
         first issue the following commands (as the
         <systemitem class="username">root</systemitem> user) to create the

general/sysutils/usbutils.xml

@@ -82 +82 @@
     <bridgehead renderas="sect4">Required</bridgehead>
     <para role="required">
-      <xref linkend="libusb"/> and
+      <xref linkend="libusb"/>
+    </para>
+
+    <bridgehead renderas="sect4">Recommended</bridgehead>
+    <para role="recommended">
+<!-- git is required by autogen.sh. If using the tarball on kernel.org,
+     autogen.sh does not need to be run. If using the github source,
+     autogen.sh needs to be run, and git is used to pull the usbhid-dump
+     submodule. -->
+      <xref linkend="git"/> and
       <xref linkend="wget"/>
-      <!-- In the systemd book, a unit/timer is installed to update the
-      usb.ids file automatically.
-
-      wget is used in the instructions below.
-      -->
-    </para>
-
-<!-- lsusb.py has been ported to Python 3, and it is the only Python user
-    <bridgehead renderas="sect4">Required Runtime</bridgehead>
-    <para role="required">
-      <xref role="runtime" linkend="python2"/>
-    </para>
--->
+<!-- In the systemd book, a unit/timer is installed to update the
+     usb.ids file automatically. wget is used in the instructions below. -->
+    </para>
+
     <para condition="html" role="usernotes">User Notes:
       <ulink url="&blfs-wiki;/usbutils"/>